diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2024-05-08 21:05:29 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2024-05-08 23:34:15 +0200 |
commit | 4526e22f98d369572864114219b98b29813571da (patch) | |
tree | b546a25dc6933cf9a02c2fb8ad2f5f21c291cae7 /source | |
parent | 6dc3b3fe0a1b391d8324e9b624fb64372f3a4920 (diff) | |
download | current-4526e22f98d369572864114219b98b29813571da.tar.gz current-4526e22f98d369572864114219b98b29813571da.tar.xz |
Wed May 8 21:05:29 UTC 202420240508210529
d/cmake-3.29.3-x86_64-1.txz: Upgraded.
l/adwaita-icon-theme-46.0-noarch-2.txz: Rebuilt.
Restore icons that went missing after adwaita-icon-theme-41.0.
l/glib2-2.80.2-x86_64-1.txz: Upgraded.
l/libgnt-2.14.4_dev-x86_64-1.txz: Upgraded.
l/mozilla-nss-3.100-x86_64-1.txz: Upgraded.
n/samba-4.20.1-x86_64-1.txz: Upgraded.
x/mesa-24.0.7-x86_64-1.txz: Upgraded.
Diffstat (limited to '')
-rwxr-xr-x | source/a/gptfdisk/gptfdisk.SlackBuild | 2 | ||||
-rw-r--r-- | source/ap/mc/bogus.cflags.diff | 10 | ||||
-rwxr-xr-x | source/ap/mc/mc.SlackBuild | 5 | ||||
-rwxr-xr-x | source/d/cmake/cmake.SlackBuild | 2 | ||||
-rw-r--r-- | source/d/cmake/cmake.url | 2 | ||||
-rw-r--r-- | source/installer/ChangeLog.txt | 7 | ||||
-rwxr-xr-x | source/installer/build_installer.sh | 12 | ||||
-rwxr-xr-x | source/l/adwaita-icon-theme/adwaita-icon-theme.SlackBuild | 30 | ||||
-rwxr-xr-x | source/l/libgnt/libgnt.SlackBuild | 9 | ||||
-rwxr-xr-x | source/l/mozilla-nss/mozilla-nss.SlackBuild | 2 | ||||
-rwxr-xr-x | source/l/pygtk/pygtk.SlackBuild | 1 | ||||
-rwxr-xr-x | source/n/samba/samba.SlackBuild | 2 | ||||
-rw-r--r-- | source/n/samba/samba.url | 4 |
13 files changed, 70 insertions, 18 deletions
diff --git a/source/a/gptfdisk/gptfdisk.SlackBuild b/source/a/gptfdisk/gptfdisk.SlackBuild index fd62b7f2f..b284da19c 100755 --- a/source/a/gptfdisk/gptfdisk.SlackBuild +++ b/source/a/gptfdisk/gptfdisk.SlackBuild @@ -79,6 +79,8 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ +sed -i "s|ncursesw/ncurses.h|ncurses.h|g" gptcurses.cc + export LDFLAGS="$SLKLDFLAGS" export CXXFLAGS="$SLKCFLAGS" export CFLAGS="$SLKCFLAGS" diff --git a/source/ap/mc/bogus.cflags.diff b/source/ap/mc/bogus.cflags.diff new file mode 100644 index 000000000..0fec13e7f --- /dev/null +++ b/source/ap/mc/bogus.cflags.diff @@ -0,0 +1,10 @@ +--- ./m4.include/mc-cflags.m4.orig 2024-01-20 13:34:38.000000000 -0600 ++++ ./m4.include/mc-cflags.m4 2024-05-08 12:42:18.326695150 -0500 +@@ -57,7 +57,6 @@ + AX_APPEND_COMPILE_FLAGS([-Wmissing-format-attribute], [mc_configured_cflags], [$EXTRA_OPTION]) + AX_APPEND_COMPILE_FLAGS([-Wmissing-parameter-type], [mc_configured_cflags], [$EXTRA_OPTION]) + AX_APPEND_COMPILE_FLAGS([-Wmissing-prototypes], [mc_configured_cflags], [$EXTRA_OPTION]) +- AX_APPEND_COMPILE_FLAGS([-Wmissing-variable-declarations], [mc_configured_cflags], [$EXTRA_OPTION]) + AX_APPEND_COMPILE_FLAGS([-Wnested-externs], [mc_configured_cflags], [$EXTRA_OPTION]) + AX_APPEND_COMPILE_FLAGS([-Wno-long-long], [mc_configured_cflags], [$EXTRA_OPTION]) + AX_APPEND_COMPILE_FLAGS([-Wno-unreachable-code], [mc_configured_cflags], [$EXTRA_OPTION]) diff --git a/source/ap/mc/mc.SlackBuild b/source/ap/mc/mc.SlackBuild index 19082a848..71d9107b6 100755 --- a/source/ap/mc/mc.SlackBuild +++ b/source/ap/mc/mc.SlackBuild @@ -73,9 +73,8 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -if [ ! -x ./configure ]; then - ./autogen.sh -fi +cat $CWD/bogus.cflags.diff | patch -p1 --verbose || exit 1 +autoreconf -vif CFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/source/d/cmake/cmake.SlackBuild b/source/d/cmake/cmake.SlackBuild index 36b66451e..6392d312c 100755 --- a/source/d/cmake/cmake.SlackBuild +++ b/source/d/cmake/cmake.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=cmake VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/d/cmake/cmake.url b/source/d/cmake/cmake.url index a77cfe13f..27841f4dd 100644 --- a/source/d/cmake/cmake.url +++ b/source/d/cmake/cmake.url @@ -1,2 +1,2 @@ https://github.com/Kitware/CMake/releases -https://github.com/Kitware/CMake/releases/download/v3.29.2/cmake-3.29.2.tar.gz +https://github.com/Kitware/CMake/releases/download/v3.29.3/cmake-3.29.3.tar.gz diff --git a/source/installer/ChangeLog.txt b/source/installer/ChangeLog.txt index 6b40c72d4..beef8ea07 100644 --- a/source/installer/ChangeLog.txt +++ b/source/installer/ChangeLog.txt @@ -1,3 +1,10 @@ +Wed May 8 09:26:31 UTC 2024 + build_installer.sh: Switch to the 'pciutils' implementation of 'lspci' since + Busybox's implementation lacks the capability to map hardware IDs to model + names; a feature we rely on for the conditional loading of Kernel modules on + AArch64. + gzip the content of /usr/share/hwdata to conserve space. ++--------------------------+ Mon Mar 18 08:08:08 UTC 2024 Added console font 'ter-v18n' to accommodate the Raspberry Pi 400's screen. Thanks to BrianL. diff --git a/source/installer/build_installer.sh b/source/installer/build_installer.sh index 6cf9cf664..a70c9c1d6 100755 --- a/source/installer/build_installer.sh +++ b/source/installer/build_installer.sh @@ -1429,6 +1429,7 @@ cd $TMP/extract-packages/usr/share/hwdata mkdir -p -m755 $PKG/$ARCH-installer-filesystem/usr/share/hwdata cp -fa${VERBOSE1} pci.ids usb.ids \ $PKG/$ARCH-installer-filesystem/usr/share/hwdata +gzip -9${VERBOSE1} $PKG/$ARCH-installer-filesystem/usr/share/hwdata/* # Copy the rc script for rpcbind: cd $TMP/extract-packages/etc/rc.d @@ -1456,14 +1457,19 @@ for prunedir in $PKG/$ARCH-installer-filesystem/usr/bin $PKG/$ARCH-installer-fil rm -f $PKG/$ARCH-installer-filesystem/sbin/$(basename $removefile) done done -if [ -r $PKG/$ARCH-installer-filesystem/sbin/lspci -a ! -L $PKG/$ARCH-installer-filesystem/sbin/lspci -a -L $PKG/$ARCH-installer-filesystem/bin/lspci ]; then - rm -f $PKG/$ARCH-installer-filesystem/bin/lspci -fi + # busybox's implementation of 'xzcat' provides different output when piped into 'dd'. # Symlink 'xzcat' to the real 'xz' as we do within the OS: cd $PKG/$ARCH-installer-filesystem/bin ln -fs xz xzcat +# Busybox's implementation of 'lspci' doesn't consult the hardware data within +# /usr/share/hwdata. Replace it with pciutils' version: +cp --remove-destination \ + -fa${VERBOSE1} \ + $TMP/extract-packages/usr/bin/lspci \ + $PKG/$ARCH-installer-filesystem/bin/ + # Update to latest versions of files within /etc/ # /etc/ file Package Reason # ------------------------------------------------------------------------------------ diff --git a/source/l/adwaita-icon-theme/adwaita-icon-theme.SlackBuild b/source/l/adwaita-icon-theme/adwaita-icon-theme.SlackBuild index 27350f954..6264cd83e 100755 --- a/source/l/adwaita-icon-theme/adwaita-icon-theme.SlackBuild +++ b/source/l/adwaita-icon-theme/adwaita-icon-theme.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=adwaita-icon-theme VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -92,6 +92,34 @@ meson setup \ DESTDIR=$PKG $NINJA install || exit 1 cd .. +# Add some extra icons that have gone missing since adwaita-icon-theme-41.0 +# to ensure complete coverage of the FDo icon theme specification. +# Copy from the main tree and back to make sure that we +# don't overwrite these if they eventally appear. +( cd $PKG + mkdir tmpicons + cd tmpicons + tar xvf $CWD/41/adwaita-icon-theme-41.0.tar.xz || exit 1 + cd adwaita-icon-theme-41.0 + # Configure, build, and install: + export CFLAGS="$SLKCFLAGS" + export CXXFLAGS="$SLKCFLAGS" + ./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --build=$ARCH-slackware-linux || exit 1 + make $NUMJOBS || make || exit 1 + make install DESTDIR=$PKG/tmpicons || exit 1 + rsync -lprvt --progress ../usr/ usr/ + # Then sync back: + rsync -lprvt --progress usr/ ../usr/ + # And remove the leftovers: + cd .. + rm -r tmpicons +) + # Add some extra icons that are missing for Xfce. # Copy from the main tree and back to make sure that we # don't overwrite these if they eventally appear. diff --git a/source/l/libgnt/libgnt.SlackBuild b/source/l/libgnt/libgnt.SlackBuild index 913d0d90c..f348eaf60 100755 --- a/source/l/libgnt/libgnt.SlackBuild +++ b/source/l/libgnt/libgnt.SlackBuild @@ -23,8 +23,8 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libgnt -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | cut -f 2- -d - | rev | cut -f 3- -d . | rev)} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -42,7 +42,7 @@ fi # the name of the created package would be, and then exit. This information # could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + echo "$PKGNAM-$(echo $VERSION | tr - _)-$ARCH-$BUILD.txz" exit 0 fi @@ -134,5 +134,4 @@ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz - +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$(echo $VERSION | tr - _)-$ARCH-$BUILD.txz diff --git a/source/l/mozilla-nss/mozilla-nss.SlackBuild b/source/l/mozilla-nss/mozilla-nss.SlackBuild index 49e0c23e5..2b540481c 100755 --- a/source/l/mozilla-nss/mozilla-nss.SlackBuild +++ b/source/l/mozilla-nss/mozilla-nss.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=mozilla-nss SRCNAM=nss -VERSION=${VERSION:-3.99} +VERSION=${VERSION:-3.100} NSPR=${NSPR:-4.35} BUILD=${BUILD:-1} diff --git a/source/l/pygtk/pygtk.SlackBuild b/source/l/pygtk/pygtk.SlackBuild index c25f4c588..de4cfcefc 100755 --- a/source/l/pygtk/pygtk.SlackBuild +++ b/source/l/pygtk/pygtk.SlackBuild @@ -86,6 +86,7 @@ zcat $CWD/pygtk-fix-pango-object-leaks.patch.gz | patch -p1 --verbose || exit 1 # Fix build against recent pango: zcat $CWD/pygtk-Drop-the-PangoFont-find_shaper-virtual-method.patch.gz | patch -p1 --verbose || exit 1 +PYTHON=python2 \ CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/source/n/samba/samba.SlackBuild b/source/n/samba/samba.SlackBuild index 6544549c6..7eed0b774 100755 --- a/source/n/samba/samba.SlackBuild +++ b/source/n/samba/samba.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=samba VERSION=${VERSION:-$(echo samba-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} # This option may be set to "heimdal" or "mit". # Upstream considers the use of MIT Kerberos for provisioning an AD DC diff --git a/source/n/samba/samba.url b/source/n/samba/samba.url index 2874964b3..24e351aa8 100644 --- a/source/n/samba/samba.url +++ b/source/n/samba/samba.url @@ -1,2 +1,2 @@ -https://download.samba.org/pub/samba/stable/samba-4.20.0.tar.gz -https://download.samba.org/pub/samba/stable/samba-4.20.0.tar.asc +https://download.samba.org/pub/samba/stable/samba-4.20.1.tar.gz +https://download.samba.org/pub/samba/stable/samba-4.20.1.tar.asc |