Page MenuHomeSolus
Files F10831044

D4139.id10181.diff
No OneTemporary
Actions

D4139.id10181.diff
View Options

diff --git a/files/cgal-4.13.patch b/files/cgal-4.13.patch
new file mode 100644
--- /dev/null
+++ b/files/cgal-4.13.patch
@@ -0,0 +1,36 @@
+From aa39e4a6b42d43fac30c841d176c75aff92cc01a Mon Sep 17 00:00:00 2001
+From: Tiago de Paula Peixoto <tiago@skewed.de>
+Date: Wed, 3 Oct 2018 10:45:44 +0100
+Subject: [PATCH] Fix compilation with CGAL 4.13
+
+This fixes issue #509
+---
+ src/graph/generation/graph_triangulation.cc | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/src/graph/generation/graph_triangulation.cc b/src/graph/generation/graph_triangulation.cc
+index f7a9a545..4d418beb 100644
+--- a/src/graph/generation/graph_triangulation.cc
++++ b/src/graph/generation/graph_triangulation.cc
+@@ -68,6 +68,18 @@ bool operator==(const PeriodicDelaunayTriangulation::Vertex& a,
+ }
+ #endif
+
++// comparison missing in 4.13
++#if (CGAL_VERSION_NR >= 1041301000)
++namespace CGAL
++{
++bool operator==(const DelaunayTriangulation::Vertex& a,
++ const DelaunayTriangulation::Vertex& b)
++{
++ return a.point() == b.point();
++}
++}
++#endif
++
+ #include "graph_triangulation.hh"
+ #include "numpy_bind.hh"
+
+--
+2.19.1
+
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,8 +1,8 @@
name : graph-tool
-version : 2.26
-release : 4
+version : 2.27
+release : 5
source :
- - https://downloads.skewed.de/graph-tool/graph-tool-2.26.tar.bz2 : df6273dc5ef327a0eaf1ef1c46751fce4c0b7573880944e544287b85a068f770
+ - https://downloads.skewed.de/graph-tool/graph-tool-2.27.tar.bz2 : 4740c69720dfbebf8fb3e77057b3e6a257ccf0432cdaf7345f873247390e4313
license : GPL-3.0-or-later
component : programming.python
summary : Efficient python module for analysis of graphs
@@ -23,6 +23,8 @@
- python3-cairo
- scipy
setup : |
+ %patch -p1 < $pkgfiles/cgal-4.13.patch
+
%configure PYTHON=python3
build : |
# build with -j1 to limit memory usage (this is a memory monster)
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -85,6 +85,7 @@
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/draw/gtk_draw.py</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/draw/libgraph_tool_draw.so</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/draw/libgraph_tool_layout.so</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/draw/libgt_pycairo_aux.so</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/flow/__init__.py</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/flow/__pycache__/__init__.cpython-36.opt-1.pyc</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/flow/__pycache__/__init__.cpython-36.pyc</Path>
@@ -160,6 +161,7 @@
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/include/graph_util.hh</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/include/hash_map_wrap.hh</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/include/histogram.hh</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/include/idx_map.hh</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/include/inference/bundled_vacate_loop.hh</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/include/inference/cache.hh</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/include/inference/exhaustive_loop.hh</Path>
@@ -175,6 +177,7 @@
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/include/inference/graph_blockmodel_layers.hh</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/include/inference/graph_blockmodel_layers_util.hh</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/include/inference/graph_blockmodel_mcmc.hh</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/include/inference/graph_blockmodel_measured.hh</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/include/inference/graph_blockmodel_merge.hh</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/include/inference/graph_blockmodel_multicanonical.hh</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/include/inference/graph_blockmodel_multiflip_mcmc.hh</Path>
@@ -184,6 +187,10 @@
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/include/inference/graph_blockmodel_overlap_util.hh</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/include/inference/graph_blockmodel_overlap_vacate.hh</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/include/inference/graph_blockmodel_partition.hh</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/include/inference/graph_blockmodel_sample_edge.hh</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/include/inference/graph_blockmodel_uncertain.hh</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/include/inference/graph_blockmodel_uncertain_marginal.hh</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/include/inference/graph_blockmodel_uncertain_mcmc.hh</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/include/inference/graph_blockmodel_util.hh</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/include/inference/graph_blockmodel_weights.hh</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/include/inference/graph_modularity.hh</Path>
@@ -239,6 +246,8 @@
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/inference/__pycache__/nested_blockmodel.cpython-36.pyc</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/inference/__pycache__/overlap_blockmodel.cpython-36.opt-1.pyc</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/inference/__pycache__/overlap_blockmodel.cpython-36.pyc</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/inference/__pycache__/uncertain_blockmodel.cpython-36.opt-1.pyc</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/inference/__pycache__/uncertain_blockmodel.cpython-36.pyc</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/inference/__pycache__/util.cpython-36.opt-1.pyc</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/inference/__pycache__/util.cpython-36.pyc</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/inference/bisection.py</Path>
@@ -251,6 +260,7 @@
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/inference/modularity.py</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/inference/nested_blockmodel.py</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/inference/overlap_blockmodel.py</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/inference/uncertain_blockmodel.py</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/inference/util.py</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/libgraph_tool_core.so</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/search/__init__.py</Path>
@@ -273,7 +283,45 @@
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/util/__pycache__/__init__.cpython-36.opt-1.pyc</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/util/__pycache__/__init__.cpython-36.pyc</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/util/libgraph_tool_util.so</Path>
- <Path fileType="doc">/usr/share/doc</Path>
+ <Path fileType="doc">/usr/share/doc/graph-tool/AUTHORS</Path>
+ <Path fileType="doc">/usr/share/doc/graph-tool/INSTALL</Path>
+ <Path fileType="doc">/usr/share/doc/graph-tool/LICENSE</Path>
+ <Path fileType="doc">/usr/share/doc/graph-tool/README.md</Path>
+ <Path fileType="doc">/usr/share/doc/graph-tool/doc/.static/graph-icon.ico</Path>
+ <Path fileType="doc">/usr/share/doc/graph-tool/doc/.static/graph-icon.png</Path>
+ <Path fileType="doc">/usr/share/doc/graph-tool/doc/Makefile</Path>
+ <Path fileType="doc">/usr/share/doc/graph-tool/doc/centrality.rst</Path>
+ <Path fileType="doc">/usr/share/doc/graph-tool/doc/clustering.rst</Path>
+ <Path fileType="doc">/usr/share/doc/graph-tool/doc/conf.py</Path>
+ <Path fileType="doc">/usr/share/doc/graph-tool/doc/correlations.rst</Path>
+ <Path fileType="doc">/usr/share/doc/graph-tool/doc/demos/animation/animation.rst</Path>
+ <Path fileType="doc">/usr/share/doc/graph-tool/doc/demos/index.rst</Path>
+ <Path fileType="doc">/usr/share/doc/graph-tool/doc/demos/inference/inference.rst</Path>
+ <Path fileType="doc">/usr/share/doc/graph-tool/doc/draw.rst</Path>
+ <Path fileType="doc">/usr/share/doc/graph-tool/doc/flow.rst</Path>
+ <Path fileType="doc">/usr/share/doc/graph-tool/doc/generation.rst</Path>
+ <Path fileType="doc">/usr/share/doc/graph-tool/doc/graph_tool.rst</Path>
+ <Path fileType="doc">/usr/share/doc/graph-tool/doc/gt_theme/static/flasky.css</Path>
+ <Path fileType="doc">/usr/share/doc/graph-tool/doc/gt_theme/static/gt_style.css</Path>
+ <Path fileType="doc">/usr/share/doc/graph-tool/doc/gt_theme/theme.conf</Path>
+ <Path fileType="doc">/usr/share/doc/graph-tool/doc/index.rst</Path>
+ <Path fileType="doc">/usr/share/doc/graph-tool/doc/inference.rst</Path>
+ <Path fileType="doc">/usr/share/doc/graph-tool/doc/mathjax.py</Path>
+ <Path fileType="doc">/usr/share/doc/graph-tool/doc/modules.rst</Path>
+ <Path fileType="doc">/usr/share/doc/graph-tool/doc/price.py</Path>
+ <Path fileType="doc">/usr/share/doc/graph-tool/doc/pyenv.py</Path>
+ <Path fileType="doc">/usr/share/doc/graph-tool/doc/quickstart.rst</Path>
+ <Path fileType="doc">/usr/share/doc/graph-tool/doc/search_example.xml</Path>
+ <Path fileType="doc">/usr/share/doc/graph-tool/doc/search_module.rst</Path>
+ <Path fileType="doc">/usr/share/doc/graph-tool/doc/spectral.rst</Path>
+ <Path fileType="doc">/usr/share/doc/graph-tool/doc/sphinxext/comment_eater.py</Path>
+ <Path fileType="doc">/usr/share/doc/graph-tool/doc/sphinxext/compiler_unparse.py</Path>
+ <Path fileType="doc">/usr/share/doc/graph-tool/doc/sphinxext/phantom_import.py</Path>
+ <Path fileType="doc">/usr/share/doc/graph-tool/doc/sphinxext/traitsdoc.py</Path>
+ <Path fileType="doc">/usr/share/doc/graph-tool/doc/stats.rst</Path>
+ <Path fileType="doc">/usr/share/doc/graph-tool/doc/topology.rst</Path>
+ <Path fileType="doc">/usr/share/doc/graph-tool/doc/util.rst</Path>
+ <Path fileType="doc">/usr/share/doc/graph-tool/src/boost-workaround/LICENSE_1_0.txt</Path>
</Files>
</Package>
<Package>
@@ -283,19 +331,19 @@
</Description>
<PartOf>programming.devel</PartOf>
<RuntimeDependencies>
- <Dependency release="4">graph-tool</Dependency>
+ <Dependency release="5">graph-tool</Dependency>
</RuntimeDependencies>
<Files>
- <Path fileType="data">/usr/lib64/pkgconfig/*.pc</Path>
+ <Path fileType="data">/usr/lib64/pkgconfig/graph-tool-py3.6.pc</Path>
</Files>
</Package>
<History>
- <Update release="4">
- <Date>2018-04-11</Date>
- <Version>2.26</Version>
+ <Update release="5">
+ <Date>2018-10-23</Date>
+ <Version>2.27</Version>
<Comment>Packaging update</Comment>
<Name>Pierre-Yves</Name>
<Email>pyu@riseup.net</Email>
</Update>
</History>
</PISI>
\ No newline at end of file

File Metadata

Mime Type
text/plain
Expires
Jun 6 2023, 5:57 AM (9 w, 3 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5790003
Default Alt Text
D4139.id10181.diff (12 KB)

Event Timeline

Copyright © 2015-2021 Solus Project. The Solus logo is Copyright © 2016-2021 Solus Project. All Rights Reserved.