games/aisleriot: Updated for version 3.22.22

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

3 files changed, 29 insertions, 50 deletions

diff --git a/games/aisleriot/aisleriot.SlackBuild b/games/aisleriot/aisleriot.SlackBuild
index 060db98fd1..72346b7458 100644
--- a/games/aisleriot/aisleriot.SlackBuild
+++ b/games/aisleriot/aisleriot.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for aisleriot
 
-# Copyright 2020  Johannes Schoepfer, Germany
+# Copyright 2020 - 2022  Johannes Schoepfer, Germany
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,8 +25,8 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=aisleriot
-VERSION=${VERSION:-3.22.9}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-3.22.22}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -38,9 +38,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 +67,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,25 +76,27 @@ 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 {} \;
 
-patch < $CWD/guile3.diff
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --with-card-theme-formats=svg \
-  --enable-sound \
-  --disable-schemas-install \
-  --with-platform=gtk-only \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
+#-Dsound=false \
+
+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 \
+    -Dtheme_kde=false \
+    -Dtheme_pysol=true \
+    -Dtheme_pysol_path=/usr/lib64/python3.9/site-packages/pysol_cards/ \
+    -Dstrip=true
+  "${NINJA:=ninja}"
+  DESTDIR=$PKG $NINJA install
+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
@@ -107,7 +106,7 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  AUTHORS ChangeLog COPYING* NEWS TODO \
+  AUTHORS COPYING* README.md TODO \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/games/aisleriot/aisleriot.info b/games/aisleriot/aisleriot.info
index 9b9a3f7ace..9d0be8a056 100644
--- a/games/aisleriot/aisleriot.info
+++ b/games/aisleriot/aisleriot.info
@@ -1,8 +1,8 @@
 PRGNAM="aisleriot"
-VERSION="3.22.9"
+VERSION="3.22.22"
 HOMEPAGE="https://wiki.gnome.org/Apps/Aisleriot"
-DOWNLOAD="https://download.gnome.org/sources/aisleriot/3.22/aisleriot-3.22.9.tar.xz"
-MD5SUM="121678a799d027640ddfb267384440b5"
+DOWNLOAD="https://gitlab.gnome.org/GNOME/aisleriot/-/archive/3.22.22/aisleriot-3.22.22.tar.gz"
+MD5SUM="e4479fd098a53827427a59ba3ccd529d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/games/aisleriot/guile3.diff b/games/aisleriot/guile3.diff
deleted file mode 100644
index e93ba432da..0000000000
--- a/games/aisleriot/guile3.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- configure.orig	2020-02-05 00:02:14.990196320 +0100
-+++ configure	2020-02-05 00:03:41.968108947 +0100
-@@ -1610,7 +1610,7 @@
-                           Config database for installing schema files.
-   --with-gconf-schema-file-dir=dir
-                           Directory for installing schema files.
--  --with-guile=2.2|2.0|auto
-+  --with-guile=3.0|2.2|2.0|auto
-                           Which guile version to use (default: auto)
-   --with-help-method      which help method to use (ghelp|file|library;
-                           default: ghelp)
-@@ -18995,7 +18995,7 @@
- # Guile
- # *****
- 
--guile_versions_all="2.2 2.0"
-+guile_versions_all="3.0 2.2 2.0"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking which guile version to use" >&5
- $as_echo_n "checking which guile version to use... " >&6; }
-