[arch-commits] Commit in swig/trunk (PKGBUILD jdk17.patch python310.patch)

[Evangelos Foutras]

    Date: Wednesday, December 1, 2021 @ 19:59:03
  Author: foutrelis
Revision: 430102

Fix tests with python 3.10 and jdk 17

Added:
  swig/trunk/jdk17.patch
  swig/trunk/python310.patch
Modified:
  swig/trunk/PKGBUILD

-----------------+
 PKGBUILD        |   16 ++++++++++++++--
 jdk17.patch     |   28 ++++++++++++++++++++++++++++
 python310.patch |   23 +++++++++++++++++++++++
 3 files changed, 65 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-12-01 19:09:48 UTC (rev 430101)
+++ PKGBUILD	2021-12-01 19:59:03 UTC (rev 430102)
@@ -11,9 +11,21 @@
 license=('custom')
 depends=('pcre' 'gcc-libs')
 checkdepends=('ruby' 'python' 'java-environment' 'tcl' 'php' 'lua' 'r' 'go' 'boost')
-source=(https://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-sha512sums=('05e7da70ce6d9a733b96c0bcfa3c1b82765bd859f48c74759bbf4bb1467acb1809caa310cba5e2b3280cd704fca249eaa0624821dffae1d2a75097c7f55d14ed')
+source=(https://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
+        jdk17.patch
+        python310.patch)
+sha512sums=('05e7da70ce6d9a733b96c0bcfa3c1b82765bd859f48c74759bbf4bb1467acb1809caa310cba5e2b3280cd704fca249eaa0624821dffae1d2a75097c7f55d14ed'
+            '06671202b6a1f82e96166ada7982b9dd70ae5365dc90c4f24e81596963f7bd3960913f2eca5250ad76bee4b2e51f10ed922595722036e3da9da63d6aa988cb3e'
+            '3de6484d920d8ecf042102d40af3a375ecb1ead3c4e0bc45ae63633e5fd652f52e1938108f747514a654a19d93a783afe2968b141be56957f438162263d62d8a')
 
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -Np1 -i ../jdk17.patch
+
+  # https://github.com/swig/swig/issues/2044
+  patch -Np1 -i ../python310.patch
+}
+
 build() {
   cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr

Added: jdk17.patch
===================================================================
--- jdk17.patch	                        (rev 0)
+++ jdk17.patch	2021-12-01 19:59:03 UTC (rev 430102)
@@ -0,0 +1,28 @@
+From 34e663a61af13eec62050d2b105ace418929e289 Mon Sep 17 00:00:00 2001
+From: William S Fulton <wsf at fultondesigns.co.uk>
+Date: Sat, 20 Mar 2021 09:49:30 +0000
+Subject: [PATCH] Test a different C# keyword rename
+
+Worked around warning in java jdk-15:
+  warning: 'sealed' may become a restricted type name in a future release
+  and may be unusable for type declarations or as the element type of an array
+
+Adding sealed to the list of automatically renamed keywords in Java does
+not seem prudent.
+---
+ Examples/test-suite/keyword_rename.i | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Examples/test-suite/keyword_rename.i b/Examples/test-suite/keyword_rename.i
+index 23c01087dc4..645f0266112 100644
+--- a/Examples/test-suite/keyword_rename.i
++++ b/Examples/test-suite/keyword_rename.i
+@@ -27,7 +27,7 @@ KW(synchronized, final)
+ 
+ /* C# Keywords */
+ KW(string, out)
+-struct sealed {int i;};
++struct stackalloc {int i;};
+ 
+ /* Go Keywords */
+ KW(go, defer)

Added: python310.patch
===================================================================
--- python310.patch	                        (rev 0)
+++ python310.patch	2021-12-01 19:59:03 UTC (rev 430102)
@@ -0,0 +1,23 @@
+From a2850397ba3eec5d4c58304cf8277ca535919760 Mon Sep 17 00:00:00 2001
+From: Julien Schueller <schueller at phimeca.com>
+Date: Thu, 5 Aug 2021 14:05:10 +0200
+Subject: [PATCH] [Python] Fix overload_simple_cast test with 3.10
+
+Closes #2044
+---
+ Examples/test-suite/python/python_overload_simple_cast_runme.py | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/Examples/test-suite/python/python_overload_simple_cast_runme.py b/Examples/test-suite/python/python_overload_simple_cast_runme.py
+index fc398ab29b9..7a0174af8a2 100644
+--- a/Examples/test-suite/python/python_overload_simple_cast_runme.py
++++ b/Examples/test-suite/python/python_overload_simple_cast_runme.py
+@@ -9,6 +9,8 @@ def __init__(self, x):
+     def __int__(self):
+         return self.x
+ 
++    def __index__(self):
++        return self.x
+ 
+ class Ad:
+