diff options
Diffstat (limited to 'source/l')
-rw-r--r-- | source/l/python-PyYAML/cython3.compat.patch | 39 | ||||
-rw-r--r-- | source/l/python-PyYAML/pyproject.toml.cython3.patch | 7 | ||||
-rwxr-xr-x | source/l/python-PyYAML/python-PyYAML.SlackBuild | 6 | ||||
-rwxr-xr-x | source/l/qt6/qt6.SlackBuild | 4 |
4 files changed, 53 insertions, 3 deletions
diff --git a/source/l/python-PyYAML/cython3.compat.patch b/source/l/python-PyYAML/cython3.compat.patch new file mode 100644 index 000000000..4c924f496 --- /dev/null +++ b/source/l/python-PyYAML/cython3.compat.patch @@ -0,0 +1,39 @@ +From 17dc5b6cd96dcfe64fd71789c771ca9b96d260e5 Mon Sep 17 00:00:00 2001 +From: "Andrew J. Hesford" <ajh@sideband.org> +Date: Fri, 21 Jul 2023 09:50:00 -0400 +Subject: [PATCH] Fix builds with Cython 3 + +This is a *de minimis* fix for building with Cython 3. Recent Cython<3 +releases provided `Cython.Distutils.build_ext` as an alias to +`Cython.Distutils.old_build_ext.old_build_ext`; Cython 3 drops this +alias and instead uses a wholly new `Cython.Distutils.build_ext` that +does not provide the `cython_sources` function used in `setup.py`. + +Explicitly importing `old_build_ext` preserves the existing behavior for +recent Cython<3 and uses the correct behavior for Cython 3. Should the +import fail (*e.g.*, because the version of Cython available predates +the availability of `old_build_ext`), the import falls back to just +`Cython.Distutils.build_ext`. + +Signed-off-by: Andrew J. Hesford <ajh@sideband.org> +--- + setup.py | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index 944e7fa2..462b1e95 100644 +--- a/setup.py ++++ b/setup.py +@@ -82,7 +82,11 @@ + with_cython = True + try: + from Cython.Distutils.extension import Extension as _Extension +- from Cython.Distutils import build_ext as _build_ext ++ try: ++ from Cython.Distutils.old_build_ext import old_build_ext as _build_ext ++ except ImportError: ++ from Cython.Distutils import build_ext as _build_ext ++ + with_cython = True + except ImportError: + if with_cython: diff --git a/source/l/python-PyYAML/pyproject.toml.cython3.patch b/source/l/python-PyYAML/pyproject.toml.cython3.patch new file mode 100644 index 000000000..d8578d859 --- /dev/null +++ b/source/l/python-PyYAML/pyproject.toml.cython3.patch @@ -0,0 +1,7 @@ +--- ./pyproject.toml.orig 2023-07-17 18:39:53.000000000 -0500 ++++ ./pyproject.toml 2024-03-03 13:11:48.147039844 -0600 +@@ -1,3 +1,3 @@ + [build-system] +-requires = ["setuptools", "wheel", "Cython<3.0"] ++requires = ["setuptools", "wheel", "Cython"] + build-backend = "setuptools.build_meta" diff --git a/source/l/python-PyYAML/python-PyYAML.SlackBuild b/source/l/python-PyYAML/python-PyYAML.SlackBuild index d24aa269a..5ffae5ad2 100755 --- a/source/l/python-PyYAML/python-PyYAML.SlackBuild +++ b/source/l/python-PyYAML/python-PyYAML.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=python-PyYAML SRCNAM=PyYAML VERSION=${VERSION:-$(echo ${SRCNAM}-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -53,6 +53,10 @@ rm -rf $SRCNAM-$VERSION tar xvf $CWD/$SRCNAM-$VERSION.tar.?z || exit 1 cd $SRCNAM-$VERSION || exit 1 +# Fix build with Cython >= 3: +cat $CWD/cython3.compat.patch | patch -p1 --verbose || exit 1 +cat $CWD/pyproject.toml.cython3.patch | patch -p1 --verbose || exit 1 + chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ diff --git a/source/l/qt6/qt6.SlackBuild b/source/l/qt6/qt6.SlackBuild index 2cac0d9f4..47327bf94 100755 --- a/source/l/qt6/qt6.SlackBuild +++ b/source/l/qt6/qt6.SlackBuild @@ -32,7 +32,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=qt6 VERSION=$(ls qt-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} PKGSRC=$(echo $VERSION | cut -d - -f 1) PKGVER=$(echo $VERSION | tr - _) @@ -181,7 +181,7 @@ cmake -S $(pwd) -B build-${PKGNAM} \ -DINSTALL_BINDIR=/usr/lib${LIBDIRSUFFIX}/qt6/bin \ -DINSTALL_PUBLICBINDIR=usr/bin \ -DINSTALL_LIBDIR=/usr/lib${LIBDIRSUFFIX} \ - -DINSTALL_LIBEXECDIR=/usr/lib${LIBDIRSUFFIX}/qt6/libexec \ + -DINSTALL_LIBEXECDIR=/usr/lib${LIBDIRSUFFIX}/qt6/bin \ -DINSTALL_ARCHDATADIR=/usr/lib${LIBDIRSUFFIX}/qt6 \ -DINSTALL_DATADIR=/usr/share/qt6 \ -DINSTALL_INCLUDEDIR=/usr/include/qt6 \ |