diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2023-09-07 02:04:52 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2023-09-07 04:44:48 +0200 |
commit | bb5293798e5696f1e72797a298a9bc7d7c68f102 (patch) | |
tree | e0ff44491bae6017acc1c290a30be9c78c1e2e91 /source | |
parent | 9d8cf9f8c2d4496b5e9c749f66e9ee11a57724ef (diff) | |
download | current-bb5293798e5696f1e72797a298a9bc7d7c68f102.tar.gz current-bb5293798e5696f1e72797a298a9bc7d7c68f102.tar.xz |
Thu Sep 7 02:04:52 UTC 202320230907020452
a/kernel-firmware-20230906_ad03b85-noarch-1.txz: Upgraded.
a/kernel-generic-6.1.52-x86_64-1.txz: Upgraded.
a/kernel-huge-6.1.52-x86_64-1.txz: Upgraded.
a/kernel-modules-6.1.52-x86_64-1.txz: Upgraded.
d/kernel-headers-6.1.52-x86-1.txz: Upgraded.
d/lua-5.4.6-x86_64-3.txz: Rebuilt.
Set MYCFLAGS rather than CFLAGS in the build script to keep the other
default CFLAGS in src/Makefile. This automatically sets -DLUA_USE_LINUX
as well as -DLUA_COMPAT_5_3.
d/mercurial-6.5.2-x86_64-1.txz: Upgraded.
k/kernel-source-6.1.52-noarch-1.txz: Upgraded.
kde/alkimia-8.1.2-x86_64-1.txz: Upgraded.
kde/calligra-3.2.1-x86_64-33.txz: Rebuilt.
Recompiled against poppler-23.09.0.
kde/cantor-23.08.0-x86_64-2.txz: Rebuilt.
Recompiled against poppler-23.09.0.
kde/kfilemetadata-5.109.0-x86_64-2.txz: Rebuilt.
Recompiled against poppler-23.09.0.
kde/kile-2.9.93-x86_64-27.txz: Rebuilt.
Recompiled against poppler-23.09.0.
kde/kitinerary-23.08.0-x86_64-2.txz: Rebuilt.
Recompiled against poppler-23.09.0.
kde/krita-5.1.5-x86_64-14.txz: Rebuilt.
Recompiled against poppler-23.09.0.
kde/ktextaddons-1.5.0-x86_64-1.txz: Upgraded.
kde/okular-23.08.0-x86_64-2.txz: Rebuilt.
Recompiled against poppler-23.09.0.
l/poppler-23.09.0-x86_64-1.txz: Upgraded.
Shared library .so-version bump.
l/zstd-1.5.5-x86_64-3.txz: Rebuilt.
Fix library path in zstdTargets-release.cmake.
Thanks to Steven Voges and gian_d.
Use additional build options:
-DZSTD_BUILD_STATIC=OFF -DZSTD_PROGRAMS_LINK_SHARED=ON -DZSTD_LZ4_SUPPORT=ON
-DZSTD_LZMA_SUPPORT=ON -DZSTD_ZLIB_SUPPORT=ON
Thanks to USUARIONUEVO.
n/iproute2-6.5.0-x86_64-1.txz: Upgraded.
t/texlive-2023.230322-x86_64-5.txz: Rebuilt.
Recompiled against zlib-1.3 to fix lualatex.
Thanks to unInstance and marav.
x/ibus-libpinyin-1.15.4-x86_64-1.txz: Upgraded.
x/mesa-23.1.7-x86_64-1.txz: Upgraded.
xap/gnuplot-5.4.9-x86_64-1.txz: Upgraded.
isolinux/initrd.img: Rebuilt.
kernels/*: Upgraded.
usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'source')
16 files changed, 28 insertions, 20 deletions
diff --git a/source/d/lua/lua.SlackBuild b/source/d/lua/lua.SlackBuild index 5d4fe418d..138d8f27f 100755 --- a/source/d/lua/lua.SlackBuild +++ b/source/d/lua/lua.SlackBuild @@ -16,7 +16,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=lua VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -74,14 +74,14 @@ sed -i "s|/usr/local|/usr|" src/luaconf.h sed -i "s|lib/lua|lib$LIBDIRSUFFIX/lua|" src/luaconf.h make linux \ - CFLAGS="$SLKCFLAGS \$(MYCFLAGS) -DLUA_USE_LINUX" \ + MYCFLAGS="$SLKCFLAGS" \ INSTALL_TOP=/usr \ INSTALL_LIB=/usr/lib${LIBDIRSUFFIX} \ INSTALL_LMOD=/usr/share/lua/$(echo $VERSION | cut -f 1-2 -d .) \ INSTALL_CMOD=/usr/lib${LIBDIRSUFFIX}/lua/$(echo $VERSION | cut -f 1-2 -d .) || exit 1 make linux install \ - CFLAGS="$SLKCFLAGS \$(MYCFLAGS) -DLUA_USE_LINUX" \ + MYCFLAGS="$SLKCFLAGS" \ INSTALL_TOP=$PKG/usr \ INSTALL_LIB=$PKG/usr/lib${LIBDIRSUFFIX} \ INSTALL_LMOD=$PKG/usr/share/lua/$(echo $VERSION | cut -f 1-2 -d .) \ diff --git a/source/k/kernel-configs/config-generic-6.1.51 b/source/k/kernel-configs/config-generic-6.1.52 index 9b053c99b..aff6df294 100644 --- a/source/k/kernel-configs/config-generic-6.1.51 +++ b/source/k/kernel-configs/config-generic-6.1.52 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.1.51 Kernel Configuration +# Linux/x86 6.1.52 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.1.51.x64 b/source/k/kernel-configs/config-generic-6.1.52.x64 index 3e76b7b6f..de25a4544 100644 --- a/source/k/kernel-configs/config-generic-6.1.51.x64 +++ b/source/k/kernel-configs/config-generic-6.1.52.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.1.51 Kernel Configuration +# Linux/x86 6.1.52 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-smp-6.1.51-smp b/source/k/kernel-configs/config-generic-smp-6.1.52-smp index fefde8ee3..fe35c1b56 100644 --- a/source/k/kernel-configs/config-generic-smp-6.1.51-smp +++ b/source/k/kernel-configs/config-generic-smp-6.1.52-smp @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.1.51 Kernel Configuration +# Linux/x86 6.1.52 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.1.51 b/source/k/kernel-configs/config-huge-6.1.52 index 480872068..f0481acb3 100644 --- a/source/k/kernel-configs/config-huge-6.1.51 +++ b/source/k/kernel-configs/config-huge-6.1.52 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.1.51 Kernel Configuration +# Linux/x86 6.1.52 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.1.51.x64 b/source/k/kernel-configs/config-huge-6.1.52.x64 index 2017ebf77..e040533b4 100644 --- a/source/k/kernel-configs/config-huge-6.1.51.x64 +++ b/source/k/kernel-configs/config-huge-6.1.52.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.1.51 Kernel Configuration +# Linux/x86 6.1.52 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-smp-6.1.51-smp b/source/k/kernel-configs/config-huge-smp-6.1.52-smp index 4d3c7e904..a3cb11da8 100644 --- a/source/k/kernel-configs/config-huge-smp-6.1.51-smp +++ b/source/k/kernel-configs/config-huge-smp-6.1.52-smp @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.1.51 Kernel Configuration +# Linux/x86 6.1.52 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y diff --git a/source/kde/kde/build/calligra b/source/kde/kde/build/calligra index f5c89552b..bb95160cb 100644 --- a/source/kde/kde/build/calligra +++ b/source/kde/kde/build/calligra @@ -1 +1 @@ -32 +33 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 6f4247a62..f64f5d8d8 100644 --- a/source/kde/kde/build/kile +++ b/source/kde/kde/build/kile @@ -1 +1 @@ -26 +27 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 b1bd38b62..8351c1939 100644 --- a/source/kde/kde/build/krita +++ b/source/kde/kde/build/krita @@ -1 +1 @@ -13 +14 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/zstd/zstd.SlackBuild b/source/l/zstd/zstd.SlackBuild index e9eb64503..e00e49e24 100755 --- a/source/l/zstd/zstd.SlackBuild +++ b/source/l/zstd/zstd.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=zstd VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -104,6 +104,11 @@ cmake \ -DLIB_SUFFIX="$LIBDIRSUFFIX" \ -DDOC_INSTALL_DIR="doc" \ -DMAN_INSTALL_DIR=/usr/man/man1 \ + -DZSTD_BUILD_STATIC=OFF \ + -DZSTD_PROGRAMS_LINK_SHARED=ON \ + -DZSTD_LZ4_SUPPORT=ON \ + -DZSTD_LZMA_SUPPORT=ON \ + -DZSTD_ZLIB_SUPPORT=ON \ .. || exit 1 make $NUMJOBS CFLAGS="$SLKCFLAGS" || exit 1 make install DESTDIR=$PKG || exit 1 @@ -114,8 +119,8 @@ zcat $CWD/zstd.dont.link.pzstd.to.static.libzstd.a.diff.gz | patch -p1 --verbose make $NUMJOBS CFLAGS="$SLKCFLAGS" -C contrib/pzstd || exit 1 install -Dm755 contrib/pzstd/pzstd $PKG/usr/bin/pzstd || exit 1 -# Don't ship static library: -rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.a +## Don't ship static library: +#rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.a # It might be advisable to have the libraries in /lib${LIBDIRSUFFIX}: mkdir -p $PKG/lib${LIBDIRSUFFIX} @@ -125,6 +130,9 @@ mv $PKG/usr/lib${LIBDIRSUFFIX}/libzstd.so.* $PKG/lib${LIBDIRSUFFIX} ln -sf ../../lib${LIBDIRSUFFIX}/libzstd.so.? libzstd.so ) +# Set the path of libzstd in cmake Targets (given by Steven Voges in SBo) +sed -i 's|${_IMPORT_PREFIX}||g' $PKG/usr/lib${LIBDIRSUFFIX}/cmake/zstd/zstdTargets-release.cmake + # zstdmt as the same as zstd, so just make a symlink: ( cd $PKG/usr/bin ln -sf zstd zstdmt diff --git a/source/t/texlive/texlive.SlackBuild b/source/t/texlive/texlive.SlackBuild index ab77c095b..721cc6139 100755 --- a/source/t/texlive/texlive.SlackBuild +++ b/source/t/texlive/texlive.SlackBuild @@ -34,7 +34,7 @@ PKGNAM=texlive SOURCEVERSION=${SOURCEVERSION:-20230311} TEXMFVERSION=${TEXMFVERSION:-230322} VERSION=${VERSION:-2023.$TEXMFVERSION} -BUILD=${BUILD:-4} +BUILD=${BUILD:-5} TMP=${TMP:-/tmp} PKG=$TMP/package-texlive |