diff --git a/build/pkgs/gap_packages/patches/digraphs-planarity-4.x.patch b/build/pkgs/gap_packages/patches/digraphs-planarity-4.x.patch new file mode 100644 index 00000000000..11a65bb1388 --- /dev/null +++ b/build/pkgs/gap_packages/patches/digraphs-planarity-4.x.patch @@ -0,0 +1,14 @@ +--- a/pkg/digraphs/src/planar.c ++++ b/pkg/digraphs/src/planar.c +@@ -38,10 +38,7 @@ + #include "c/graphK33Search.h" + #include "c/graphK4Search.h" + #else +-#include "planarity/graph.h" +-#include "planarity/graphK23Search.h" +-#include "planarity/graphK33Search.h" +-#include "planarity/graphK4Search.h" ++#include "planarity/graphLib.h" + #endif + #if defined(__clang__) + #pragma clang diagnostic pop diff --git a/build/pkgs/planarity/checksums.ini b/build/pkgs/planarity/checksums.ini index 3caec0cca3f..0b4764743ed 100644 --- a/build/pkgs/planarity/checksums.ini +++ b/build/pkgs/planarity/checksums.ini @@ -1,4 +1,5 @@ tarball=planarity-VERSION.tar.gz -sha1=8407bccf33c07bf0dae22d79b5e6ac7d89c62ea3 -sha256=63e979d37e7160e4e72a286a8dd7ba74e4795f63742f417c8ba1cea2b2a51280 -upstream_url=https://github.com/sagemath/sage-package/releases/download/tars/planarity-VERSION.tar.gz +sha1=85574b846db77a2258d5ab5279464184990cb21e +sha256=df3c86c32fd37b801079aea7de67675efdef12ada557cbcaae821e81b8db438d +upstream_url=https://github.com/graph-algorithms/edge-addition-planarity-suite/releases/download/Version_VERSION/planarity-VERSION.tar.gz + diff --git a/build/pkgs/planarity/package-version.txt b/build/pkgs/planarity/package-version.txt index 9a2596b9e46..fd5e525d9b0 100644 --- a/build/pkgs/planarity/package-version.txt +++ b/build/pkgs/planarity/package-version.txt @@ -1 +1 @@ -3.0.1.0 +4.0.0.0 diff --git a/build/pkgs/planarity/spkg-configure.m4 b/build/pkgs/planarity/spkg-configure.m4 index 355332a72e7..4b0584422c9 100644 --- a/build/pkgs/planarity/spkg-configure.m4 +++ b/build/pkgs/planarity/spkg-configure.m4 @@ -1,20 +1,8 @@ SAGE_SPKG_CONFIGURE([planarity], [ AC_LANG_PUSH([C]) - AC_CHECK_HEADER([planarity/graph.h], [ - AC_CHECK_LIB([planarity], [gp_InitGraph], [ - AC_MSG_CHECKING([for planarity version 3.0 or later]) - AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM( - [[#include ]], - [[vertexRec v;] - [v.link[0]=1;]]) - ], [ - AC_MSG_RESULT([yes]) - ], [ - AC_MSG_RESULT([no]) - sage_spkg_install_planarity=yes - ]) - ], [sage_spkg_install_planarity=yes]) - ], [sage_spkg_install_planarity=yes]) + AC_CHECK_LIB([planarity], [gp_InitGraph], [ + AC_CHECK_HEADERS([planarity/graphLib.h planarity/graph.h], [ + ], [sage_spkg_install_planarity=yes])dnl have not found planarity 3.* or newer headers + ], [sage_spkg_install_planarity=yes])dnl have not found planarity dylib AC_LANG_POP() ])