diff options
Diffstat (limited to 'source')
21 files changed, 61 insertions, 37 deletions
diff --git a/source/d/python-pip/python-pip.SlackBuild b/source/d/python-pip/python-pip.SlackBuild index d41293569..596f13f21 100755 --- a/source/d/python-pip/python-pip.SlackBuild +++ b/source/d/python-pip/python-pip.SlackBuild @@ -61,9 +61,13 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ -unshare -n python3 -m build --wheel --no-isolation || exit 1 +# Sticking with setup.py while it exists to make it easier to bootstrap a +# new Python version: +python3 setup.py build install --root=$PKG || exit 1 -python3 -m installer --destdir "$PKG" dist/*.whl || exit 1 +# Don't use this. ;-) +#unshare -n python3 -m build --wheel --no-isolation || exit 1 +#python3 -m installer --destdir "$PKG" dist/*.whl || exit 1 mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a *.txt PKG-INFO README.rst \ diff --git a/source/d/python-setuptools/python-setuptools.SlackBuild b/source/d/python-setuptools/python-setuptools.SlackBuild index 762c83f5e..2e926666e 100755 --- a/source/d/python-setuptools/python-setuptools.SlackBuild +++ b/source/d/python-setuptools/python-setuptools.SlackBuild @@ -102,9 +102,13 @@ if python3 --version | grep -q "Python 3.9." ; then fi fi -unshare -n python3 -m build --wheel --no-isolation || exit 1 +# Sticking with setup.py while it exists to make it easier to bootstrap a +# new Python version: +python3 setup.py build install --root=$PKG || exit 1 -python3 -m installer --destdir "$PKG" dist/*.whl || exit 1 +# Don't use this. ;-) +#unshare -n python3 -m build --wheel --no-isolation || exit 1 +#python3 -m installer --destdir "$PKG" dist/*.whl || exit 1 mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a CHANGES.rst PKG-INFO README.rst docs/*.txt \ diff --git a/source/e/emacspeak/emacspeak.SlackBuild b/source/e/emacspeak/emacspeak.SlackBuild index 7cdb21ce2..7c45f0ffb 100755 --- a/source/e/emacspeak/emacspeak.SlackBuild +++ b/source/e/emacspeak/emacspeak.SlackBuild @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright 2006, 2008, 2010, 2011, 2020 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2008, 2010, 2011, 2020, 2024 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=emacspeak VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -89,8 +89,7 @@ find . \ find . -xtype l -exec rm -f {} \; # Compile the main program against Emacs: -make config -make emacspeak +make config && make if [ ! -r info/emacspeak.info ]; then makeinfo -o info/ info/emacspeak.texi fi diff --git a/source/e/emacspeak/emacspeak.url b/source/e/emacspeak/emacspeak.url index c0195a569..018d49104 100644 --- a/source/e/emacspeak/emacspeak.url +++ b/source/e/emacspeak/emacspeak.url @@ -1 +1,2 @@ https://github.com/tvraman/emacspeak +https://github.com/tvraman/emacspeak/releases/download/59/emacspeak-59.0.tar.bz2 diff --git a/source/e/emacspeak/prune-unneeded-files.sh b/source/e/emacspeak/prune-unneeded-files.sh index b78b68720..f9164fbf9 100755 --- a/source/e/emacspeak/prune-unneeded-files.sh +++ b/source/e/emacspeak/prune-unneeded-files.sh @@ -8,12 +8,6 @@ VERSION=${VERSION:-$(echo $PKGNAM-*.tar.bz2 | rev | cut -f 3- -d . | cut -f 1 -d rm -rf ${PKGNAM}-${VERSION} tar xf ${PKGNAM}-${VERSION}.tar.bz2 || exit 1 -# I have no idea what these are useful for. They aren't referenced anywhere -# else. If .json weren't such a bloated format I might keep them just in case, -# but let's strip them out for now. If it would be better to keep them (perhaps -# compressed as .gz or .xz), let me know. -( cd ${PKGNAM}-${VERSION}/etc && rm -f CompSciFact.json TVRaman.json UnixToolTip.json ) - # Get rid of support files used to build .html: ( cd ${PKGNAM}-${VERSION}/etc for file in *.html ; do @@ -34,9 +28,6 @@ tar xf ${PKGNAM}-${VERSION}.tar.bz2 || exit 1 rmdir news-tmp ) -# Drop the Makefile in etc/: -rm -f ${PKGNAM}-${VERSION}/etc/Makefile - # More cruft: rm -rf ${PKGNAM}-${VERSION}/.ccls-cache diff --git a/source/kde/kde/build/calligra b/source/kde/kde/build/calligra index 7facc8993..81b5c5d06 100644 --- a/source/kde/kde/build/calligra +++ b/source/kde/kde/build/calligra @@ -1 +1 @@ -36 +37 diff --git a/source/kde/kde/build/cantor b/source/kde/kde/build/cantor index d00491fd7..0cfbf0888 100644 --- a/source/kde/kde/build/cantor +++ b/source/kde/kde/build/cantor @@ -1 +1 @@ -1 +2 diff --git a/source/kde/kde/build/kfilemetadata b/source/kde/kde/build/kfilemetadata index d00491fd7..0cfbf0888 100644 --- a/source/kde/kde/build/kfilemetadata +++ b/source/kde/kde/build/kfilemetadata @@ -1 +1 @@ -1 +2 diff --git a/source/kde/kde/build/kile b/source/kde/kde/build/kile index 64bb6b746..e85087aff 100644 --- a/source/kde/kde/build/kile +++ b/source/kde/kde/build/kile @@ -1 +1 @@ -30 +31 diff --git a/source/kde/kde/build/kitinerary b/source/kde/kde/build/kitinerary index d00491fd7..0cfbf0888 100644 --- a/source/kde/kde/build/kitinerary +++ b/source/kde/kde/build/kitinerary @@ -1 +1 @@ -1 +2 diff --git a/source/kde/kde/build/krita b/source/kde/kde/build/krita index b8626c4cf..7ed6ff82d 100644 --- a/source/kde/kde/build/krita +++ b/source/kde/kde/build/krita @@ -1 +1 @@ -4 +5 diff --git a/source/kde/kde/build/okular b/source/kde/kde/build/okular index d00491fd7..0cfbf0888 100644 --- a/source/kde/kde/build/okular +++ b/source/kde/kde/build/okular @@ -1 +1 @@ -1 +2 diff --git a/source/l/FTBFSlog b/source/l/FTBFSlog index ffc697bf1..a9a91c5cc 100644 --- a/source/l/FTBFSlog +++ b/source/l/FTBFSlog @@ -1,3 +1,18 @@ +Mon Mar 4 18:48:34 UTC 2024 + giflib: fix build with NUMJOBS=-j1. Thanks to lucabon. ++--------------------------+ +Mon Mar 4 02:27:43 UTC 2024 + OK, some of these are in the D series, but I'll drop this hint here. + Upon upgrading to a new Python version, this is the magic build order + to prop up the build system. Hi nobodino! :-) + python-flit-core + python-installer + python-packaging + python-build + python-setuptools + python-pip + python-pyproject-hooks ++--------------------------+ Thu Jan 4 20:38:00 UTC 2024 libcap-ng: patch to fix build with swig-4.2.0. Thanks to lucabon. +--------------------------+ diff --git a/source/l/giflib/giflib.GifQuantizeBuffer.diff b/source/l/giflib/giflib.GifQuantizeBuffer.diff index 8488cee4a..b9f233770 100644 --- a/source/l/giflib/giflib.GifQuantizeBuffer.diff +++ b/source/l/giflib/giflib.GifQuantizeBuffer.diff @@ -1,6 +1,11 @@ ---- ./Makefile.orig 2024-02-19 13:22:38.525026520 -0600 -+++ ./Makefile 2024-02-19 13:24:23.962028878 -0600 -@@ -99,7 +99,7 @@ +--- ./Makefile.orig 2024-02-18 19:01:50.000000000 -0600 ++++ ./Makefile 2024-03-04 12:47:11.902036930 -0600 +@@ -95,11 +95,11 @@ + + $(UTILS):: libgif.a libutil.a + +-$(LIBGIFSO): $(OBJECTS) $(HEADERS) ++$(LIBGIFSO): $(OBJECTS) $(UOBJECTS) $(HEADERS) ifeq ($(UNAME), Darwin) $(CC) $(CFLAGS) -dynamiclib -current_version $(LIBVER) $(OBJECTS) -o $(LIBGIFSO) else diff --git a/source/l/poppler/poppler.SlackBuild b/source/l/poppler/poppler.SlackBuild index 3778b048e..81a5ba020 100755 --- a/source/l/poppler/poppler.SlackBuild +++ b/source/l/poppler/poppler.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=poppler VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} -QT6OPT=${QT6OPT:--DENABLE_QT6=OFF} +QT6OPT=${QT6OPT:--DENABLE_QT6=ON} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/python-build/python-build.SlackBuild b/source/l/python-build/python-build.SlackBuild index 22ad3f322..73cd16648 100755 --- a/source/l/python-build/python-build.SlackBuild +++ b/source/l/python-build/python-build.SlackBuild @@ -75,8 +75,9 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ +# This is a core bootstrap package for building via wheels. +# Don't change this build method unless necessary. python3 -m flit_core.wheel || exit 1 - python3 -m installer --destdir "$PKG" dist/*.whl || exit 1 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ diff --git a/source/l/python-flit-core/python-flit-core.SlackBuild b/source/l/python-flit-core/python-flit-core.SlackBuild index 5b3745280..1f512bd33 100755 --- a/source/l/python-flit-core/python-flit-core.SlackBuild +++ b/source/l/python-flit-core/python-flit-core.SlackBuild @@ -76,12 +76,13 @@ find . \ -exec chmod 644 {} \+ # directory for python packages -PYTHONDIR=$(python3 -c "import sys, os; print(os.path.join('/usr/lib${LIBDIRSUFFIX}', 'python%s' % sys.version[:3], 'site-packages'))") +PYTHONDIR=$(python3 -c "import sys, os; print(os.path.join('/usr/lib${LIBDIRSUFFIX}', 'python%s' % sys.version[:4], 'site-packages'))") mkdir -p ${PKG}${PYTHONDIR} +# This is a bootstrap package for building via wheels. +# Stick with this build method. unshare -n python3 -m flit_core.wheel || exit 1 - python3 bootstrap_install.py --installdir ${PKG}${PYTHONDIR} dist/flit_core-*.whl find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ diff --git a/source/l/python-installer/python-installer.SlackBuild b/source/l/python-installer/python-installer.SlackBuild index bda92b177..71265004b 100755 --- a/source/l/python-installer/python-installer.SlackBuild +++ b/source/l/python-installer/python-installer.SlackBuild @@ -75,8 +75,9 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ +# This is a bootstrap package for building via wheels. +# Keep using this build method for now. python3 -m flit_core.wheel || exit 1 - PYTHONPATH=src python3 -m installer --destdir "$PKG" dist/*.whl || exit 1 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ diff --git a/source/l/python-packaging/python-packaging.SlackBuild b/source/l/python-packaging/python-packaging.SlackBuild index 8a72de6e9..82a5cdd12 100755 --- a/source/l/python-packaging/python-packaging.SlackBuild +++ b/source/l/python-packaging/python-packaging.SlackBuild @@ -61,9 +61,10 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ -unshare -n python3 -m build --wheel --no-isolation || exit 1 - -python3 -m installer --destdir "$PKG" dist/*.whl || exit 1 +# This is a bootstrap package for building via wheels. +# Keep using this build method for now. +python3 -m flit_core.wheel || exit 1 +PYTHONPATH=src python3 -m installer --destdir "$PKG" dist/*.whl || exit 1 mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a *.rst LICENSE* PKG-INFO \ diff --git a/source/l/python-pyproject-hooks/python-pyproject-hooks.SlackBuild b/source/l/python-pyproject-hooks/python-pyproject-hooks.SlackBuild index fd0b7cdf6..767831b3a 100755 --- a/source/l/python-pyproject-hooks/python-pyproject-hooks.SlackBuild +++ b/source/l/python-pyproject-hooks/python-pyproject-hooks.SlackBuild @@ -75,8 +75,9 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ +# This is a bootstrap package for building via wheels. +# Keep using this build method for now. python3 -m flit_core.wheel || exit 1 - python3 -m installer --destdir "$PKG" dist/*.whl || exit 1 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ diff --git a/source/x/x11/src/xf86-input-wacom.url b/source/x/x11/src/xf86-input-wacom.url index 1f434de87..6dd650d65 100644 --- a/source/x/x11/src/xf86-input-wacom.url +++ b/source/x/x11/src/xf86-input-wacom.url @@ -1,2 +1,2 @@ https://github.com/linuxwacom/xf86-input-wacom -https://github.com/linuxwacom/xf86-input-wacom/releases/download/xf86-input-wacom-1.2.0/xf86-input-wacom-1.2.0.tar.bz2 +https://github.com/linuxwacom/xf86-input-wacom/releases/download/xf86-input-wacom-1.2.1/xf86-input-wacom-1.2.1.tar.bz2 |