Skip to content

update planaritry to 4.0.0.0 #40153

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vbraun merged 3 commits into from
Jun 14, 2025
Merged

update planaritry to 4.0.0.0 #40153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
36816ac
update planaritry
dimpase May 23, 2025
9e59a3e
take care of deprecation of graph.h in 4.0
dimpase May 26, 2025
9c31736
GAP pkg digraphs patch from gentoo
dimpase May 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions build/pkgs/gap_packages/patches/digraphs-planarity-4.x.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
7 changes: 4 additions & 3 deletions build/pkgs/planarity/checksums.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

2 changes: 1 addition & 1 deletion build/pkgs/planarity/package-version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.0.1.0
4.0.0.0
20 changes: 4 additions & 16 deletions build/pkgs/planarity/spkg-configure.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 <planarity/graphStructures.h>]],
[[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()
])
Loading