commit 7bc75603f59d1c3993b4fdf8e8425eb3aa9394a7
Author: Jakub Bogusz <[email protected]>
Date: Thu May 30 12:04:03 2024 +0200
- updated to 1
freetdi-gala.spec | 14 +++++---------
gala-boost.patch | 19 -------------------
2 files changed, 5 insertions(+), 28 deletions(-)
---
diff --git a/freetdi-gala.spec b/freetdi-gala.spec
index e4398df..0e395d3 100644
--- a/freetdi-gala.spec
+++ b/freetdi-gala.spec
@@ -6,17 +6,13 @@
Summary: C++ graph implementation
Summary(pl.UTF-8): Implementacja grafów w C++
Name: freetdi-gala
-# release "0" has some bugs/got some later improvements (conditional stx,
DESTDIR support etc.), use post-0 snapshot
-%define gitref 19bcf7614c428f2b27f005d154aa546f96f83c74
-%define snap 20181110
-Version: 0
-Release: 1.%{snap}.1
+Version: 1
+Release: 1
License: GPL v3+
Group: Libraries
#Source0Download; https://github.com/freetdi/gala/releases
-#Source0:
https://github.com/freetdi/gala/archive/%{version}/gala-%{version}.tar.gz
-Source0:
https://github.com/freetdi/gala/archive/%{gitref}/gala-%{snap}.tar.gz
-# Source0-md5: 0f7fdff6ad63092419919a880f7469d5
+Source0:
https://github.com/freetdi/gala/archive/%{version}/gala-%{version}.tar.gz
+# Source0-md5: 374877cb2a2a3ad17c801f835b55a9cf
Patch0: gala-int128.patch
Patch1: gala-boost.patch
URL: https://github.com/freetdi/gala
@@ -53,7 +49,7 @@ niskopoziomowym dostępem. Można wybrać dowolne kontenery i
typy
danych, mając do nich pełny dostęp - na własną odpowiedzialność.
%prep
-%setup -q -n gala-%{gitref}
+%setup -q -n gala-%{version}
%patch0 -p1
%patch1 -p1
diff --git a/gala-boost.patch b/gala-boost.patch
index 2dad96e..c89128c 100644
--- a/gala-boost.patch
+++ b/gala-boost.patch
@@ -1,6 +1,4 @@
* vertex_iterator::operator+(size_t) is ambiguous with
boost::iterator_facade::operator+
-* is_same<S, boost::container::flat_set<typename S::value_type, typename
S::key_compare, typename S::allocator_type>
- is false with S=boost::container::flat_set<T> (when using default allocator)
--- gala-19bcf7614c428f2b27f005d154aa546f96f83c74/boost.h.orig 2018-11-09
13:44:07.000000000 +0100
+++ gala-19bcf7614c428f2b27f005d154aa546f96f83c74/boost.h 2019-05-12
14:54:45.483009816 +0200
@@ -259,7 +259,7 @@
@@ -12,20 +10,3 @@
vertex_iterator operator+(size_t n) {
vertex_iterator a=*this;
a.advance(n);
---- gala-19bcf7614c428f2b27f005d154aa546f96f83c74/sfinae.h.orig
2018-11-09 13:44:07.000000000 +0100
-+++ gala-19bcf7614c428f2b27f005d154aa546f96f83c74/sfinae.h 2019-05-12
18:43:37.785282218 +0200
-@@ -93,6 +93,14 @@
- typedef T type;
- static constexpr bool value = true;
- };
-+template<class S, class T>
-+struct is_set<S, typename std::enable_if < std::is_same<
-+boost::container::flat_set<typename S::value_type, typename S::key_compare,
void>, S
-+>::value, any >::type , T>{ //
-+
-+ typedef T type;
-+ static constexpr bool value = true;
-+};
- /*--------------------------------------------------------------------------*/
- /*--------------------------------------------------------------------------*/
- template<class A, class B=any, class T=void>
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/freetdi-gala.git/commitdiff/7bc75603f59d1c3993b4fdf8e8425eb3aa9394a7
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
