From a6160c7f56c451aa827678063c6ce95b7b4e404e Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Fri, 10 Sep 2021 18:58:52 +0000 Subject: Fri Sep 10 18:58:52 UTC 2021 a/grub-2.06-x86_64-4.txz: Rebuilt. Install file in /etc/grub.d as .new so that they won't be clobbered by future package updates. Patch grub-mkconfig to skip .new files in /etc/grub.d. Thanks to denydias. d/bison-3.7.6-x86_64-1.txz: Upgraded. Reverted bison-3.8 since it breaks building glibc. Looks like I picked the wrong week to upgrade bison. ;-) Thanks to nobodino. l/jansson-2.14-x86_64-1.txz: Upgraded. l/libcap-2.57-x86_64-1.txz: Upgraded. l/liburing-2.1-x86_64-1.txz: Upgraded. xap/libnma-1.8.32-x86_64-2.txz: Rebuilt. Added glib-compile-schemas to the install script. Thanks to bormant. xap/network-manager-applet-1.24.0-x86_64-2.txz: Rebuilt. Removed glib-compile-schemas from the install script. Thanks to bormant. --- source/a/grub/0001-skip-new-files-in-etc-grub.d.patch | 11 +++++++++++ source/a/grub/doinst.sh | 6 ++++-- source/a/grub/grub.SlackBuild | 11 ++++++++--- source/l/jansson/jansson.SlackBuild | 2 +- source/xap/libnma/doinst.sh | 6 ++++++ source/xap/libnma/libnma.SlackBuild | 3 ++- source/xap/network-manager-applet/doinst.sh | 6 ------ .../network-manager-applet/network-manager-applet.SlackBuild | 2 +- 8 files changed, 33 insertions(+), 14 deletions(-) create mode 100644 source/a/grub/0001-skip-new-files-in-etc-grub.d.patch create mode 100644 source/xap/libnma/doinst.sh (limited to 'source') diff --git a/source/a/grub/0001-skip-new-files-in-etc-grub.d.patch b/source/a/grub/0001-skip-new-files-in-etc-grub.d.patch new file mode 100644 index 000000000..e1b4b8dcc --- /dev/null +++ b/source/a/grub/0001-skip-new-files-in-etc-grub.d.patch @@ -0,0 +1,11 @@ +--- ./util/grub-mkconfig.in.orig 2021-03-10 07:42:22.000000000 -0600 ++++ ./util/grub-mkconfig.in 2021-09-10 13:33:17.602163090 -0500 +@@ -278,6 +278,8 @@ + *~) ;; + # emacsen autosave files. FIXME: support other editors + */\#*\#) ;; ++ # Slackware incoming config files should be skipped as well: ++ *.new) ;; + *) + if grub_file_is_not_garbage "$i" && test -x "$i" ; then + echo diff --git a/source/a/grub/doinst.sh b/source/a/grub/doinst.sh index 20b6c34e2..54c06904f 100644 --- a/source/a/grub/doinst.sh +++ b/source/a/grub/doinst.sh @@ -11,6 +11,8 @@ config() { # Otherwise, we leave the .new copy for the admin to consider... } -config etc/grub.d/40_custom.new -rm -f etc/grub.d/40_custom.new +# Process config files in etc/grub.d/: +for file in etc/grub.d/*.new ; do + config $file +done config etc/default/grub.new diff --git a/source/a/grub/grub.SlackBuild b/source/a/grub/grub.SlackBuild index 7cf8b5b26..56f0c0beb 100755 --- a/source/a/grub/grub.SlackBuild +++ b/source/a/grub/grub.SlackBuild @@ -28,7 +28,7 @@ PKGNAM=grub VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} # Better to use _ than ~ in the package filenames version: PKGVER=$(echo $VERSION | tr '~' '_') -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -115,6 +115,9 @@ zcat $CWD/0198-align-struct-efi_variable-better.patch.gz | patch -p1 --verbose | # Fix unreadable XFS filesystem with v4 superblock: zcat $CWD/a4b495520e4dc41a896a8b916a64eda9970c50ea.patch.gz | patch -p1 --verbose || exit 1 +# Skip processing any files in /etc/grub.d/ that end in .new: +zcat $CWD/0001-skip-new-files-in-etc-grub.d.patch.gz | patch -p1 --verbose || exit 1 + # Regenerate build system to fix dependency on outdated automake: autoreconf -vif @@ -151,8 +154,10 @@ fi # Always end with regular build: build_grub || exit 1 -# Preserve the contents of /etc/grub.d/40_custom: -mv $PKG/etc/grub.d/40_custom $PKG/etc/grub.d/40_custom.new +# Preserve files in /etc/grub.d/: +for file in $PKG/etc/grub.d/*_* ; do + mv ${file} ${file}.new +done # Strip binaries: ( cd $PKG diff --git a/source/l/jansson/jansson.SlackBuild b/source/l/jansson/jansson.SlackBuild index fc8682791..a8edd6c06 100755 --- a/source/l/jansson/jansson.SlackBuild +++ b/source/l/jansson/jansson.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=jansson 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 diff --git a/source/xap/libnma/doinst.sh b/source/xap/libnma/doinst.sh new file mode 100644 index 000000000..56b9e419c --- /dev/null +++ b/source/xap/libnma/doinst.sh @@ -0,0 +1,6 @@ +if [ -e usr/share/glib-2.0/schemas ]; then + if [ -x /usr/bin/glib-compile-schemas ]; then + /usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas >/dev/null 2>&1 + fi +fi + diff --git a/source/xap/libnma/libnma.SlackBuild b/source/xap/libnma/libnma.SlackBuild index 4c9f616a0..f0ed67352 100755 --- a/source/xap/libnma/libnma.SlackBuild +++ b/source/xap/libnma/libnma.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libnma 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) "} @@ -113,6 +113,7 @@ cp -a \ $PKG/usr/doc/$PKGNAM-$VERSION mkdir -p $PKG/install +zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG diff --git a/source/xap/network-manager-applet/doinst.sh b/source/xap/network-manager-applet/doinst.sh index 96ae4b325..c20435a51 100644 --- a/source/xap/network-manager-applet/doinst.sh +++ b/source/xap/network-manager-applet/doinst.sh @@ -8,9 +8,3 @@ if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then fi fi -if [ -e usr/share/glib-2.0/schemas ]; then - if [ -x /usr/bin/glib-compile-schemas ]; then - /usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas >/dev/null 2>&1 - fi -fi - diff --git a/source/xap/network-manager-applet/network-manager-applet.SlackBuild b/source/xap/network-manager-applet/network-manager-applet.SlackBuild index 1e39ed78f..f033b3e1d 100755 --- a/source/xap/network-manager-applet/network-manager-applet.SlackBuild +++ b/source/xap/network-manager-applet/network-manager-applet.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=network-manager-applet VERSION=${VERSION:-$(echo $PKGNAM-*.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 -- cgit v1.2.3