From 9a0774c0c6b32ac95e3d5ce10164c0025db41872 Mon Sep 17 00:00:00 2001 From: Zach van Rijn Date: Thu, 23 Mar 2023 14:38:09 +0000 Subject: user/swig: patch broken test. fixes #470. This patch is in upstream v4.10.0 and up. --- user/swig/APKBUILD | 10 ++++++---- user/swig/fix-overload-simple-cast-test.patch | 23 +++++++++++++++++++++++ 2 files changed, 29 insertions(+), 4 deletions(-) create mode 100644 user/swig/fix-overload-simple-cast-test.patch diff --git a/user/swig/APKBUILD b/user/swig/APKBUILD index 5780d1150..20ec308c1 100644 --- a/user/swig/APKBUILD +++ b/user/swig/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Zach van Rijn pkgname=swig pkgver=4.0.2 -pkgrel=1 +pkgrel=2 pkgdesc="Tool for integrating C and C++ code with other languages" url="http://www.swig.org/" arch="all" @@ -10,7 +10,9 @@ depends="" checkdepends="boost-dev diffutils" makedepends="pcre-dev perl-dev python3-dev zlib-dev" subpackages="$pkgname-doc" -source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz" +source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz + fix-overload-simple-cast-test.patch + " build() { ./configure \ @@ -23,7 +25,6 @@ build() { } check() { - find Examples/test-suite/python -type f -name "python_overload_simple_cast*" -delete #470 env PERL5LIB=. PY3=YES PATH=/usr/sbin:/usr/bin:/sbin:/bin make check } @@ -33,4 +34,5 @@ package() { install -D -m644 LICENSE-UNIVERSITIES "$pkgdir"/usr/share/licenses/$pkgname/LICENSE-UNIVERSITIES } -sha512sums="05e7da70ce6d9a733b96c0bcfa3c1b82765bd859f48c74759bbf4bb1467acb1809caa310cba5e2b3280cd704fca249eaa0624821dffae1d2a75097c7f55d14ed swig-4.0.2.tar.gz" +sha512sums="05e7da70ce6d9a733b96c0bcfa3c1b82765bd859f48c74759bbf4bb1467acb1809caa310cba5e2b3280cd704fca249eaa0624821dffae1d2a75097c7f55d14ed swig-4.0.2.tar.gz +3de6484d920d8ecf042102d40af3a375ecb1ead3c4e0bc45ae63633e5fd652f52e1938108f747514a654a19d93a783afe2968b141be56957f438162263d62d8a fix-overload-simple-cast-test.patch" diff --git a/user/swig/fix-overload-simple-cast-test.patch b/user/swig/fix-overload-simple-cast-test.patch new file mode 100644 index 000000000..a3c8cff26 --- /dev/null +++ b/user/swig/fix-overload-simple-cast-test.patch @@ -0,0 +1,23 @@ +From a2850397ba3eec5d4c58304cf8277ca535919760 Mon Sep 17 00:00:00 2001 +From: Julien Schueller +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: + -- cgit v1.2.3-60-g2f50