summaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2024-04-13 19:45:25 +0000
committer Eric Hameleers <alien@slackware.com>2024-04-13 22:01:32 +0200
commit34da3f5aa8336e5ba6f3e429fce7e1b9b7f6e984 (patch)
tree7f93964317d9f6e09e970f81382b4f6bf2de238c /source
parentce3e6fa735b792d09ae674beb9acfa04e21a12d9 (diff)
downloadcurrent-34da3f5aa8336e5ba6f3e429fce7e1b9b7f6e984.tar.gz
current-34da3f5aa8336e5ba6f3e429fce7e1b9b7f6e984.tar.xz
Sat Apr 13 19:45:25 UTC 202420240413194525
l/imagemagick-7.1.1_29-x86_64-1.txz: Upgraded. Revert to the previous ImageMagick because the latest one is destroying SVG files if "identify" or "display" is used on them. Thanks to pc2005.
Diffstat (limited to 'source')
-rwxr-xr-xsource/d/python-setuptools/python-setuptools.SlackBuild26
-rw-r--r--source/d/python-setuptools/setuptools.x86_64.diff31
-rw-r--r--source/k/kernel-configs/config-generic-6.6.27 (renamed from source/k/kernel-configs/config-generic-6.6.26)2
-rw-r--r--source/k/kernel-configs/config-generic-6.6.27.x64 (renamed from source/k/kernel-configs/config-generic-6.6.26.x64)2
-rw-r--r--source/k/kernel-configs/config-huge-6.6.27 (renamed from source/k/kernel-configs/config-huge-6.6.26)2
-rw-r--r--source/k/kernel-configs/config-huge-6.6.27.x64 (renamed from source/k/kernel-configs/config-huge-6.6.26.x64)2
-rwxr-xr-xsource/l/libwebp/libwebp.SlackBuild2
7 files changed, 6 insertions, 61 deletions
diff --git a/source/d/python-setuptools/python-setuptools.SlackBuild b/source/d/python-setuptools/python-setuptools.SlackBuild
index 226b41f57..2c5b99d13 100755
--- a/source/d/python-setuptools/python-setuptools.SlackBuild
+++ b/source/d/python-setuptools/python-setuptools.SlackBuild
@@ -23,19 +23,9 @@
cd $(dirname $0) ; CWD=$(pwd)
-# First, convert the .zip file if needed:
-if ls *.zip 1> /dev/null 2> /dev/null ; then
- unzip *.zip
- tar cf $(basename *.zip .zip).tar $(basename *.zip .zip)
- touch -r *.zip *.tar
- plzip -9 *.tar
- rm -r $(basename *.zip .zip)
- rm *.zip
-fi
-
PKGNAM=python-setuptools
VERSION=${VERSION:-$(echo setuptools-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
SRCNAM=setuptools
@@ -88,20 +78,6 @@ find -L . \
rm -f setuptools/*.exe
-# After Python 3.9, we will not mess with the upstream module layout again.
-if python3 --version | grep -q "Python 3.9." ; then
- # Recent Python versions support both a libdir (for pure Python modules) and a
- # platlib (for $ARCH specific modules). We've always patched Python to use
- # the platform directory (such as /usr/lib64/python3.9/site-packages on x86_64)
- # for all modules. Perhaps we will rethink this, but since an installed
- # setuptools now takes priority for reporting the libdir (and this no longer
- # matches the platlib on architectures such as x86_64), let's patch setuptools
- # to agree with Python:
- if [ "$LIBDIRSUFFIX" = "64" ]; then
- zcat $CWD/setuptools.x86_64.diff.gz | patch -p1 --verbose || exit 1
- fi
-fi
-
# 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
diff --git a/source/d/python-setuptools/setuptools.x86_64.diff b/source/d/python-setuptools/setuptools.x86_64.diff
deleted file mode 100644
index a9731d738..000000000
--- a/source/d/python-setuptools/setuptools.x86_64.diff
+++ /dev/null
@@ -1,31 +0,0 @@
---- ./setuptools/_distutils/sysconfig.py.orig 2022-08-21 02:05:13.000000000 -0500
-+++ ./setuptools/_distutils/sysconfig.py 2022-08-21 13:33:52.738969315 -0500
-@@ -234,7 +234,7 @@
- libdir = getattr(sys, "platlibdir", "lib")
- else:
- # Pure Python
-- libdir = "lib"
-+ libdir = "lib64"
- implementation = 'pypy' if IS_PYPY else 'python'
- libpython = os.path.join(prefix, libdir, implementation + get_python_version())
- return _posix_lib(standard_lib, libpython, early_prefix, prefix)
---- ./setuptools/_distutils/command/install.py.orig 2022-08-21 13:33:52.738969315 -0500
-+++ ./setuptools/_distutils/command/install.py 2022-08-21 13:35:11.919964935 -0500
-@@ -34,7 +34,7 @@
-
- INSTALL_SCHEMES = {
- 'posix_prefix': {
-- 'purelib': '{base}/lib/{implementation_lower}{py_version_short}/site-packages',
-+ 'purelib': '{base}/lib64/{implementation_lower}{py_version_short}/site-packages',
- 'platlib': '{platbase}/{platlibdir}/{implementation_lower}'
- '{py_version_short}/site-packages',
- 'headers': '{base}/include/{implementation_lower}'
-@@ -43,7 +43,7 @@
- 'data': '{base}',
- },
- 'posix_home': {
-- 'purelib': '{base}/lib/{implementation_lower}',
-+ 'purelib': '{base}/lib64/{implementation_lower}',
- 'platlib': '{base}/{platlibdir}/{implementation_lower}',
- 'headers': '{base}/include/{implementation_lower}/{dist_name}',
- 'scripts': '{base}/bin',
diff --git a/source/k/kernel-configs/config-generic-6.6.26 b/source/k/kernel-configs/config-generic-6.6.27
index c9f7d3ac5..b84648a1a 100644
--- a/source/k/kernel-configs/config-generic-6.6.26
+++ b/source/k/kernel-configs/config-generic-6.6.27
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.6.26 Kernel Configuration
+# Linux/x86 6.6.27 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0"
CONFIG_CC_IS_GCC=y
diff --git a/source/k/kernel-configs/config-generic-6.6.26.x64 b/source/k/kernel-configs/config-generic-6.6.27.x64
index 119f79f2a..69043553a 100644
--- a/source/k/kernel-configs/config-generic-6.6.26.x64
+++ b/source/k/kernel-configs/config-generic-6.6.27.x64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.6.26 Kernel Configuration
+# Linux/x86 6.6.27 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0"
CONFIG_CC_IS_GCC=y
diff --git a/source/k/kernel-configs/config-huge-6.6.26 b/source/k/kernel-configs/config-huge-6.6.27
index 65d11b655..8a6fbe595 100644
--- a/source/k/kernel-configs/config-huge-6.6.26
+++ b/source/k/kernel-configs/config-huge-6.6.27
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.6.26 Kernel Configuration
+# Linux/x86 6.6.27 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0"
CONFIG_CC_IS_GCC=y
diff --git a/source/k/kernel-configs/config-huge-6.6.26.x64 b/source/k/kernel-configs/config-huge-6.6.27.x64
index 60baad63e..55fa3760d 100644
--- a/source/k/kernel-configs/config-huge-6.6.26.x64
+++ b/source/k/kernel-configs/config-huge-6.6.27.x64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.6.26 Kernel Configuration
+# Linux/x86 6.6.27 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0"
CONFIG_CC_IS_GCC=y
diff --git a/source/l/libwebp/libwebp.SlackBuild b/source/l/libwebp/libwebp.SlackBuild
index 4b00c40c1..0cde53d37 100755
--- a/source/l/libwebp/libwebp.SlackBuild
+++ b/source/l/libwebp/libwebp.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=libwebp
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