4 files changed, 41 insertions, 44 deletions
diff --git a/network/gajim/README b/network/gajim/README
index 0e7fb06135..6e6856a15e 100644
--- a/network/gajim/README
+++ b/network/gajim/README
@@ -1,5 +1,12 @@
-As of the 0.16 version, gajim uses it's own non-blocking xmpp implementation
-called nbxmpp (python-nbxmpp on slackbuilds.org). This is required to build.
+gajim is a GTK3-based Jabber client featuring tabbed interface,
+tray icon and notifications, encryption support, local link
+(Zeroconf/Bonjour) and other interesting things.
 
-For encryption PyOpenSSL is used, which is not required for building, but
-produces a warning message on connection if not installed.
+Optional dependencies:
+   gspell
+   gst-plugins-ugly
+   gst-plugins-bad-nonfree
+
+Note that 1.5.4 is the last version to support Python 3.9, so there
+will be no more updates of this slackbuild until the next Slackware
+release.
diff --git a/network/gajim/gajim.SlackBuild b/network/gajim/gajim.SlackBuild
index d3665b9350..1e38de8bd4 100644
--- a/network/gajim/gajim.SlackBuild
+++ b/network/gajim/gajim.SlackBuild
@@ -1,8 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for Gajim
 #
 # Copyright 2014-2018 Ruben Schuller
+# Copyright 2022-2023 Andrew Clemons, Tokyo Japan
 #
 # All rights reserved.
 #
@@ -23,10 +24,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=gajim
-VERSION=${VERSION:-0.16.9}
+VERSION=${VERSION:-1.5.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,32 +40,22 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -70,19 +64,15 @@ 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 \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --build=$ARCH-slackware-linux
+# our pango is too old, but it seems a somewhat arbitrary version was chosen.
+# This version of Gajim seems to work fine with our pango in 15.0.
+sed -i "/_MIN_PANGO_VER/s/'1.50.0'/'1.48.0'/g" gajim/gajim.py
+
+python3 -m build --wheel --no-isolation
+
+python3 -m installer --destdir "$PKG" dist/*.whl
 
-make
-make install DESTDIR=$PKG
+mv $PKG/usr/share/man $PKG/usr/man
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -98,4 +88,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/gajim/gajim.info b/network/gajim/gajim.info
index 1a8146f1d7..49c97e2fcd 100644
--- a/network/gajim/gajim.info
+++ b/network/gajim/gajim.info
@@ -1,10 +1,10 @@
 PRGNAM="gajim"
-VERSION="0.16.9"
-HOMEPAGE="http://www.gajim.org"
-DOWNLOAD="https://gajim.org/downloads/0.x/0.16/gajim-0.16.9.tar.bz2"
-MD5SUM="87684533b7d6a9611fe28a9b7fca296d"
+VERSION="1.5.4"
+HOMEPAGE="https://gajim.org/"
+DOWNLOAD="https://gajim.org/downloads/1.5/gajim-1.5.4.tar.gz"
+MD5SUM="64affe8a670a34fca67808ca1cb5b664"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="pyOpenSSL python-nbxmpp pycrypto"
-MAINTAINER="Ruben Schuller"
-EMAIL="sb@rbn.im"
+REQUIRES="python3-build python3-wheel python-nbxmpp cryptography css-parser python3-keyring gtksourceview4 gsound python-qrcode python-axolotl python-gnupg gst-python"
+MAINTAINER="Andrew Clemons"
+EMAIL="andrew.clemons@gmail.com"
diff --git a/network/gajim/slack-desc b/network/gajim/slack-desc
index 6019eadf37..bb25670c10 100644
--- a/network/gajim/slack-desc
+++ b/network/gajim/slack-desc
@@ -8,12 +8,12 @@
      |-----handy-ruler------------------------------------------------------|
 gajim: gajim (full featured and easy to use Jabber client)
 gajim:
-gajim: Jabber is a GTK2-based Jabber client featuring tabbed interface,
+gajim: Jabber is a GTK3-based Jabber client featuring tabbed interface,
 gajim: tray icon and notifications, encryption support, local link
 gajim: (Zeroconf/Bonjour) and other interesting things.
 gajim:
 gajim:
 gajim:
 gajim:
-gajim: Website: http://www.gajim.org
+gajim: Website: https://gajim.org/
 gajim: