2 files changed, 27 insertions, 19 deletions
diff --git a/system/gnome-disk-utility/gnome-disk-utility.SlackBuild b/system/gnome-disk-utility/gnome-disk-utility.SlackBuild
index 749e3b038c9af..4e8d87e2492c3 100644
--- a/system/gnome-disk-utility/gnome-disk-utility.SlackBuild
+++ b/system/gnome-disk-utility/gnome-disk-utility.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for gnome-disk-utility
 
-# Copyright 2015  Robby Workman, Tuscaloosa, Alabama, USA
+# Copyright 2015,2021  Robby Workman, Tuscaloosa, Alabama, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,13 +23,13 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=gnome-disk-utility
-VERSION=${VERSION:-3.6.1}
+VERSION=${VERSION:-3.38.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -72,21 +72,29 @@ 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 {} \;
 
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
+# Configure, build, and install:
+export CFLAGS="$SLKCFLAGS"
+export CXXFLAGS="$SLKCFLAGS"
+mkdir meson-build
+cd meson-build
+meson setup \
   --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --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 \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --build=$ARCH-slackware-linux \
-  --disable-schemas-compile \
-  --disable-libsystemd-login
-
-make
-make install DESTDIR=$PKG
+  --buildtype=release \
+  -Dlogind=libelogind \
+  -Dgsd_plugin=false \
+  .. || exit 1
+  "${NINJA:=ninja}" $NUMJOBS || exit 1
+  DESTDIR=$PKG $NINJA install || exit 1
+cd ..
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -95,7 +103,7 @@ 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 NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING HACKING NEWS README.md TODO $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 cbed34abc30ec..daa528a455aa2 100644
--- a/system/gnome-disk-utility/gnome-disk-utility.info
+++ b/system/gnome-disk-utility/gnome-disk-utility.info
@@ -1,8 +1,8 @@
 PRGNAM="gnome-disk-utility"
-VERSION="3.6.1"
+VERSION="3.38.1"
 HOMEPAGE="http://git.gnome.org/browse/gnome-disk-utility/"
-DOWNLOAD="http://ftp.gnome.org/pub/gnome/sources/gnome-disk-utility/3.6/gnome-disk-utility-3.6.1.tar.xz"
-MD5SUM="ff6e0a50a3a6aa9a8d9aa8b19d304485"
+DOWNLOAD="https://download.gnome.org/sources/gnome-disk-utility/3.38/gnome-disk-utility-3.38.1.tar.xz"
+MD5SUM="6e18fc9c6a50d120fd2c87c634382f03"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libpwquality"