[PR PATCH] nauty: update to 2.8.8.

[PR PATCH] nauty: update to 2.8.8.

[tornaria]

[-- Attachment #1: Type: text/plain, Size: 1379 bytes --]

There is a new pull request by tornaria against master on the void-packages repository

https://github.com/tornaria/void-packages nauty
https://github.com/void-linux/void-packages/pull/47406

nauty: update to 2.8.8.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

Tested with sagemath (one test failure fixed in https://github.com/sagemath/sage/pull/36771, not necessary for us to patch sagemath now)

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/47406.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nauty-47406.patch --]
[-- Type: text/x-diff, Size: 4659 bytes --]

From 681d96b1492ca1937ebf9beab70227e617f1b14f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sat, 25 Nov 2023 11:47:44 -0300
Subject: [PATCH] nauty: update to 2.8.8.

---
 .../nauty-2.8.6-gentreeg-gentourng.patch      | 144 ------------------
 srcpkgs/nauty/template                        |   4 +-
 2 files changed, 2 insertions(+), 146 deletions(-)
 delete mode 100644 srcpkgs/nauty/patches/nauty-2.8.6-gentreeg-gentourng.patch

diff --git a/srcpkgs/nauty/patches/nauty-2.8.6-gentreeg-gentourng.patch b/srcpkgs/nauty/patches/nauty-2.8.6-gentreeg-gentourng.patch
deleted file mode 100644
index 322b25326ee09..0000000000000
--- a/srcpkgs/nauty/patches/nauty-2.8.6-gentreeg-gentourng.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-From edb0474a4db8e69f971e4eebe18716309f5a7bb3 Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Tue, 17 Jan 2023 19:44:49 -0500
-Subject: [PATCH 1/1] Upstream fixes for gentreeg and gentourng.
-
-https://mailman.anu.edu.au/pipermail/nauty/2023-January/000903.html
----
- gentourng.c |  2 +-
- gentreeg.c  | 95 ++++++++++++++++++++++++++++-------------------------
- 2 files changed, 51 insertions(+), 46 deletions(-)
-
-diff --git a/gentourng.c b/gentourng.c
-index 634e5e8..5c7ffff 100644
---- a/gentourng.c
-+++ b/gentourng.c
-@@ -1408,7 +1408,7 @@ PLUGIN_INIT
-                 (*outproc)(outfile,g,1);
-             }
-         }
--        else
-+        else if (!connec || maxn != 2)
-         {
-             makeleveldata();
- 
-diff --git a/gentreeg.c b/gentreeg.c
-index 946d5f8..15bf87b 100644
---- a/gentreeg.c
-+++ b/gentreeg.c
-@@ -1,4 +1,4 @@
--/* gentree version 1.3; Brendan McKay Oct 2022 */
-+/* gentree version 1.4; Brendan McKay Dec 2022 */
- /* This program is a wrapper for the program FreeTrees.c written
-  * by Gang Li & Frank Ruskey.  See below for their original
-  * comments. */
-@@ -32,49 +32,54 @@ Counts for n=1..45:
-  1: 1
-  2: 1
-  3: 1
-- 4: 1
-- 5: 2
-- 6: 3
-- 7: 6
-- 8: 11
-- 9: 23
--10: 47
--11: 106
--12: 235
--13: 551
--14: 1301
--15: 3159
--16: 7741
--17: 19320
--18: 48629
--19: 123867
--20: 317955
--21: 823065
--22: 2144505
--23: 5623756
--24: 14828074
--25: 39299897
--26: 104636890
--27: 279793450
--28: 751065460
--29: 2023443032
--30: 5469566585
--31: 14830871802
--32: 40330829030
--33: 109972410221
--34: 300628862480
--35: 823779631721
--36: 2262366343746
--37: 6226306037178
--38: 17169677490714
--39: 47436313524262
--40: 131290543779126
--41: 363990257783343
--42: 1010748076717151
--43: 2810986483493475
--44: 7828986221515605
--45: 21835027912963086
--********************************/
-+ 4: 2
-+ 5: 3
-+ 6: 6
-+ 7: 11
-+ 8: 23
-+ 9: 47
-+10: 106
-+11: 235
-+12: 551
-+13: 1301
-+14: 3159
-+15: 7741
-+16: 19320
-+17: 48629
-+18: 123867
-+19: 317955
-+20: 823065
-+21: 2144505
-+22: 5623756
-+23: 14828074
-+24: 39299897
-+25: 104636890
-+26: 279793450
-+27: 751065460
-+28: 2023443032
-+29: 5469566585
-+30: 14830871802
-+31: 40330829030
-+32: 109972410221
-+33: 300628862480
-+34: 823779631721
-+35: 2262366343746
-+36: 6226306037178
-+37: 17169677490714
-+38: 47436313524262
-+39: 131290543779126
-+40: 363990257783343
-+41: 1010748076717151
-+42: 2810986483493475
-+43: 7828986221515605
-+44: 21835027912963086
-+45: 60978390985918906
-+46: 170508699155987862
-+47: 477355090753926460
-+48: 1337946100045842285
-+49: 3754194185716399992
-+50: 10545233702911509534
-+*******************************/
- 
- /* Comments on original program by original authors */
- /*==============================================================*/
-@@ -676,7 +681,7 @@ PLUGIN_INIT
-         }
-         else if (nv == 2)
-         {
--            if (res == 0 && maxdeg >= 1 && mindiam <= 1 && maxdiam >= 2)
-+            if (res == 0 && maxdeg >= 1 && mindiam <= 1 && maxdiam >= 1)
-             {
-                 par[1] = 0;
-                 par[2] = 1;
--- 
-2.38.2
-
diff --git a/srcpkgs/nauty/template b/srcpkgs/nauty/template
index 8be5d050920bc..6f85b1d064d4e 100644
--- a/srcpkgs/nauty/template
+++ b/srcpkgs/nauty/template
@@ -1,6 +1,6 @@
 # Template file for 'nauty'
 pkgname=nauty
-version=2.8.6
+version=2.8.8
 revision=1
 build_style=gnu-configure
 make_install_args="includedir=/usr/include/nauty
@@ -12,7 +12,7 @@ license="Apache-2.0"
 homepage="https://pallini.di.uniroma1.it/"
 changelog="https://pallini.di.uniroma1.it/changes24-28.txt"
 distfiles="https://pallini.di.uniroma1.it/nauty${version//./_}.tar.gz"
-checksum=f2ce98225ca8330f5bce35f7d707b629247e09dda15fc479dc00e726fee5e6fa
+checksum=159d2156810a6bb240410cd61eb641add85088d9f15c888cdaa37b8681f929ce
 
 build_options="native_build"
 

Re: [PR PATCH] [Merged]: nauty: update to 2.8.8.

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 1228 bytes --]

There's a merged pull request on the void-packages repository

nauty: update to 2.8.8.
https://github.com/void-linux/void-packages/pull/47406

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

Tested with sagemath (one test failure fixed in https://github.com/sagemath/sage/pull/36771, not necessary for us to patch sagemath now)

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->