From: ahesford <ahesford@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] python3-Cython: update to 3.0.1.
Date: Thu, 31 Aug 2023 03:02:29 +0200 [thread overview]
Message-ID: <20230831010229.5fZyFT9Qkjbpdra0daXuPrM15p_4gIVfqtzsCiI3m-U@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-45086@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1246 bytes --]
There is an updated pull request by ahesford against master on the void-packages repository
https://github.com/ahesford/void-packages python3-Cython-3.0.0
https://github.com/void-linux/void-packages/pull/45086
python3-Cython: update to 3.0.1.
This is a big update that reflects several years of extensive work, and needs some testing to be sure it doesn't break any Void packages.
#### Testing the changes
- I tested the changes in this PR: **in progress**
The following packages need to be fixed to build with new Cython:
- [ ] gbinder-python
- [ ] jack_mixer
- [ ] libimobiledevice
- [ ] memray
- [ ] pyliblo
- [x] python3-cypari2
- [x] python3-cysignals
- [ ] python3-efl
- [x] python3-fpylll
- [ ] python3-grpcio
- [ ] python3-h5py
- [ ] python3-jq
- [ ] python3-logbook
- [x] python3-lxml
- [ ] python3-mpi4py
- [ ] python3-pandas-msgpack
- [ ] python3-peewee
- [x] python3-pplpy
- [ ] python3-pyFFTW
- [ ] python3-pygame
- [x] python3-scikit-learn
- [x] python3-scipy
- [ ] python3-shapely
- [ ] python3-tables
- [ ] python3-uvloop
- [x] python3-yaml
- [ ] sagemath
- [ ] urh
- [ ] vapoursynth
- [ ] vidcutter
A patch file from https://github.com/void-linux/void-packages/pull/45086.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-python3-Cython-3.0.0-45086.patch --]
[-- Type: text/x-diff, Size: 48562 bytes --]
From d559394753b1141c04d528abe4c9caaf447764e6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 17 Jul 2023 13:18:36 -0400
Subject: [PATCH 01/32] python3-Cython: update to 3.0.2.
---
srcpkgs/python3-Cython/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/python3-Cython/template b/srcpkgs/python3-Cython/template
index 2daf981d349b4..59b34a747da5b 100644
--- a/srcpkgs/python3-Cython/template
+++ b/srcpkgs/python3-Cython/template
@@ -1,25 +1,26 @@
# Template file for 'python3-Cython'
pkgname=python3-Cython
-version=0.29.36
+version=3.0.2
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
makedepends="python3-devel"
depends="python3-setuptools"
-short_desc="C-Extensions for Python3"
+short_desc="Python to C compiler"
maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="Apache-2.0"
homepage="https://cython.org/"
changelog="https://raw.githubusercontent.com/cython/cython/master/CHANGES.rst"
distfiles="${PYPI_SITE}/C/Cython/Cython-${version}.tar.gz"
-checksum=41c0cfd2d754e383c9eeb95effc9aa4ab847d0c9747077ddd7c0dcb68c3bc01f
+checksum=9594818dca8bb22ae6580c5222da2bc5cc32334350bd2d294a00d8669bcc61b5
# Tests are flaky
make_check=no
alternatives="
cython:cygdb:/usr/bin/cygdb3
cython:cython:/usr/bin/cython3
- cython:cythonize:/usr/bin/cythonize3"
+ cython:cythonize:/usr/bin/cythonize3
+"
post_install() {
mv ${DESTDIR}/usr/bin/cygdb{,3}
From f336dd2fab49fb48a63330652dac4320a931fac4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 26 Aug 2023 13:17:50 -0400
Subject: [PATCH 02/32] New package: python3-Cython0.29-0.29.36
---
srcpkgs/python3-Cython0.29/template | 31 +++++++++++++++++++++++++++++
srcpkgs/python3-Cython0.29/update | 3 +++
2 files changed, 34 insertions(+)
create mode 100644 srcpkgs/python3-Cython0.29/template
create mode 100644 srcpkgs/python3-Cython0.29/update
diff --git a/srcpkgs/python3-Cython0.29/template b/srcpkgs/python3-Cython0.29/template
new file mode 100644
index 0000000000000..61b0a69041e15
--- /dev/null
+++ b/srcpkgs/python3-Cython0.29/template
@@ -0,0 +1,31 @@
+# Template file for 'python3-Cython0.29'
+pkgname=python3-Cython0.29
+version=0.29.36
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+depends="python3-setuptools"
+short_desc="Python to C compiler (legacy version)"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="Apache-2.0"
+homepage="https://cython.org/"
+changelog="https://raw.githubusercontent.com/cython/cython/master/CHANGES.rst"
+distfiles="${PYPI_SITE}/C/Cython/Cython-${version}.tar.gz"
+checksum=41c0cfd2d754e383c9eeb95effc9aa4ab847d0c9747077ddd7c0dcb68c3bc01f
+# Test are flaky
+make_check=no
+
+conflicts="python3-Cython>=0"
+
+alternatives="
+ cython:cygdb:/usr/bin/cygdb3
+ cython:cython:/usr/bin/cython3
+ cython:cythonize:/usr/bin/cythonize3
+"
+
+post_install() {
+ mv ${DESTDIR}/usr/bin/cygdb{,3}
+ mv ${DESTDIR}/usr/bin/cython{,3}
+ mv ${DESTDIR}/usr/bin/cythonize{,3}
+}
diff --git a/srcpkgs/python3-Cython0.29/update b/srcpkgs/python3-Cython0.29/update
new file mode 100644
index 0000000000000..7fbe21105b46e
--- /dev/null
+++ b/srcpkgs/python3-Cython0.29/update
@@ -0,0 +1,3 @@
+pkgname=Cython
+pattern="Cython-\K0\.[\d\.]+(?=.tar.gz)"
+ignore="*[A-Za-z]*"
From 831a643b11d5e4ae23a64609930d8ff599e35ed4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 17 Jul 2023 16:11:36 -0400
Subject: [PATCH 03/32] python3-yaml: patch and rebuild for Cython 3
---
srcpkgs/python3-yaml/patches/cython3.patch | 11 +++++++++++
srcpkgs/python3-yaml/template | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/python3-yaml/patches/cython3.patch
diff --git a/srcpkgs/python3-yaml/patches/cython3.patch b/srcpkgs/python3-yaml/patches/cython3.patch
new file mode 100644
index 0000000000000..601e79891aac3
--- /dev/null
+++ b/srcpkgs/python3-yaml/patches/cython3.patch
@@ -0,0 +1,11 @@
+--- a/setup.py
++++ b/setup.py
+@@ -81,7 +81,7 @@
+ with_cython = True
+ try:
+ from Cython.Distutils.extension import Extension as _Extension
+- from Cython.Distutils import build_ext as _build_ext
++ from Cython.Distutils.old_build_ext import old_build_ext as _build_ext
+ with_cython = True
+ except ImportError:
+ if with_cython:
diff --git a/srcpkgs/python3-yaml/template b/srcpkgs/python3-yaml/template
index f281f217fa403..ab7417caf44c9 100644
--- a/srcpkgs/python3-yaml/template
+++ b/srcpkgs/python3-yaml/template
@@ -1,7 +1,7 @@
# Template file for 'python3-yaml'
pkgname=python3-yaml
version=6.0
-revision=2
+revision=3
build_style=python3-module
hostmakedepends="python3-setuptools python3-Cython"
makedepends="libyaml-devel python3-devel"
From 4a18c3011e1de0f9df96a0a1dea4f390e2402e5d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 18 Jul 2023 09:40:26 -0400
Subject: [PATCH 04/32] python3-scikit-learn: update to 1.3.0.
---
.../patches/numpy-version.patch | 11 +++++++++++
srcpkgs/python3-scikit-learn/template | 14 ++++++++------
2 files changed, 19 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/python3-scikit-learn/patches/numpy-version.patch
diff --git a/srcpkgs/python3-scikit-learn/patches/numpy-version.patch b/srcpkgs/python3-scikit-learn/patches/numpy-version.patch
new file mode 100644
index 0000000000000..0ffb53e3433e9
--- /dev/null
+++ b/srcpkgs/python3-scikit-learn/patches/numpy-version.patch
@@ -0,0 +1,11 @@
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -9,7 +9,7 @@
+ # wheels on PyPI
+ #
+ # see: https://github.com/scipy/oldest-supported-numpy/blob/main/setup.cfg
+- "oldest-supported-numpy; python_version!='3.10' or platform_system!='Windows' or platform_python_implementation=='PyPy'",
++ "numpy>=1.23.2; python_version!='3.10' or platform_system!='Windows' or platform_python_implementation=='PyPy'",
+ # For CPython 3.10 under Windows, SciPy requires NumPy 1.22.3 while the
+ # oldest supported NumPy is defined as 1.21.6. We therefore need to force
+ # it for this specific configuration. For details, see
diff --git a/srcpkgs/python3-scikit-learn/template b/srcpkgs/python3-scikit-learn/template
index 9fc96efd4ab17..aed65406cad2b 100644
--- a/srcpkgs/python3-scikit-learn/template
+++ b/srcpkgs/python3-scikit-learn/template
@@ -1,17 +1,19 @@
# Template file for 'python3-scikit-learn'
pkgname=python3-scikit-learn
-version=0.24.2
-revision=3
-build_style=python3-module
-hostmakedepends="python3-setuptools python3-Cython python3-numpy python3-scipy"
-makedepends="python3-devel"
+version=1.3.0
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-setuptools python3-Cython python3-numpy python3-scipy
+ python3-wheel"
+makedepends="python3-devel libgomp-devel"
depends="python3-numpy python3-scipy python3-joblib python3-threadpoolctl"
short_desc="Python3 modules for machine learning and data mining"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause"
homepage="https://scikit-learn.org/"
distfiles="https://github.com/scikit-learn/scikit-learn/archive/${version}.tar.gz"
-checksum=642fb016bfe4bb7539ba6bf4e6dd5a95d2d25638387040b0f5eefdb84a840297
+checksum=ead129f466a0859555ce4f41280ae06623ef3255efff0b1692c57f15e39767b5
+make_check=no # tests don't work properly unless package is installed
export SKLEARN_BUILD_PARALLEL="${XBPS_MAKEJOBS}"
From 93e1ae91f4c3abd66711dc335ca5d7ec575f294b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Wed, 19 Jul 2023 10:36:33 -0300
Subject: [PATCH 05/32] python3-cysignals: patch and rebuild for Cython 3
---
.../patches/cython3-fix-warning.patch | 13 ++++++++
.../patches/cython3-legacy.patch | 30 +++++++++++++++++++
srcpkgs/python3-cysignals/template | 2 +-
3 files changed, 44 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/python3-cysignals/patches/cython3-fix-warning.patch
create mode 100644 srcpkgs/python3-cysignals/patches/cython3-legacy.patch
diff --git a/srcpkgs/python3-cysignals/patches/cython3-fix-warning.patch b/srcpkgs/python3-cysignals/patches/cython3-fix-warning.patch
new file mode 100644
index 0000000000000..98cad9625e402
--- /dev/null
+++ b/srcpkgs/python3-cysignals/patches/cython3-fix-warning.patch
@@ -0,0 +1,13 @@
+diff --git a/src/cysignals/signals.pxd.in b/src/cysignals/signals.pxd.in
+index c86e085..a98c8d1 100644
+--- a/src/cysignals/signals.pxd.in
++++ b/src/cysignals/signals.pxd.in
+@@ -54,7 +54,7 @@ cdef extern from "macros.h" nogil:
+ # can be used to make Cython check whether there is a pending exception
+ # (PyErr_Occurred() is non-NULL). To Cython, it will look like
+ # cython_check_exception() actually raised the exception.
+-cdef inline void cython_check_exception() nogil except *:
++cdef inline void cython_check_exception() except * nogil:
+ pass
+
+
diff --git a/srcpkgs/python3-cysignals/patches/cython3-legacy.patch b/srcpkgs/python3-cysignals/patches/cython3-legacy.patch
new file mode 100644
index 0000000000000..274575d5d3539
--- /dev/null
+++ b/srcpkgs/python3-cysignals/patches/cython3-legacy.patch
@@ -0,0 +1,30 @@
+commit 9996a4028ddc7f9a5ffda3df65d5b7d3b7df8aa5
+Author: Gonzalo Tornaría <tornaria@cmat.edu.uy>
+Date: Wed Jul 19 18:34:57 2023 -0300
+
+ cython3 support using legacy directives
+
+diff --git a/setup.py b/setup.py
+index 37acdfc..f68270b 100755
+--- a/setup.py
++++ b/setup.py
+@@ -157,13 +157,17 @@ class build_ext(_build_ext):
+ # Run Cython with -Werror on continuous integration services
+ # with Python 3.6 or later
+ from Cython.Compiler import Options
+- Options.warning_errors = True
++ Options.warning_errors = False
+
+ from Cython.Build.Dependencies import cythonize
+ return cythonize(extensions,
+ build_dir=cythonize_dir,
+ include_path=["src", os.path.join(cythonize_dir, "src")],
+- compiler_directives=dict(binding=True, language_level=2))
++ compiler_directives=dict(
++ binding=True,
++ language_level=2,
++ legacy_implicit_noexcept=True,
++ ))
+
+
+ class build_py(_build_py):
diff --git a/srcpkgs/python3-cysignals/template b/srcpkgs/python3-cysignals/template
index bd9563353ba07..739cbc91a96b0 100644
--- a/srcpkgs/python3-cysignals/template
+++ b/srcpkgs/python3-cysignals/template
@@ -1,7 +1,7 @@
# Template file for 'python3-cysignals'
pkgname=python3-cysignals
version=1.11.2
-revision=4
+revision=5
build_style=python3-module
hostmakedepends="python3-setuptools python3-Cython autoconf"
makedepends="python3-devel pari-devel"
From a347f00e73de44ef3076892de92354c377984532 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Wed, 19 Jul 2023 20:13:30 -0300
Subject: [PATCH 06/32] python3-cypari2: patch and rebuild for Cython 3
---
.../patches/cython3-legacy.patch | 32 +++++++++++++++++++
srcpkgs/python3-cypari2/template | 2 +-
2 files changed, 33 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/python3-cypari2/patches/cython3-legacy.patch
diff --git a/srcpkgs/python3-cypari2/patches/cython3-legacy.patch b/srcpkgs/python3-cypari2/patches/cython3-legacy.patch
new file mode 100644
index 0000000000000..41392fe80d736
--- /dev/null
+++ b/srcpkgs/python3-cypari2/patches/cython3-legacy.patch
@@ -0,0 +1,32 @@
+commit 8ef356a4eb936c37f55a5c501f3a955e6740c0c5
+Author: Gonzalo Tornaría <tornaria@cmat.edu.uy>
+Date: Wed Jul 19 19:45:23 2023 -0300
+
+ cython3 support using legacy directives
+
+diff --git a/cypari2/gen.pyx b/cypari2/gen.pyx
+index 247b1ad..75050a0 100644
+--- a/cypari2/gen.pyx
++++ b/cypari2/gen.pyx
+@@ -329,7 +329,7 @@ cdef class Gen(Gen_base):
+ >>> pari = Pari()
+ >>> L = pari("vector(10,i,i^2)")
+ >>> L.__iter__()
+- <generator object at ...>
++ <...generator object at ...>
+ >>> [x for x in L]
+ [1, 4, 9, 16, 25, 36, 49, 64, 81, 100]
+ >>> list(L)
+diff --git a/setup.py b/setup.py
+index 2188711..455337f 100755
+--- a/setup.py
++++ b/setup.py
+@@ -36,6 +36,8 @@ class build_ext(_build_ext):
+ "binding": True,
+ "cdivision": True,
+ "language_level": 2,
++ "legacy_implicit_noexcept": True,
++ "c_api_binop_methods": True,
+ }
+
+ _build_ext.finalize_options(self)
diff --git a/srcpkgs/python3-cypari2/template b/srcpkgs/python3-cypari2/template
index 8ac4dd3a56247..8d46c443e960c 100644
--- a/srcpkgs/python3-cypari2/template
+++ b/srcpkgs/python3-cypari2/template
@@ -1,7 +1,7 @@
# Template file for 'python3-cypari2'
pkgname=python3-cypari2
version=2.1.3
-revision=3
+revision=4
build_style=python3-module
hostmakedepends="python3-setuptools python3-Cython pari perl"
makedepends="python3-devel python3-cysignals pari-devel gmp-devel"
From 3f51dc32a9ac1e6fa5687f4226bb59fa06add43f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Wed, 19 Jul 2023 20:40:19 -0300
Subject: [PATCH 07/32] python3-fpylll: patch and rebuild for Cython 3
---
.../patches/cython3-legacy.patch | 37 +++++++++++++++++++
srcpkgs/python3-fpylll/template | 2 +-
2 files changed, 38 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/python3-fpylll/patches/cython3-legacy.patch
diff --git a/srcpkgs/python3-fpylll/patches/cython3-legacy.patch b/srcpkgs/python3-fpylll/patches/cython3-legacy.patch
new file mode 100644
index 0000000000000..808c14e9c1b47
--- /dev/null
+++ b/srcpkgs/python3-fpylll/patches/cython3-legacy.patch
@@ -0,0 +1,37 @@
+commit b6e12c2b0648e84b26dcf0aac507a5b4d9dde301
+Author: Gonzalo Tornaría <tornaria@cmat.edu.uy>
+Date: Wed Jul 19 20:38:01 2023 -0300
+
+ cython3 support using legacy directives
+
+diff --git a/setup.py b/setup.py
+index 274836f..8fc5af5 100755
+--- a/setup.py
++++ b/setup.py
+@@ -123,7 +123,12 @@ class build_ext(_build_ext, object):
+ self.extensions,
+ include_path=["src"],
+ build_dir=self.cythonize_dir,
+- compiler_directives={"binding": True, "embedsignature": True, "language_level": 2},
++ compiler_directives={
++ "binding": True,
++ "embedsignature": True,
++ "language_level": 2,
++ "legacy_implicit_noexcept": True,
++ },
+ )
+ super(build_ext, self).run()
+
+diff --git a/src/fpylll/fplll/enumeration_callback_helper.h b/src/fpylll/fplll/enumeration_callback_helper.h
+index c099430..706162f 100644
+--- a/src/fpylll/fplll/enumeration_callback_helper.h
++++ b/src/fpylll/fplll/enumeration_callback_helper.h
+@@ -5,7 +5,7 @@
+ #include <Python.h>
+ #include <fplll/fplll.h>
+
+-extern "C" {
++extern "C++" {
+ bool evaluator_callback_call_obj(PyObject *obj, int n, double *new_sol_coord);
+ }
+
diff --git a/srcpkgs/python3-fpylll/template b/srcpkgs/python3-fpylll/template
index e4fd9584c795d..8880d5fa6173c 100644
--- a/srcpkgs/python3-fpylll/template
+++ b/srcpkgs/python3-fpylll/template
@@ -1,7 +1,7 @@
# Template file for 'python3-fpylll'
pkgname=python3-fpylll
version=0.5.9
-revision=1
+revision=2
build_style=python3-module
hostmakedepends="python3-Cython"
makedepends="python3-cysignals python3-devel gmp-devel mpfr-devel fplll-devel
From bf696fd2b9e545882602f66d6f132995fe4df738 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Wed, 19 Jul 2023 21:04:33 -0300
Subject: [PATCH 08/32] python3-pplpy: patch and rebuild for Cython 3
---
...8537fa7ea061ebb8d5131b1e23673eaf741d.patch | 22 ++++++++++++++++++
.../patches/cython3-legacy.patch | 23 +++++++++++++++++++
srcpkgs/python3-pplpy/template | 2 +-
3 files changed, 46 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/python3-pplpy/patches/aaa28537fa7ea061ebb8d5131b1e23673eaf741d.patch
create mode 100644 srcpkgs/python3-pplpy/patches/cython3-legacy.patch
diff --git a/srcpkgs/python3-pplpy/patches/aaa28537fa7ea061ebb8d5131b1e23673eaf741d.patch b/srcpkgs/python3-pplpy/patches/aaa28537fa7ea061ebb8d5131b1e23673eaf741d.patch
new file mode 100644
index 0000000000000..21bc2a5214df4
--- /dev/null
+++ b/srcpkgs/python3-pplpy/patches/aaa28537fa7ea061ebb8d5131b1e23673eaf741d.patch
@@ -0,0 +1,22 @@
+From aaa28537fa7ea061ebb8d5131b1e23673eaf741d Mon Sep 17 00:00:00 2001
+From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
+Date: Sun, 31 Jul 2022 12:39:34 -0700
+Subject: [PATCH] ppl/bit_arrays.pxd: Use relative cimport
+
+---
+ ppl/bit_arrays.pxd | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ppl/bit_arrays.pxd b/ppl/bit_arrays.pxd
+index eb57434..145a978 100644
+--- a/ppl/bit_arrays.pxd
++++ b/ppl/bit_arrays.pxd
+@@ -1,4 +1,4 @@
+-from ppl_decl cimport *
++from .ppl_decl cimport *
+
+ cdef class Bit_Row(object):
+ cdef PPL_Bit_Row *thisptr
+--
+GitLab
+
diff --git a/srcpkgs/python3-pplpy/patches/cython3-legacy.patch b/srcpkgs/python3-pplpy/patches/cython3-legacy.patch
new file mode 100644
index 0000000000000..e00b99f8c5f2e
--- /dev/null
+++ b/srcpkgs/python3-pplpy/patches/cython3-legacy.patch
@@ -0,0 +1,23 @@
+commit e6f3e66154138ce3e31e803e74b8c71787c70acc
+Author: Gonzalo Tornaría <tornaria@cmat.edu.uy>
+Date: Wed Jul 19 20:47:52 2023 -0300
+
+ cython3 support using legacy directives
+
+diff --git a/setup.py b/setup.py
+index 13d543b..55dcd34 100755
+--- a/setup.py
++++ b/setup.py
+@@ -38,7 +38,11 @@ class build_ext(_build_ext):
+ self.extensions[:] = cythonize(
+ self.extensions,
+ include_path=sys.path,
+- compiler_directives={'embedsignature': True})
++ compiler_directives={
++ 'embedsignature': True,
++ 'legacy_implicit_noexcept': True,
++ 'c_api_binop_methods': True,
++ })
+
+ _build_ext.run(self)
+
diff --git a/srcpkgs/python3-pplpy/template b/srcpkgs/python3-pplpy/template
index 67139ff96031f..6023c63f87982 100644
--- a/srcpkgs/python3-pplpy/template
+++ b/srcpkgs/python3-pplpy/template
@@ -1,7 +1,7 @@
# Template file for 'python3-pplpy'
pkgname=python3-pplpy
version=0.8.7
-revision=3
+revision=4
build_style=python3-module
hostmakedepends="python3-setuptools python3-Cython"
makedepends="python3-cysignals python3-gmpy2 python3-devel gmp-devel
From 52d6583d901f05bd3113f45ebe7313d46d8d0eaa Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 26 Aug 2023 15:57:12 -0400
Subject: [PATCH 09/32] python3-lxml: patch and rebuild for Cython 3
---
.../patches/cython3-fix-test.patch | 32 +++++++++++++++++++
.../python3-lxml/patches/cython3-legacy.patch | 12 +++++++
...-prefix-nsmap.diff => libxml-2.10.4.patch} | 12 ++++---
...fix-tests-io.patch => libxml-2.11.0.patch} | 3 +-
srcpkgs/python3-lxml/template | 2 +-
5 files changed, 55 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/python3-lxml/patches/cython3-fix-test.patch
create mode 100644 srcpkgs/python3-lxml/patches/cython3-legacy.patch
rename srcpkgs/python3-lxml/patches/{fix-test-html-prefix-nsmap.diff => libxml-2.10.4.patch} (56%)
rename srcpkgs/python3-lxml/patches/{fix-tests-io.patch => libxml-2.11.0.patch} (83%)
diff --git a/srcpkgs/python3-lxml/patches/cython3-fix-test.patch b/srcpkgs/python3-lxml/patches/cython3-fix-test.patch
new file mode 100644
index 0000000000000..70348622048cb
--- /dev/null
+++ b/srcpkgs/python3-lxml/patches/cython3-fix-test.patch
@@ -0,0 +1,32 @@
+diff --git a/src/lxml/tests/test_errors.py b/src/lxml/tests/test_errors.py
+index c0aee744..4875f298 100644
+--- a/src/lxml/tests/test_errors.py
++++ b/src/lxml/tests/test_errors.py
+@@ -28,7 +28,6 @@ class ErrorTestCase(HelperTestCase):
+ def test_element_cyclic_gc_none(self):
+ # test if cyclic reference can crash etree
+ Element = self.etree.Element
+- getrefcount = sys.getrefcount
+
+ # must disable tracing as it could change the refcounts
+ trace_func = sys.gettrace()
+@@ -36,16 +35,16 @@ class ErrorTestCase(HelperTestCase):
+ sys.settrace(None)
+ gc.collect()
+
+- count = getrefcount(None)
++ count1 = gc.get_count()
+
+ l = [Element('name'), Element('name')]
+ l.append(l)
+
+ del l
+ gc.collect()
+- count = getrefcount(None) - count
++ count2 = gc.get_count()
+
+- self.assertEqual(count, 0)
++ self.assertEqual(count1, count2)
+ finally:
+ sys.settrace(trace_func)
+
diff --git a/srcpkgs/python3-lxml/patches/cython3-legacy.patch b/srcpkgs/python3-lxml/patches/cython3-legacy.patch
new file mode 100644
index 0000000000000..3a01c85705cb5
--- /dev/null
+++ b/srcpkgs/python3-lxml/patches/cython3-legacy.patch
@@ -0,0 +1,12 @@
+diff --git a/setupinfo.py b/setupinfo.py
+index 5feb13bf..ea1b391c 100644
+--- a/setupinfo.py
++++ b/setupinfo.py
+@@ -148,6 +148,7 @@ def ext_modules(static_include_dirs, static_library_dirs,
+
+ cythonize_directives = {
+ 'binding': True,
++ 'legacy_implicit_noexcept': True,
+ }
+ if OPTION_WITH_COVERAGE:
+ cythonize_directives['linetrace'] = True
diff --git a/srcpkgs/python3-lxml/patches/fix-test-html-prefix-nsmap.diff b/srcpkgs/python3-lxml/patches/libxml-2.10.4.patch
similarity index 56%
rename from srcpkgs/python3-lxml/patches/fix-test-html-prefix-nsmap.diff
rename to srcpkgs/python3-lxml/patches/libxml-2.10.4.patch
index 084769b69aeb9..4682eddd6f541 100644
--- a/srcpkgs/python3-lxml/patches/fix-test-html-prefix-nsmap.diff
+++ b/srcpkgs/python3-lxml/patches/libxml-2.10.4.patch
@@ -1,13 +1,17 @@
+From alpine: https://gitlab.alpinelinux.org/alpine/aports/-/tree/master/main/py3-lxml
+
+the find above returns None with this version
+--
diff --git a/src/lxml/tests/test_etree.py b/src/lxml/tests/test_etree.py
-index 0339796d..de584c56 100644
+index 0339796..790c57a 100644
--- a/src/lxml/tests/test_etree.py
+++ b/src/lxml/tests/test_etree.py
-@@ -3072,8 +3072,6 @@ class ETreeOnlyTestCase(HelperTestCase):
- el = etree.HTML('<hha:page-description>aa</hha:page-description>').find('.//page-description')
+@@ -3073,7 +3073,7 @@ class ETreeOnlyTestCase(HelperTestCase):
if etree.LIBXML_VERSION < (2, 9, 11):
self.assertEqual({'hha': None}, el.nsmap)
-- else:
+ else:
- self.assertEqual({}, el.nsmap)
++ self.assertEqual(None, el)
def test_getchildren(self):
Element = self.etree.Element
diff --git a/srcpkgs/python3-lxml/patches/fix-tests-io.patch b/srcpkgs/python3-lxml/patches/libxml-2.11.0.patch
similarity index 83%
rename from srcpkgs/python3-lxml/patches/fix-tests-io.patch
rename to srcpkgs/python3-lxml/patches/libxml-2.11.0.patch
index 9a3001d4e9265..6ed59d3b2fe2b 100644
--- a/srcpkgs/python3-lxml/patches/fix-tests-io.patch
+++ b/srcpkgs/python3-lxml/patches/libxml-2.11.0.patch
@@ -1,3 +1,5 @@
+From alpine: https://gitlab.alpinelinux.org/alpine/aports/-/tree/master/main/py3-lxml
+
diff --git a/src/lxml/tests/test_io.py b/src/lxml/tests/test_io.py
index cbdbcef..efbd3fd 100644
--- a/src/lxml/tests/test_io.py
@@ -10,4 +12,3 @@ index cbdbcef..efbd3fd 100644
f = tempfile.NamedTemporaryFile(delete=False)
try:
-
diff --git a/srcpkgs/python3-lxml/template b/srcpkgs/python3-lxml/template
index 8251b74c7b53f..76756b84ded1f 100644
--- a/srcpkgs/python3-lxml/template
+++ b/srcpkgs/python3-lxml/template
@@ -1,7 +1,7 @@
# Template file for 'python3-lxml'
pkgname=python3-lxml
version=4.9.3
-revision=1
+revision=2
build_style=python3-module
make_build_args="--with-cython"
hostmakedepends="python3-Cython python3-setuptools"
From 523c92fba3ec1d27b1d0a51e35a5b54a1a5ff6a4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 21 Jul 2023 08:33:05 -0400
Subject: [PATCH 10/32] python3-pandas-msgpack: rebuild for Cython 3
---
srcpkgs/python3-pandas-msgpack/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-pandas-msgpack/template b/srcpkgs/python3-pandas-msgpack/template
index 16a4d014ea6b6..99912a195b0f4 100644
--- a/srcpkgs/python3-pandas-msgpack/template
+++ b/srcpkgs/python3-pandas-msgpack/template
@@ -1,17 +1,18 @@
# Template file for 'python3-pandas-msgpack'
pkgname=python3-pandas-msgpack
version=0.1.5
-revision=4
+revision=5
build_style=python3-module
hostmakedepends="python3-setuptools python3-Cython"
makedepends="python3-devel"
-depends="python3-pandas>=0.25.3"
+depends="python3-pandas"
short_desc="Providing an interface to msgpack from pandas"
maintainer="Pulux <pulux@pf4sh.de>"
license="BSD-3-Clause"
homepage="https://www.pf4sh.eu/git/pulux/pandas-msgpack/"
distfiles="https://www.pf4sh.eu/git/pulux/pandas-msgpack/archive/${version}.tar.gz"
-checksum=e01b1158c66265315338657310ac42edac81b33a5b178a68b29adcf2aeefd22e
+checksum=25288bc498cc0f9579c227cf33e20fc41d6d47ef58cc9fde27ede9796a647822
+make_check=no # Tests rely on obsolete pandas features
post_install() {
vlicense LICENSE.md
From 5dc14b9c21bded3ac07ed2461391134db58123be Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 26 Aug 2023 13:23:52 -0400
Subject: [PATCH 11/32] gbinder-python: build with python3-Cython0.29
---
srcpkgs/gbinder-python/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gbinder-python/template b/srcpkgs/gbinder-python/template
index 61f60323adb16..8fcbba86d38c2 100644
--- a/srcpkgs/gbinder-python/template
+++ b/srcpkgs/gbinder-python/template
@@ -4,7 +4,7 @@ version=1.1.1
revision=2
build_style=python3-module
make_build_args="--cython"
-hostmakedepends="python3-Cython pkg-config"
+hostmakedepends="python3-Cython0.29 pkg-config"
makedepends="libgbinder-devel python3-devel"
depends="python3"
short_desc="Python bindings for libgbinder"
From 77a306a6b23e567263b2fcf112bd68acc61f1730 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 26 Aug 2023 13:23:52 -0400
Subject: [PATCH 12/32] jack_mixer: build with python3-Cython0.29
---
srcpkgs/jack_mixer/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/jack_mixer/template b/srcpkgs/jack_mixer/template
index b012cd8dfac39..79044eef65b5e 100644
--- a/srcpkgs/jack_mixer/template
+++ b/srcpkgs/jack_mixer/template
@@ -4,7 +4,7 @@ version=17
revision=2
build_style=meson
configure_args="-Dcheck-py-modules=false"
-hostmakedepends="gettext pkg-config python3-Cython"
+hostmakedepends="gettext pkg-config python3-Cython0.29"
makedepends="glib-devel jack-devel python3-devel"
depends="python3-cairo python3-gobject python3-xdg"
short_desc="GTK JACK audio mixer with a look similar to its hardware counterpart"
From 6f7ad31e2714ab0f8eb332a4be147b158db39935 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 26 Aug 2023 13:23:52 -0400
Subject: [PATCH 13/32] libimobiledevice: build with python3-Cython0.29
---
srcpkgs/libimobiledevice/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libimobiledevice/template b/srcpkgs/libimobiledevice/template
index 4415908a80cd5..be776d71f3e12 100644
--- a/srcpkgs/libimobiledevice/template
+++ b/srcpkgs/libimobiledevice/template
@@ -3,7 +3,7 @@ pkgname=libimobiledevice
version=1.3.0
revision=5
build_style=gnu-configure
-hostmakedepends="automake libtool pkgconf python3-Cython"
+hostmakedepends="automake libtool pkgconf python3-Cython0.29"
makedepends="python3-devel libglib-devel openssl-devel
libusb-devel libplist-devel libusbmuxd-devel"
short_desc="Library to communicate with Apple devices"
From e004ba2fd76e07fd511a05d8bfdb1b5c95d15cd3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 26 Aug 2023 13:23:53 -0400
Subject: [PATCH 14/32] pyliblo: build with python3-Cython0.29
---
srcpkgs/pyliblo/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pyliblo/template b/srcpkgs/pyliblo/template
index 9577e72555e4e..805e103ed018a 100644
--- a/srcpkgs/pyliblo/template
+++ b/srcpkgs/pyliblo/template
@@ -3,7 +3,7 @@ pkgname=pyliblo
version=0.10.0
revision=3
build_style=python3-module
-hostmakedepends="python3-setuptools python3-Cython"
+hostmakedepends="python3-setuptools python3-Cython0.29"
makedepends="python3-devel liblo-devel"
depends="python3"
short_desc="Python bindings for the liblo OSC library"
From 43993b5542577d1b01a6180b9e5ebdb9c087f97c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 26 Aug 2023 13:23:53 -0400
Subject: [PATCH 15/32] python3-efl: build with python3-Cython0.29
---
srcpkgs/python3-efl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/python3-efl/template b/srcpkgs/python3-efl/template
index 2431dac9619cc..861eb51e4a9cb 100644
--- a/srcpkgs/python3-efl/template
+++ b/srcpkgs/python3-efl/template
@@ -3,7 +3,7 @@ pkgname=python3-efl
version=1.23.0
revision=6
build_style=python3-module
-hostmakedepends="pkg-config python3-devel python3-Cython"
+hostmakedepends="pkg-config python3-devel python3-Cython0.29"
makedepends="efl-devel python3-dbus-devel"
depends="python3-dbus"
short_desc="Python3 bindings for Enlightenment Foundation Libraries"
From 7f21de672c9a591154d0e2c844642395aadf65df Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 26 Aug 2023 13:23:53 -0400
Subject: [PATCH 16/32] python3-grpcio: build with python3-Cython0.29
---
srcpkgs/python3-grpcio/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/python3-grpcio/template b/srcpkgs/python3-grpcio/template
index 34522a28ead4e..87f388500f5bf 100644
--- a/srcpkgs/python3-grpcio/template
+++ b/srcpkgs/python3-grpcio/template
@@ -3,7 +3,7 @@ pkgname=python3-grpcio
version=1.56.0
revision=3
build_style=python3-module
-hostmakedepends="python3-setuptools python3-six python3-Cython"
+hostmakedepends="python3-setuptools python3-six python3-Cython0.29"
makedepends="python3-devel zlib-devel c-ares-devel re2-devel openssl-devel
abseil-cpp-devel"
depends="python3-six"
From 13900b7c18a78bd53e76c026fa929fca92811e11 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 26 Aug 2023 13:23:53 -0400
Subject: [PATCH 17/32] python3-h5py: build with python3-Cython0.29
---
srcpkgs/python3-h5py/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/python3-h5py/template b/srcpkgs/python3-h5py/template
index d491f5cc3aca2..59f2d7c9b2253 100644
--- a/srcpkgs/python3-h5py/template
+++ b/srcpkgs/python3-h5py/template
@@ -4,7 +4,7 @@ version=3.9.0
revision=1
build_style=python3-module
build_helper="numpy"
-hostmakedepends="python3-setuptools python3-Cython python3-pkgconfig"
+hostmakedepends="python3-setuptools python3-Cython0.29 python3-pkgconfig"
makedepends="python3-devel hdf5-devel"
depends="python3-numpy"
short_desc="HDF5 for Python"
From 5007c25775ce92e6c472e3b10d0a30804815444f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 26 Aug 2023 13:23:53 -0400
Subject: [PATCH 18/32] python3-jq: build with python3-Cython0.29
---
srcpkgs/python3-jq/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/python3-jq/template b/srcpkgs/python3-jq/template
index 96a87c6f86031..70e3bee46f6fd 100644
--- a/srcpkgs/python3-jq/template
+++ b/srcpkgs/python3-jq/template
@@ -3,7 +3,7 @@ pkgname=python3-jq
version=1.4.1
revision=1
build_style=python3-module
-hostmakedepends="python3-setuptools python3-Cython"
+hostmakedepends="python3-setuptools python3-Cython0.29"
makedepends="python3-devel jq-devel oniguruma-devel"
depends="python3"
short_desc="Python bindings for jq"
From c24b78cc5ee21dfca9d99339d1edb9fd80f0d46a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 26 Aug 2023 13:23:53 -0400
Subject: [PATCH 19/32] python3-logbook: build with python3-Cython0.29
---
srcpkgs/python3-logbook/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/python3-logbook/template b/srcpkgs/python3-logbook/template
index 319bb1e19ab53..4993e417dc079 100644
--- a/srcpkgs/python3-logbook/template
+++ b/srcpkgs/python3-logbook/template
@@ -4,7 +4,7 @@ version=1.5.3
revision=6
build_style=python3-pep517
make_check_args="--ignore=scripts"
-hostmakedepends="python3-setuptools python3-wheel python3-devel python3-Cython"
+hostmakedepends="python3-setuptools python3-wheel python3-devel python3-Cython0.29"
depends="python3"
checkdepends="python3-execnet python3-pytest python3-pyzmq python3-SQLAlchemy
python3-Jinja2 python3-Brotli"
From 1229d44843fb123c3008ed8a2402bd9490f8b749 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 26 Aug 2023 13:23:53 -0400
Subject: [PATCH 20/32] python3-mpi4py: build with python3-Cython0.29
---
srcpkgs/python3-mpi4py/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/python3-mpi4py/template b/srcpkgs/python3-mpi4py/template
index 4daa548133d5b..e1762a93a3361 100644
--- a/srcpkgs/python3-mpi4py/template
+++ b/srcpkgs/python3-mpi4py/template
@@ -3,7 +3,7 @@ pkgname=python3-mpi4py
version=3.1.4
revision=1
build_style=python3-module
-hostmakedepends="python3-setuptools python3-Cython gcc-fortran openmpi"
+hostmakedepends="python3-setuptools python3-Cython0.29 gcc-fortran openmpi"
makedepends="python3-devel openmpi-devel"
depends="openmpi python3"
short_desc="Python bindings for the Message Passing Interface (MPI) standard"
From c878909909fd0f75fc8690285e398ad1bace1c37 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 26 Aug 2023 15:41:34 -0400
Subject: [PATCH 21/32] python3-pandas: build with python3-Cython0.29
---
srcpkgs/python3-pandas/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/python3-pandas/template b/srcpkgs/python3-pandas/template
index 2831b6e56f171..0f102b557072f 100644
--- a/srcpkgs/python3-pandas/template
+++ b/srcpkgs/python3-pandas/template
@@ -3,7 +3,8 @@ pkgname=python3-pandas
version=2.0.3
revision=1
build_style=python3-module
-hostmakedepends="python3-setuptools python3-Cython python3-numpy python3-versioneer"
+hostmakedepends="python3-setuptools python3-Cython0.29 python3-numpy
+ python3-versioneer"
makedepends="python3-devel python3-numpy python3-dateutil python3-pytz"
depends="python3-numpy python3-dateutil python3-pytz"
short_desc="Python3 data analysis library"
From 32455f151d6d13ef26fc24e3a30b03ccebcec414 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 26 Aug 2023 13:23:54 -0400
Subject: [PATCH 22/32] python3-peewee: build with python3-Cython0.29
---
srcpkgs/python3-peewee/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/python3-peewee/template b/srcpkgs/python3-peewee/template
index dc6c8573c1e50..d8e586f5e7d18 100644
--- a/srcpkgs/python3-peewee/template
+++ b/srcpkgs/python3-peewee/template
@@ -3,7 +3,7 @@ pkgname=python3-peewee
version=3.14.4
revision=4
build_style=python3-module
-hostmakedepends="python3-setuptools python3-Cython"
+hostmakedepends="python3-setuptools python3-Cython0.29"
makedepends="python3-devel sqlite-devel"
depends="python3"
short_desc="Small and simple ORM for Python3"
From c0328bdc1916d00dc208a8fa67f76f09a38c67a0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 26 Aug 2023 13:23:54 -0400
Subject: [PATCH 23/32] python3-pyFFTW: build with python3-Cython0.29
---
srcpkgs/python3-pyFFTW/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/python3-pyFFTW/template b/srcpkgs/python3-pyFFTW/template
index 93d3d9079d694..055a53fe833b9 100644
--- a/srcpkgs/python3-pyFFTW/template
+++ b/srcpkgs/python3-pyFFTW/template
@@ -3,7 +3,7 @@ pkgname=python3-pyFFTW
version=0.13.1
revision=1
build_style=python3-module
-hostmakedepends="python3-setuptools python3-Cython python3-numpy"
+hostmakedepends="python3-setuptools python3-Cython0.29 python3-numpy"
makedepends="fftw-devel python3-devel"
depends="python3-numpy"
checkdepends="python3-pytest-xdist python3-scipy $depends"
From 757ace7408681b0e4bb98d93a0719086d76fda01 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 26 Aug 2023 13:23:54 -0400
Subject: [PATCH 24/32] python3-pygame: build with python3-Cython0.29
---
srcpkgs/python3-pygame/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/python3-pygame/template b/srcpkgs/python3-pygame/template
index 9edc626b0b81a..284268e85cab3 100644
--- a/srcpkgs/python3-pygame/template
+++ b/srcpkgs/python3-pygame/template
@@ -4,7 +4,7 @@ version=2.1.2
revision=4
build_style=python3-module
make_build_args="cython"
-hostmakedepends="pkg-config python3-setuptools python3-Cython
+hostmakedepends="pkg-config python3-setuptools python3-Cython0.29
SDL2_mixer-devel SDL2_image-devel SDL2_ttf-devel libjpeg-turbo-devel portmidi-devel"
makedepends="python3-devel SDL2_mixer-devel SDL2_image-devel
SDL2_ttf-devel libjpeg-turbo-devel portmidi-devel"
From b6accdc00e20b7b6088d639948c6f98a4eafabba Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 26 Aug 2023 13:23:54 -0400
Subject: [PATCH 25/32] python3-shapely: build with python3-Cython0.29
---
srcpkgs/python3-shapely/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/python3-shapely/template b/srcpkgs/python3-shapely/template
index 02447337f9ae9..25711a7fc2399 100644
--- a/srcpkgs/python3-shapely/template
+++ b/srcpkgs/python3-shapely/template
@@ -4,7 +4,7 @@ version=2.0.1
revision=1
build_style=python3-module
build_helper=numpy
-hostmakedepends="python3-setuptools python3-Cython geos"
+hostmakedepends="python3-setuptools python3-Cython0.29 geos"
makedepends="python3-devel python3-numpy geos-devel"
depends="python3"
checkdepends="python3-pytest-xdist"
From 182e6e98f1ff2f0fd8aa1a43ae9ebf8d07de630e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 26 Aug 2023 13:23:54 -0400
Subject: [PATCH 26/32] python3-tables: build with python3-Cython0.29
---
srcpkgs/python3-tables/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/python3-tables/template b/srcpkgs/python3-tables/template
index e37b3e215e3be..8be57ea0088d6 100644
--- a/srcpkgs/python3-tables/template
+++ b/srcpkgs/python3-tables/template
@@ -5,7 +5,7 @@ revision=2
build_style=python3-module
build_helper=numpy
# XXX: c-blosc (using internal for now)
-hostmakedepends="python3-wheel python3-Cython python3-packaging"
+hostmakedepends="python3-wheel python3-Cython0.29 python3-packaging"
makedepends="python3-devel hdf5-devel lzo-devel bzip2-devel"
depends="python3-numpy python3-numexpr python3-packaging"
checkdepends=$depends
From 2f22c58ee960b44b82628f56ae93f944add489bb Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 26 Aug 2023 13:23:54 -0400
Subject: [PATCH 27/32] python3-uvloop: build with python3-Cython0.29
---
srcpkgs/python3-uvloop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/python3-uvloop/template b/srcpkgs/python3-uvloop/template
index 424cff0ebd116..1688adc416ac6 100644
--- a/srcpkgs/python3-uvloop/template
+++ b/srcpkgs/python3-uvloop/template
@@ -3,7 +3,7 @@ pkgname=python3-uvloop
version=0.17.0
revision=2
build_style=python3-module
-hostmakedepends="python3 python3-setuptools python3-Cython"
+hostmakedepends="python3 python3-setuptools python3-Cython0.29"
makedepends="libuv-devel python3-devel"
depends="python3"
checkdepends="flake8 python3-pytest python3-openssl python3-psutil"
From 9d6bd03ae13d648d765c3b4aab82b07dea10ab18 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 26 Aug 2023 13:23:54 -0400
Subject: [PATCH 28/32] urh: build with python3-Cython0.29
---
srcpkgs/urh/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/urh/template b/srcpkgs/urh/template
index 045c82f6b3adb..1e2721e335922 100644
--- a/srcpkgs/urh/template
+++ b/srcpkgs/urh/template
@@ -1,12 +1,12 @@
# Template file for 'urh'
pkgname=urh
version=2.9.4
-revision=1
+revision=2
build_style=python3-module
-hostmakedepends="python3-setuptools python3-Cython python3-numpy"
+hostmakedepends="python3-setuptools python3-Cython0.29 python3-numpy"
makedepends="python3-devel python3-PyQt5 libairspy-devel librtlsdr-devel
libhackrf-devel uhd-devel libgomp-devel"
-depends="python3-numpy python3-PyQt5 python3-Cython python3-psutil
+depends="python3-numpy python3-PyQt5 python3-Cython0.29 python3-psutil
python3-setuptools"
checkdepends="$depends"
short_desc="Universal Radio Hacker: investigate unknown wireless protocols"
From 0e4b4971430dbb8eac832ecd3783e17d28279513 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 26 Aug 2023 13:23:54 -0400
Subject: [PATCH 29/32] vapoursynth: update to R63, build with
python3-Cython0.29
---
srcpkgs/vapoursynth/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/vapoursynth/template b/srcpkgs/vapoursynth/template
index 4ceda6e7724ff..5f12bf2d0911e 100644
--- a/srcpkgs/vapoursynth/template
+++ b/srcpkgs/vapoursynth/template
@@ -1,9 +1,9 @@
# Template file for 'vapoursynth'
pkgname=vapoursynth
-version=R57
-revision=2
+version=R63
+revision=1
build_style=gnu-configure
-hostmakedepends="automake libtool nasm pkg-config python3-Cython"
+hostmakedepends="automake libtool nasm pkg-config python3-Cython0.29"
makedepends="python3-devel zimg-devel"
short_desc="Application for video manipulation"
maintainer="lemmi <lemmi@nerd2nerd.org>"
@@ -11,7 +11,7 @@ license="LGPL-2.1-or-later, OFL-1.1"
homepage="http://www.vapoursynth.com"
changelog="https://raw.githubusercontent.com/vapoursynth/vapoursynth/master/ChangeLog"
distfiles="https://github.com/vapoursynth/vapoursynth/archive/${version}.tar.gz"
-checksum=9bed2ab1823050cfcbdbb1a57414e39507fd6c73f07ee4b5986fcbf0f6cb2d07
+checksum=ed909b3c58e79bcbb056d07c5d301222ba8001222b4b40d5c1123be35fea9ae2
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
LDFLAGS="-latomic"
From a329c2a5a63147b601f9adef143d99ca82fb0bfd Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 26 Aug 2023 13:23:55 -0400
Subject: [PATCH 30/32] vidcutter: build with python3-Cython0.29
---
srcpkgs/vidcutter/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vidcutter/template b/srcpkgs/vidcutter/template
index bd1b1b9c20117..5030b9a25fe52 100644
--- a/srcpkgs/vidcutter/template
+++ b/srcpkgs/vidcutter/template
@@ -3,7 +3,7 @@ pkgname=vidcutter
version=6.0.5.1
revision=2
build_style=python3-module
-hostmakedepends="python3-setuptools python3-Cython"
+hostmakedepends="python3-setuptools python3-Cython0.29"
makedepends="mpv-devel python3-devel"
depends="desktop-file-utils hicolor-icon-theme ffmpeg mpv mediainfo
python3-PyOpenGL python3-PyQt5 python3-setuptools"
From 885dfe0062f5b204bb34151c381456a830ab34ac Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 28 Aug 2023 11:24:29 -0400
Subject: [PATCH 31/32] sagemath: build with python3-Cython0.29
---
srcpkgs/sagemath/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/sagemath/template b/srcpkgs/sagemath/template
index 2491d77dbc8d9..d84d818702ea7 100644
--- a/srcpkgs/sagemath/template
+++ b/srcpkgs/sagemath/template
@@ -6,8 +6,8 @@ build_wrksrc=pkgs/sagemath-standard
build_style=python3-module
_bindir=/usr/lib/sagemath/$version/bin
make_install_args="--install-scripts=$_bindir"
-hostmakedepends="m4 pkg-config python3-Cython python3-Jinja2 python3-pkgconfig
- python3-setuptools"
+hostmakedepends="m4 pkg-config python3-Cython0.29 python3-Jinja2
+ python3-pkgconfig python3-setuptools"
makedepends="arb-devel boost-devel brial-devel cliquer-devel ecl eclib-devel
ecm-devel fflas-ffpack flintlib-devel gap-devel gd-devel giac-devel glpk-devel
gsl-devel iml-devel lcalc-devel libbraiding-devel libhomfly-devel libmpc-devel
@@ -18,7 +18,7 @@ makedepends="arb-devel boost-devel brial-devel cliquer-devel ecl eclib-devel
depends="FlintQS eclib-devel fflas-ffpack flintlib-devel gcc-fortran gd-devel
gfan giac gsl-devel gzip libpng-devel linbox-devel m4ri-devel maxima-ecl
mpfr-devel nauty ntl-devel palp pari-devel pari-elldata-small pari-galdata
- pari-galpol-small pari-seadata-small pkg-config python3-Cython python3-cypari2
+ pari-galpol-small pari-seadata-small pkg-config python3-Cython0.29 python3-cypari2
python3-cysignals python3-devel python3-fpylll python3-ipython python3-lrcalc
python3-ipython_ipykernel python3-jupyter_ipywidgets python3-matplotlib
python3-memory_allocator python3-networkx python3-pip python3-pkgconfig
From 876a44536a385d9ad9c813fd9576ef29c69120d5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 26 Aug 2023 21:50:11 -0400
Subject: [PATCH 32/32] xpra: update to 5.0.
---
srcpkgs/xpra/patches/setup.patch | 13 +------------
srcpkgs/xpra/template | 8 ++++----
2 files changed, 5 insertions(+), 16 deletions(-)
diff --git a/srcpkgs/xpra/patches/setup.patch b/srcpkgs/xpra/patches/setup.patch
index 237f04308b1a7..9870936cabf46 100644
--- a/srcpkgs/xpra/patches/setup.patch
+++ b/srcpkgs/xpra/patches/setup.patch
@@ -1,6 +1,4 @@
-Make sure the build script pulls the right CFLAGS and prevent -Werror. In
-addition, remove a stray CUDA README that is only supposed to installed when
-CUDA is actually available.
+Make sure the build script pulls the right CFLAGS and prevent -Werror.
--- a/setup.py
+++ b/setup.py
@@ -31,12 +29,3 @@ CUDA is actually available.
if NETBSD:
#see: http://trac.cython.org/ticket/395
addcflags("-fno-strict-aliasing")
-@@ -2252,8 +2252,6 @@
- if nvjpeg_encoder_ENABLED or nvjpeg_decoder_ENABLED:
- add_data_files("", glob.glob(f"{CUDA_BIN_DIR}/nvjpeg64*dll"))
-
--add_data_files(CUDA_BIN, ["fs/share/xpra/cuda/README.md"])
--
- tace(nvenc_ENABLED, "xpra.codecs.nvenc.encoder", "nvenc",
- extra_compile_args="-Wno-error=sign-compare" if get_gcc_version()<(8, ) else None)
-
diff --git a/srcpkgs/xpra/template b/srcpkgs/xpra/template
index 0a63fdb6c7437..d3ee36ce48ca4 100644
--- a/srcpkgs/xpra/template
+++ b/srcpkgs/xpra/template
@@ -1,6 +1,6 @@
# Template file for 'xpra'
pkgname=xpra
-version=4.4.6
+version=5.0
revision=1
build_style=python3-module
make_build_args="--without-cuda_kernels --without-cuda_rebuild"
@@ -8,17 +8,17 @@ make_install_args="$(vopt_with docs) ${make_build_args}"
hostmakedepends="pkg-config python3-Cython $(vopt_if docs pandoc)"
makedepends="ffmpeg-devel libXcomposite-devel libXrandr-devel libXtst-devel
libvpx-devel libwebp-devel libxkbfile-devel python3-gobject-devel x264-devel
- x265-devel gtk+3-devel pam-devel libXres-devel liblz4-devel"
+ gtk+3-devel pam-devel libXres-devel liblz4-devel libavif-devel procps-ng-devel"
depends="cups python3-gobject python3-Pillow python3-cups python3-dbus
python3-lz4 python3-paramiko python3-rencode xauth xf86-video-dummy
- xorg-server-xvfb"
+ xorg-server-xvfb python3-typing_extensions python3-cairo"
short_desc="Persistent remote display server and client for X11 clients"
maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="GPL-2.0-or-later"
homepage="https://xpra.org/"
changelog="https://raw.githubusercontent.com/Xpra-org/xpra/master/docs/CHANGELOG.md"
distfiles="https://github.com/Xpra-org/xpra/archive/v${version}.tar.gz"
-checksum=7fec998cf9816df3f0fa5ded01903b07211b0c36a7316c9e9bf6db8b80fb477a
+checksum=69bf2da133a6ee28ad4e3a849f997b32e5bab4f4b616ff5acd0811e8ac9e4c14
conf_files="/etc/xpra/xpra.conf /etc/xpra/xorg.conf /etc/xpra/conf.d/*"
# Tests don't run properly without package installed
make_check=no
next prev parent reply other threads:[~2023-08-31 1:02 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-17 17:20 [PR PATCH] python3-Cython: update to 3.0.0 ahesford
2023-07-17 19:00 ` tornaria
2023-07-17 19:04 ` ahesford
2023-07-17 19:19 ` [PR PATCH] [Updated] " ahesford
2023-07-17 20:14 ` ahesford
2023-07-18 9:27 ` icp1994
2023-07-18 11:11 ` ahesford
2023-07-18 17:43 ` [PR PATCH] [Updated] " ahesford
2023-07-18 17:45 ` ahesford
2023-07-19 2:35 ` ahesford
2023-07-20 23:33 ` tornaria
2023-07-21 1:40 ` [PR PATCH] [Updated] " ahesford
2023-07-21 2:46 ` [PR REVIEW] " tornaria
2023-07-21 12:33 ` [PR PATCH] [Updated] " ahesford
2023-07-31 20:29 ` ahesford
2023-08-26 3:13 ` ahesford
2023-08-26 3:24 ` ahesford
2023-08-26 17:31 ` [PR PATCH] [Updated] python3-Cython: update to 3.0.1 ahesford
2023-08-26 20:04 ` ahesford
2023-08-26 20:04 ` [PR PATCH] [Updated] " ahesford
2023-08-26 20:43 ` ahesford
2023-08-27 14:12 ` tornaria
2023-08-28 15:23 ` [PR PATCH] [Updated] " ahesford
2023-08-28 15:26 ` ahesford
2023-08-31 1:02 ` ahesford [this message]
2023-08-31 1:15 ` ahesford
2023-08-31 14:01 ` ahesford
2023-09-01 14:36 ` ahesford
2023-09-01 15:13 ` ahesford
2023-09-01 17:32 ` [PR PATCH] [Closed]: " ahesford
2023-09-01 17:34 ` ahesford
2023-09-02 22:32 ` tornaria
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230831010229.5fZyFT9Qkjbpdra0daXuPrM15p_4gIVfqtzsCiI3m-U@z \
--to=ahesford@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).