commit: d9da00656f72f02ed7ddea681734297c26377175
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 18 00:50:51 2023 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Wed Jan 18 01:22:42 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9da0065
sci-mathematics/nauty: add upstream patch for gentourng and gentreeg.
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
.../files/nauty-2.8.6-gentreeg-gentourng.patch | 144 +++++++++++++++++++++
.../{nauty-2.8.6.ebuild => nauty-2.8.6-r1.ebuild} | 3 +-
2 files changed, 146 insertions(+), 1 deletion(-)
diff --git a/sci-mathematics/nauty/files/nauty-2.8.6-gentreeg-gentourng.patch
b/sci-mathematics/nauty/files/nauty-2.8.6-gentreeg-gentourng.patch
new file mode 100644
index 000000000000..322b25326ee0
--- /dev/null
+++ b/sci-mathematics/nauty/files/nauty-2.8.6-gentreeg-gentourng.patch
@@ -0,0 +1,144 @@
+From edb0474a4db8e69f971e4eebe18716309f5a7bb3 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <mich...@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/sci-mathematics/nauty/nauty-2.8.6.ebuild
b/sci-mathematics/nauty/nauty-2.8.6-r1.ebuild
similarity index 95%
rename from sci-mathematics/nauty/nauty-2.8.6.ebuild
rename to sci-mathematics/nauty/nauty-2.8.6-r1.ebuild
index 4fc0728515d0..60c6882b1049 100644
--- a/sci-mathematics/nauty/nauty-2.8.6.ebuild
+++ b/sci-mathematics/nauty/nauty-2.8.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -31,6 +31,7 @@ S="${WORKDIR}/${PN}${MY_PV}"
DOCS=( schreier.txt formats.txt changes24-28.txt )
PATCHES=(
+ "${FILESDIR}/${P}-gentreeg-gentourng.patch"
"${WORKDIR}/debian/patches/upstream-fix-gt_numorbits.patch"
"${WORKDIR}/debian/patches/upstream-C2help2man.patch"
"${WORKDIR}/debian/patches/upstream-autotoolization.patch"
