system/gnome-disk-utility: Updated for version 42.0. New maintainer.

Signed-off-by: Dave Woodfall <dave@slackbuilds.org>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

5 files changed, 53 insertions, 44 deletions

diff --git a/system/gnome-disk-utility/README b/system/gnome-disk-utility/README
index e424cfb0dd..bc513f0b8c 100644
--- a/system/gnome-disk-utility/README
+++ b/system/gnome-disk-utility/README
@@ -1,5 +1,10 @@
-gnome-disk-utility provides libraries and applications for dealing
-with storage devices.
+gnome-disk-utility provides libraries and applications for dealing with
+storage devices, including GNOME Disks, gnome-disk-image-mounter and 
+gsd-disk-utility-notify.
 
-This is pretty much locked at version 3.6.1 unless you want to go
-down the rabbithole of GNOME3 on your system.
+Optional Dependency:
+- gnome-settings-daemon
+
+Note: The SlackBuild will automatically detect if gnome-settings-daemon
+is installed and enable building the plugin, otherwise it will be 
+disabled.
diff --git a/system/gnome-disk-utility/doinst.sh b/system/gnome-disk-utility/doinst.sh
index e924bab47c..401d987795 100644
--- a/system/gnome-disk-utility/doinst.sh
+++ b/system/gnome-disk-utility/doinst.sh
@@ -13,4 +13,3 @@ if [ -e usr/share/glib-2.0/schemas ]; then
     /usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas >/dev/null 2>&1
   fi
 fi
-
diff --git a/system/gnome-disk-utility/gnome-disk-utility.SlackBuild b/system/gnome-disk-utility/gnome-disk-utility.SlackBuild
index f325767412..9cd4575abf 100644
--- a/system/gnome-disk-utility/gnome-disk-utility.SlackBuild
+++ b/system/gnome-disk-utility/gnome-disk-utility.SlackBuild
@@ -2,6 +2,7 @@
 
 # Slackware build script for gnome-disk-utility
 
+# Copyright 2022 Bob Funk Winnipeg, Canada
 # Copyright 2015,2021  Robby Workman, Tuscaloosa, Alabama, USA
 # All rights reserved.
 #
@@ -25,7 +26,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=gnome-disk-utility
-VERSION=${VERSION:-3.38.2}
+VERSION=${VERSION:-42.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -38,9 +39,6 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# 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 "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
   exit 0
@@ -70,7 +68,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -79,28 +77,33 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Configure, build, and install:
-export CFLAGS="$SLKCFLAGS"
-export CXXFLAGS="$SLKCFLAGS"
-mkdir meson-build
-cd meson-build
-meson setup \
-  --prefix=/usr \
-  --libdir=lib${LIBDIRSUFFIX} \
-  --libexecdir=/usr/libexec \
-  --bindir=/usr/bin \
-  --sbindir=/usr/sbin \
-  --includedir=/usr/include \
-  --datadir=/usr/share \
-  --mandir=/usr/man \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --buildtype=release \
-  -Dlogind=libelogind \
-  -Dgsd_plugin=false \
-  .. || exit 1
-  "${NINJA:=ninja}" || exit 1
-  DESTDIR=$PKG $NINJA install || exit 1
+# Detect if gnome-settings-daemon is installed and disable building 
+# the plugin if its not installed:
+if ( pkg-config --exists gnome-settings-daemon); then
+  GSD_PLUGIN=true
+  echo "gnome-settings-daemon found, enabling plugin."
+else
+  GSD_PLUGIN=false
+  echo "gnome-settings-daemon not found, disabling plugin."
+fi
+
+mkdir build
+cd build
+  CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  meson .. \
+    --buildtype=release \
+    --infodir=/usr/info \
+    --libdir=/usr/lib${LIBDIRSUFFIX} \
+    --localstatedir=/var \
+    --mandir=/usr/man \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    -Dstrip=true \
+    -Dlogind=libelogind \
+    -Dgsd_plugin=$GSD_PLUGIN
+  "${NINJA:=ninja}"
+  DESTDIR=$PKG $NINJA install
 cd ..
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
@@ -110,7 +113,9 @@ find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING HACKING NEWS README.md TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  AUTHORS COPYING HACKING NEWS README.md \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/system/gnome-disk-utility/gnome-disk-utility.info b/system/gnome-disk-utility/gnome-disk-utility.info
index 2e8f6602c4..09fa88460d 100644
--- a/system/gnome-disk-utility/gnome-disk-utility.info
+++ b/system/gnome-disk-utility/gnome-disk-utility.info
@@ -1,10 +1,10 @@
 PRGNAM="gnome-disk-utility"
-VERSION="3.38.2"
-HOMEPAGE="http://git.gnome.org/browse/gnome-disk-utility/"
-DOWNLOAD="https://download-fallback.gnome.org/sources/gnome-disk-utility/3.38/gnome-disk-utility-3.38.2.tar.xz"
-MD5SUM="3b4130ef1399d26c385ab03e22f79a3e"
+VERSION="42.0"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-disk-utility"
+DOWNLOAD="https://download.gnome.org/sources/gnome-disk-utility/42/gnome-disk-utility-42.0.tar.xz"
+MD5SUM="5c03e03bbe1042d58790d64a9cbc4e7d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Robby Workman"
-EMAIL="rworkman@slackbuilds.org"
+REQUIRES="libhandy"
+MAINTAINER="Bob Funk"
+EMAIL="bobfunk11@gmail.com"
diff --git a/system/gnome-disk-utility/slack-desc b/system/gnome-disk-utility/slack-desc
index 327f5ab536..1d984ca4b0 100644
--- a/system/gnome-disk-utility/slack-desc
+++ b/system/gnome-disk-utility/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
                   |-----handy-ruler------------------------------------------------------|
-gnome-disk-utility: gnome-disk-utility (libs and apps for storage device handling)
-gnome-disk-utility:
-gnome-disk-utility: gnome-disk-utility provides libraries and applications for dealing
-gnome-disk-utility: with storage devices.
+gnome-disk-utility: gnome-disk-utility (GNOME Disks)
 gnome-disk-utility:
+gnome-disk-utility: GNOME Disks, gnome-disk-image-mounter and gsd-disk-utility-notify are
+gnome-disk-utility: libraries and applications for dealing with storage devices. 
 gnome-disk-utility:
 gnome-disk-utility:
 gnome-disk-utility:
 gnome-disk-utility:
 gnome-disk-utility:
+gnome-disk-utility: https://gitlab.gnome.org/GNOME/gnome-disk-utility
 gnome-disk-utility: