From ac0688ca1a95bc419a65e0682fee2daa30df763f Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Sun, 16 Aug 2026 20:47:23 -0400 Subject: [PATCH] dev-gap/digraphs: add 1.15.0, drop 1.14.0-r2 Signed-off-by: Michael Orlitzky --- dev-gap/digraphs/Manifest | 2 +- ....14.0-r2.ebuild => digraphs-1.15.0.ebuild} | 5 +- .../files/digraphs-1.14-planarity-5.patch | 103 ------------------ 3 files changed, 2 insertions(+), 108 deletions(-) rename dev-gap/digraphs/{digraphs-1.14.0-r2.ebuild => digraphs-1.15.0.ebuild} (87%) delete mode 100644 dev-gap/digraphs/files/digraphs-1.14-planarity-5.patch diff --git a/dev-gap/digraphs/Manifest b/dev-gap/digraphs/Manifest index f85cece57ffb6..bc3b2dd20f65a 100644 --- a/dev-gap/digraphs/Manifest +++ b/dev-gap/digraphs/Manifest @@ -1 +1 @@ -DIST digraphs-1.14.0.tar.gz 2897892 BLAKE2B cc5965eedb7383399e424d69ab23521dbcd261645c4c1e5e86f027c326b35f30c3fdeb3640ab5843a054699071b4657cbd2b4f18070b7692a28f232d95828d53 SHA512 0d732d0fd72485470b0e13979d6d08f0e614c43ae89313f2d603d2ed5652d2d9c813207ca2101c87e1914252bb81d58df7fdfe006adb25615d855853fd10fde7 +DIST digraphs-1.15.0.tar.gz 2924538 BLAKE2B 8b6ea06b540e778eb5c67f9ccdc3731caa6b78c1ae6a7a2f97a4eaddd246ef1353b7e4370668c46f8c6e5abb99e6c84fef05633be7216826528a866d7472b986 SHA512 400c51ca7d7987cd4f40a55f00f8ed3f3835cc193b94607c48669147d284b668e0739fea2d3a57ad9caace6eaedc4b6d7333cffcb9d11bff08275a8a0f7b99c6 diff --git a/dev-gap/digraphs/digraphs-1.14.0-r2.ebuild b/dev-gap/digraphs/digraphs-1.15.0.ebuild similarity index 87% rename from dev-gap/digraphs/digraphs-1.14.0-r2.ebuild rename to dev-gap/digraphs/digraphs-1.15.0.ebuild index f1131be24bfb4..cfac34b9f5a25 100644 --- a/dev-gap/digraphs/digraphs-1.14.0-r2.ebuild +++ b/dev-gap/digraphs/digraphs-1.15.0.ebuild @@ -32,15 +32,12 @@ BDEPEND="test? ( || ( DOCS=( CHANGELOG.md README.md ) -PATCHES=( "${FILESDIR}/digraphs-1.14-planarity-5.patch" ) - GAP_PKG_EXTRA_INSTALL=( data notebooks ) gap-pkg_enable_tests src_prepare() { # belt and suspenders - rm -r extern/bliss-0.73 \ - extern/edge-addition-planarity-suite-Version_4.0.0.0 \ + rm -r extern/edge-addition-planarity-suite-Version_5.0.0.0 \ || die default diff --git a/dev-gap/digraphs/files/digraphs-1.14-planarity-5.patch b/dev-gap/digraphs/files/digraphs-1.14-planarity-5.patch deleted file mode 100644 index cf981b697da44..0000000000000 --- a/dev-gap/digraphs/files/digraphs-1.14-planarity-5.patch +++ /dev/null @@ -1,103 +0,0 @@ -diff --git a/Makefile.in b/Makefile.in -index 0cc11139..05b4b237 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -47,7 +47,8 @@ endif - ifdef WITH_INCLUDED_PLANARITY - KEXT_SOURCES += \ - $(PLANARITY_SUITE_DIR)/c/graphLib/graphDFSUtils.c \ -- $(PLANARITY_SUITE_DIR)/c/graphLib/graphUtils.c \ -+ $(PLANARITY_SUITE_DIR)/c/graphLib/graph.c \ -+ $(PLANARITY_SUITE_DIR)/c/graphLib/graphLib.c \ - $(PLANARITY_SUITE_DIR)/c/graphLib/extensionSystem/graphExtensions.c \ - $(PLANARITY_SUITE_DIR)/c/graphLib/homeomorphSearch/graphK23Search.c \ - $(PLANARITY_SUITE_DIR)/c/graphLib/homeomorphSearch/graphK23Search_Extensions.c \ -@@ -70,6 +71,8 @@ ifdef WITH_INCLUDED_PLANARITY - $(PLANARITY_SUITE_DIR)/c/graphLib/planarityRelated/graphIsolator.c \ - $(PLANARITY_SUITE_DIR)/c/graphLib/planarityRelated/graphNonplanar.c \ - $(PLANARITY_SUITE_DIR)/c/graphLib/planarityRelated/graphOuterplanarObstruction.c \ -+ $(PLANARITY_SUITE_DIR)/c/graphLib/planarityRelated/graphOuterplanarity_Extensions.c \ -+ $(PLANARITY_SUITE_DIR)/c/graphLib/planarityRelated/graphPlanarity_Extensions.c \ - $(PLANARITY_SUITE_DIR)/c/graphLib/planarityRelated/graphTests.c - - KEXT_CFLAGS += -I$(PLANARITY_SUITE_DIR) -include extern/eaps_flags.h -diff --git a/m4/ax_check_planarity.m4 b/m4/ax_check_planarity.m4 -index 4f1c66d5..70af478a 100644 ---- a/m4/ax_check_planarity.m4 -+++ b/m4/ax_check_planarity.m4 -@@ -23,7 +23,7 @@ AC_DEFUN([AX_CHECK_PLANARITY], [ - #else - #error too old - #endif -- int main(void) { gp_InitGraph(0, 0); } -+ int main(void) { gp_EnsureVertexCapacity(0, 0); } - ])], [ - AC_MSG_RESULT([yes]) - ], [ -diff --git a/src/planar.c b/src/planar.c -index 72e5b304..f705f8eb 100644 ---- a/src/planar.c -+++ b/src/planar.c -@@ -33,12 +33,12 @@ - #pragma GCC diagnostic ignored "-Wswitch-default" - #endif - #ifdef DIGRAPHS_WITH_INCLUDED_PLANARITY --#include "c/graph.h" -+#include "c/graphLib.h" - #include "c/graphLib/homeomorphSearch/graphK23Search.h" - #include "c/graphLib/homeomorphSearch/graphK33Search.h" - #include "c/graphLib/homeomorphSearch/graphK4Search.h" - #else --#include "planarity/graph.h" -+#include "planarity/graphLib.h" - #include "planarity/c/graphLib/homeomorphSearch/graphK23Search.h" - #include "planarity/c/graphLib/homeomorphSearch/graphK33Search.h" - #include "planarity/c/graphLib/homeomorphSearch/graphK4Search.h" -@@ -169,13 +169,13 @@ Obj boyers_planarity_check(Obj digraph, int flags, bool krtwsk) { - - graphP theGraph = gp_New(); - -- if (gp_InitGraph(theGraph, V) != OK) { -+ if (gp_EnsureVertexCapacity(theGraph, V) != OK) { - gp_Free(&theGraph); - ErrorQuit("Digraphs: boyers_planarity_check (C): invalid number of nodes!", - 0L, - 0L); - return 0L; -- } else if (gp_EnsureArcCapacity(theGraph, 2 * E) != OK) { -+ } else if (gp_EnsureEdgeCapacity(theGraph, 2 * E) != OK) { - gp_Free(&theGraph); - ErrorQuit("Digraphs: boyers_planarity_check (C): invalid number of edges!", - 0L, -@@ -185,13 +185,13 @@ Obj boyers_planarity_check(Obj digraph, int flags, bool krtwsk) { - - switch (flags) { - case EMBEDFLAGS_SEARCHFORK33: -- gp_AttachK33Search(theGraph); -+ gp_ExtendWith_K33Search(theGraph); - break; - case EMBEDFLAGS_SEARCHFORK23: -- gp_AttachK23Search(theGraph); -+ gp_ExtendWith_K23Search(theGraph); - break; - case EMBEDFLAGS_SEARCHFORK4: -- gp_AttachK4Search(theGraph); -+ gp_ExtendWith_K4Search(theGraph); - break; - default: - break; -@@ -202,11 +202,11 @@ Obj boyers_planarity_check(Obj digraph, int flags, bool krtwsk) { - - // Construct the antisymmetric digraph with no loops - for (Int v = 1; v <= LEN_LIST(out); ++v) { -- DIGRAPHS_ASSERT(gp_VertexInRange(theGraph, v)); -- gp_SetVertexIndex(theGraph, v, v); -+ DIGRAPHS_ASSERT(v < gp_UpperBoundVertices(theGraph)); -+ gp_SetIndex(theGraph, v, v); - Obj const out_v = ELM_LIST(out, v); - for (Int w = 1; w <= LEN_LIST(out_v); ++w) { -- DIGRAPHS_ASSERT(gp_VertexInRange(theGraph, w)); -+ DIGRAPHS_ASSERT(w < gp_UpperBoundVertices(theGraph)); - Int u = INT_INTOBJ(ELM_LIST(out_v, w)); - if (v < u - || CALL_3ARGS(IsDigraphEdge, digraph, INTOBJ_INT(u), INTOBJ_INT(v))