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 -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 @@ graph-tool - Pierre-Yves - pyu@riseup.net + Padraig Mac Carron + padraig.maccarron@ul.ie GPL-3.0-or-later programming.python Efficient python module for analysis of graphs Graph-tool is an efficient python module for manipulation and statistical analysis of graphs - https://solus-project.com/sources/README.Solus + https://getsol.us/sources/README.Solus graph-tool @@ -86,6 +86,10 @@ /usr/lib/python3.6/site-packages/graph_tool/draw/libgraph_tool_draw.so /usr/lib/python3.6/site-packages/graph_tool/draw/libgraph_tool_layout.so /usr/lib/python3.6/site-packages/graph_tool/draw/libgt_pycairo_aux.so + /usr/lib/python3.6/site-packages/graph_tool/dynamics/__init__.py + /usr/lib/python3.6/site-packages/graph_tool/dynamics/__pycache__/__init__.cpython-36.opt-1.pyc + /usr/lib/python3.6/site-packages/graph_tool/dynamics/__pycache__/__init__.cpython-36.pyc + /usr/lib/python3.6/site-packages/graph_tool/dynamics/libgraph_tool_dynamics.so /usr/lib/python3.6/site-packages/graph_tool/flow/__init__.py /usr/lib/python3.6/site-packages/graph_tool/flow/__pycache__/__init__.cpython-36.opt-1.pyc /usr/lib/python3.6/site-packages/graph_tool/flow/__pycache__/__init__.cpython-36.pyc @@ -126,6 +130,8 @@ /usr/lib/python3.6/site-packages/graph_tool/include/correlations/graph_corr_hist.hh /usr/lib/python3.6/site-packages/graph_tool/include/correlations/graph_correlations.hh /usr/lib/python3.6/site-packages/graph_tool/include/demangle.hh + /usr/lib/python3.6/site-packages/graph_tool/include/dynamics/graph_continuous.hh + /usr/lib/python3.6/site-packages/graph_tool/include/dynamics/graph_discrete.hh /usr/lib/python3.6/site-packages/graph_tool/include/fast_vector_property_map.hh /usr/lib/python3.6/site-packages/graph_tool/include/flow/graph_augment.hh /usr/lib/python3.6/site-packages/graph_tool/include/generation/dynamic_sampler.hh @@ -134,6 +140,7 @@ /usr/lib/python3.6/site-packages/graph_tool/include/generation/graph_generation.hh /usr/lib/python3.6/site-packages/graph_tool/include/generation/graph_geometric.hh /usr/lib/python3.6/site-packages/graph_tool/include/generation/graph_lattice.hh + /usr/lib/python3.6/site-packages/graph_tool/include/generation/graph_maxent_sbm.hh /usr/lib/python3.6/site-packages/graph_tool/include/generation/graph_predecessor.hh /usr/lib/python3.6/site-packages/graph_tool/include/generation/graph_price.hh /usr/lib/python3.6/site-packages/graph_tool/include/generation/graph_rewiring.hh @@ -167,6 +174,12 @@ /usr/lib/python3.6/site-packages/graph_tool/include/inference/exhaustive_loop.hh /usr/lib/python3.6/site-packages/graph_tool/include/inference/gibbs_loop.hh /usr/lib/python3.6/site-packages/graph_tool/include/inference/graph_blockmodel.hh + /usr/lib/python3.6/site-packages/graph_tool/include/inference/graph_blockmodel_dynamics.hh + /usr/lib/python3.6/site-packages/graph_tool/include/inference/graph_blockmodel_dynamics_continuous.hh + /usr/lib/python3.6/site-packages/graph_tool/include/inference/graph_blockmodel_dynamics_discrete.hh + /usr/lib/python3.6/site-packages/graph_tool/include/inference/graph_blockmodel_dynamics_epidemics_mcmc_h.hh + /usr/lib/python3.6/site-packages/graph_tool/include/inference/graph_blockmodel_dynamics_mcmc.hh + /usr/lib/python3.6/site-packages/graph_tool/include/inference/graph_blockmodel_dynamics_pseudo_ising_mcmc_h.hh /usr/lib/python3.6/site-packages/graph_tool/include/inference/graph_blockmodel_elist.hh /usr/lib/python3.6/site-packages/graph_tool/include/inference/graph_blockmodel_em.hh /usr/lib/python3.6/site-packages/graph_tool/include/inference/graph_blockmodel_emat.hh @@ -191,26 +204,32 @@ /usr/lib/python3.6/site-packages/graph_tool/include/inference/graph_blockmodel_uncertain.hh /usr/lib/python3.6/site-packages/graph_tool/include/inference/graph_blockmodel_uncertain_marginal.hh /usr/lib/python3.6/site-packages/graph_tool/include/inference/graph_blockmodel_uncertain_mcmc.hh + /usr/lib/python3.6/site-packages/graph_tool/include/inference/graph_blockmodel_uncertain_util.hh /usr/lib/python3.6/site-packages/graph_tool/include/inference/graph_blockmodel_util.hh /usr/lib/python3.6/site-packages/graph_tool/include/inference/graph_blockmodel_weights.hh + /usr/lib/python3.6/site-packages/graph_tool/include/inference/graph_latent_multigraph.hh /usr/lib/python3.6/site-packages/graph_tool/include/inference/graph_modularity.hh /usr/lib/python3.6/site-packages/graph_tool/include/inference/graph_neighbor_sampler.hh /usr/lib/python3.6/site-packages/graph_tool/include/inference/graph_state.hh /usr/lib/python3.6/site-packages/graph_tool/include/inference/int_part.hh /usr/lib/python3.6/site-packages/graph_tool/include/inference/mcmc_loop.hh /usr/lib/python3.6/site-packages/graph_tool/include/inference/merge_loop.hh - /usr/lib/python3.6/site-packages/graph_tool/include/inference/parallel_rng.hh /usr/lib/python3.6/site-packages/graph_tool/include/inference/util.hh /usr/lib/python3.6/site-packages/graph_tool/include/layout/graph_arf.hh /usr/lib/python3.6/site-packages/graph_tool/include/layout/graph_sfdp.hh /usr/lib/python3.6/site-packages/graph_tool/include/mpl_nested_loop.hh /usr/lib/python3.6/site-packages/graph_tool/include/numpy_bind.hh /usr/lib/python3.6/site-packages/graph_tool/include/openmp_lock.hh + /usr/lib/python3.6/site-packages/graph_tool/include/parallel_rng.hh + /usr/lib/python3.6/site-packages/graph_tool/include/pcg-cpp/pcg_extras.hpp + /usr/lib/python3.6/site-packages/graph_tool/include/pcg-cpp/pcg_random.hpp + /usr/lib/python3.6/site-packages/graph_tool/include/pcg-cpp/pcg_uint128.hpp /usr/lib/python3.6/site-packages/graph_tool/include/random.hh /usr/lib/python3.6/site-packages/graph_tool/include/shared_map.hh /usr/lib/python3.6/site-packages/graph_tool/include/spectral/graph_adjacency.hh /usr/lib/python3.6/site-packages/graph_tool/include/spectral/graph_incidence.hh /usr/lib/python3.6/site-packages/graph_tool/include/spectral/graph_laplacian.hh + /usr/lib/python3.6/site-packages/graph_tool/include/spectral/graph_nonbacktracking.hh /usr/lib/python3.6/site-packages/graph_tool/include/spectral/graph_transition.hh /usr/lib/python3.6/site-packages/graph_tool/include/stats/graph_average.hh /usr/lib/python3.6/site-packages/graph_tool/include/stats/graph_distance.hh @@ -220,6 +239,7 @@ /usr/lib/python3.6/site-packages/graph_tool/include/str_repr.hh /usr/lib/python3.6/site-packages/graph_tool/include/topology/graph_components.hh /usr/lib/python3.6/site-packages/graph_tool/include/topology/graph_kcore.hh + /usr/lib/python3.6/site-packages/graph_tool/include/topology/graph_maximal_cliques.hh /usr/lib/python3.6/site-packages/graph_tool/include/topology/graph_percolation.hh /usr/lib/python3.6/site-packages/graph_tool/include/topology/graph_similarity.hh /usr/lib/python3.6/site-packages/graph_tool/include/topology/graph_vertex_similarity.hh @@ -234,6 +254,8 @@ /usr/lib/python3.6/site-packages/graph_tool/inference/__pycache__/blockmodel.cpython-36.pyc /usr/lib/python3.6/site-packages/graph_tool/inference/__pycache__/blockmodel_em.cpython-36.opt-1.pyc /usr/lib/python3.6/site-packages/graph_tool/inference/__pycache__/blockmodel_em.cpython-36.pyc + /usr/lib/python3.6/site-packages/graph_tool/inference/__pycache__/latent_multigraph.cpython-36.opt-1.pyc + /usr/lib/python3.6/site-packages/graph_tool/inference/__pycache__/latent_multigraph.cpython-36.pyc /usr/lib/python3.6/site-packages/graph_tool/inference/__pycache__/layered_blockmodel.cpython-36.opt-1.pyc /usr/lib/python3.6/site-packages/graph_tool/inference/__pycache__/layered_blockmodel.cpython-36.pyc /usr/lib/python3.6/site-packages/graph_tool/inference/__pycache__/mcmc.cpython-36.opt-1.pyc @@ -253,6 +275,7 @@ /usr/lib/python3.6/site-packages/graph_tool/inference/bisection.py /usr/lib/python3.6/site-packages/graph_tool/inference/blockmodel.py /usr/lib/python3.6/site-packages/graph_tool/inference/blockmodel_em.py + /usr/lib/python3.6/site-packages/graph_tool/inference/latent_multigraph.py /usr/lib/python3.6/site-packages/graph_tool/inference/layered_blockmodel.py /usr/lib/python3.6/site-packages/graph_tool/inference/libgraph_tool_inference.so /usr/lib/python3.6/site-packages/graph_tool/inference/mcmc.py @@ -295,6 +318,11 @@ /usr/share/doc/graph-tool/doc/conf.py /usr/share/doc/graph-tool/doc/correlations.rst /usr/share/doc/graph-tool/doc/demos/animation/animation.rst + /usr/share/doc/graph-tool/doc/demos/cppextensions/Makefile + /usr/share/doc/graph-tool/doc/demos/cppextensions/cppextensions.rst + /usr/share/doc/graph-tool/doc/demos/cppextensions/kcore.cc + /usr/share/doc/graph-tool/doc/demos/cppextensions/kcore.hh + /usr/share/doc/graph-tool/doc/demos/cppextensions/kcore.py /usr/share/doc/graph-tool/doc/demos/index.rst /usr/share/doc/graph-tool/doc/demos/inference/inference.rst /usr/share/doc/graph-tool/doc/draw.rst @@ -339,11 +367,11 @@ - 2018-12-12 - 2.27 + 2019-09-11 + 2.29 Packaging update - Pierre-Yves - pyu@riseup.net + Padraig Mac Carron + padraig.maccarron@ul.ie \ No newline at end of file