From a6160c7f56c451aa827678063c6ce95b7b4e404e Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
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/xap/libnma/doinst.sh                                         | 6 ++++++
 source/xap/libnma/libnma.SlackBuild                                 | 3 ++-
 source/xap/network-manager-applet/doinst.sh                         | 6 ------
 source/xap/network-manager-applet/network-manager-applet.SlackBuild | 2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)
 create mode 100644 source/xap/libnma/doinst.sh

(limited to 'source/xap')

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