Page MenuHomeSolus
Files F11052240

D6899.id.diff
No OneTemporary
Actions

D6899.id.diff
View Options

diff --git a/files/cgal-4.13.patch b/files/cgal-4.13.patch
deleted file mode 100644
--- a/files/cgal-4.13.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-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.27
-release : 6
+version : 2.29
+release : 7
source :
- - https://downloads.skewed.de/graph-tool/graph-tool-2.27.tar.bz2 : 4740c69720dfbebf8fb3e77057b3e6a257ccf0432cdaf7345f873247390e4313
+ - https://downloads.skewed.de/graph-tool/graph-tool-2.29.tar.bz2 : 6c0c4336bed6e2f79c91ace6d6914145ee03d0bd5025473b5918aec2b0657f7a
license : GPL-3.0-or-later
component : programming.python
summary : Efficient python module for analysis of graphs
@@ -22,13 +22,8 @@
- matplotlib
- python3-cairo
- scipy
-environment: |
- export CFLAGS="${CFLAGS/-g2/}"
- export CXXFLAGS="${CXXFLAGS/-g2/}"
setup : |
- %patch -p1 < $pkgfiles/cgal-4.13.patch
-
- %configure PYTHON=python3
+ %configure PREFIX=/usr PYTHON=python3
build : |
# build with -j1 to limit memory usage (this is a memory monster)
%make -j1
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -2,15 +2,15 @@
<Source>
<Name>graph-tool</Name>
<Packager>
- <Name>Pierre-Yves</Name>
- <Email>pyu@riseup.net</Email>
+ <Name>Padraig Mac Carron</Name>
+ <Email>padraig.maccarron@ul.ie</Email>
</Packager>
<License>GPL-3.0-or-later</License>
<PartOf>programming.python</PartOf>
<Summary xml:lang="en">Efficient python module for analysis of graphs</Summary>
<Description xml:lang="en">Graph-tool is an efficient python module for manipulation and statistical analysis of graphs
</Description>
- <Archive type="binary" sha1sum="79eb0752a961b8e0d15c77d298c97498fbc89c5a">https://solus-project.com/sources/README.Solus</Archive>
+ <Archive type="binary" sha1sum="79eb0752a961b8e0d15c77d298c97498fbc89c5a">https://getsol.us/sources/README.Solus</Archive>
</Source>
<Package>
<Name>graph-tool</Name>
@@ -86,6 +86,10 @@
<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/dynamics/__init__.py</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/dynamics/__pycache__/__init__.cpython-36.opt-1.pyc</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/dynamics/__pycache__/__init__.cpython-36.pyc</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/dynamics/libgraph_tool_dynamics.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>
@@ -126,6 +130,8 @@
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/include/correlations/graph_corr_hist.hh</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/include/correlations/graph_correlations.hh</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/include/demangle.hh</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/include/dynamics/graph_continuous.hh</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/include/dynamics/graph_discrete.hh</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/include/fast_vector_property_map.hh</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/include/flow/graph_augment.hh</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/include/generation/dynamic_sampler.hh</Path>
@@ -134,6 +140,7 @@
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/include/generation/graph_generation.hh</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/include/generation/graph_geometric.hh</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/include/generation/graph_lattice.hh</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/include/generation/graph_maxent_sbm.hh</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/include/generation/graph_predecessor.hh</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/include/generation/graph_price.hh</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/include/generation/graph_rewiring.hh</Path>
@@ -167,6 +174,12 @@
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/include/inference/exhaustive_loop.hh</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/include/inference/gibbs_loop.hh</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/include/inference/graph_blockmodel.hh</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/include/inference/graph_blockmodel_dynamics.hh</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/include/inference/graph_blockmodel_dynamics_continuous.hh</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/include/inference/graph_blockmodel_dynamics_discrete.hh</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/include/inference/graph_blockmodel_dynamics_epidemics_mcmc_h.hh</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/include/inference/graph_blockmodel_dynamics_mcmc.hh</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/include/inference/graph_blockmodel_dynamics_pseudo_ising_mcmc_h.hh</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/include/inference/graph_blockmodel_elist.hh</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/include/inference/graph_blockmodel_em.hh</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/include/inference/graph_blockmodel_emat.hh</Path>
@@ -191,26 +204,32 @@
<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_uncertain_util.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_latent_multigraph.hh</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/include/inference/graph_modularity.hh</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/include/inference/graph_neighbor_sampler.hh</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/include/inference/graph_state.hh</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/include/inference/int_part.hh</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/include/inference/mcmc_loop.hh</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/include/inference/merge_loop.hh</Path>
- <Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/include/inference/parallel_rng.hh</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/include/inference/util.hh</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/include/layout/graph_arf.hh</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/include/layout/graph_sfdp.hh</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/include/mpl_nested_loop.hh</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/include/numpy_bind.hh</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/include/openmp_lock.hh</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/include/parallel_rng.hh</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/include/pcg-cpp/pcg_extras.hpp</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/include/pcg-cpp/pcg_random.hpp</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/include/pcg-cpp/pcg_uint128.hpp</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/include/random.hh</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/include/shared_map.hh</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/include/spectral/graph_adjacency.hh</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/include/spectral/graph_incidence.hh</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/include/spectral/graph_laplacian.hh</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/include/spectral/graph_nonbacktracking.hh</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/include/spectral/graph_transition.hh</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/include/stats/graph_average.hh</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/include/stats/graph_distance.hh</Path>
@@ -220,6 +239,7 @@
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/include/str_repr.hh</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/include/topology/graph_components.hh</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/include/topology/graph_kcore.hh</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/include/topology/graph_maximal_cliques.hh</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/include/topology/graph_percolation.hh</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/include/topology/graph_similarity.hh</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/include/topology/graph_vertex_similarity.hh</Path>
@@ -234,6 +254,8 @@
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/inference/__pycache__/blockmodel.cpython-36.pyc</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/inference/__pycache__/blockmodel_em.cpython-36.opt-1.pyc</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/inference/__pycache__/blockmodel_em.cpython-36.pyc</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/inference/__pycache__/latent_multigraph.cpython-36.opt-1.pyc</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/inference/__pycache__/latent_multigraph.cpython-36.pyc</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/inference/__pycache__/layered_blockmodel.cpython-36.opt-1.pyc</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/inference/__pycache__/layered_blockmodel.cpython-36.pyc</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/inference/__pycache__/mcmc.cpython-36.opt-1.pyc</Path>
@@ -253,6 +275,7 @@
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/inference/bisection.py</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/inference/blockmodel.py</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/inference/blockmodel_em.py</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/inference/latent_multigraph.py</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/inference/layered_blockmodel.py</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/inference/libgraph_tool_inference.so</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/graph_tool/inference/mcmc.py</Path>
@@ -295,6 +318,11 @@
<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/cppextensions/Makefile</Path>
+ <Path fileType="doc">/usr/share/doc/graph-tool/doc/demos/cppextensions/cppextensions.rst</Path>
+ <Path fileType="doc">/usr/share/doc/graph-tool/doc/demos/cppextensions/kcore.cc</Path>
+ <Path fileType="doc">/usr/share/doc/graph-tool/doc/demos/cppextensions/kcore.hh</Path>
+ <Path fileType="doc">/usr/share/doc/graph-tool/doc/demos/cppextensions/kcore.py</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>
@@ -339,11 +367,11 @@
</Package>
<History>
<Update release="6">
- <Date>2018-12-12</Date>
- <Version>2.27</Version>
+ <Date>2019-09-11</Date>
+ <Version>2.29</Version>
<Comment>Packaging update</Comment>
- <Name>Pierre-Yves</Name>
- <Email>pyu@riseup.net</Email>
+ <Name>Padraig Mac Carron</Name>
+ <Email>padraig.maccarron@ul.ie</Email>
</Update>
</History>
</PISI>
\ No newline at end of file

File Metadata

Mime Type
text/plain
Expires
Fri, Aug 11, 9:09 PM (2 h, 46 m ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5819163
Default Alt Text
D6899.id.diff (16 KB)

Event Timeline

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