1 files changed, 29 insertions, 21 deletions
diff --git a/desktop/arc-theme/arc-theme.SlackBuild b/desktop/arc-theme/arc-theme.SlackBuild
index 8b5bf58ebb..1e5fd96b8e 100644
--- a/desktop/arc-theme/arc-theme.SlackBuild
+++ b/desktop/arc-theme/arc-theme.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for "arc-theme".
 
 # Copyright 2016 Marcel Saegebarth <marc@mos6581.de>
+# Copyright 2024 Philip van der Hoeven <philip@vd-hoeven.nl>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -27,7 +28,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=arc-theme
-VERSION=${VERSION:-20201121_81130a2}
+VERSION=${VERSION:-20221218}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -66,9 +67,6 @@ else
   LIBDIRSUFFIX=""
 fi
 
-gnome_shell="--disable-gnome-shell" ; [[ $(which gnome-shell) ]] && gnome_shell=""
-cinnamon="--disable-cinnamon" ; [[ $(which cinnamon-session) ]] && cinnamon=""
-
 set -e
 
 rm -rf $PKG
@@ -84,23 +82,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 {} \;
 
-sed -i "s|export-png=|export-type=png --export-filename=|" common/*/*.am || exit 1
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./autogen.sh \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  $gnome_shell \
-  $cinnamon \
-  --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
+THEMES="gtk2,gtk3,gtk4,metacity,plank,unity,xfwm"
+
+# Check for gnome and cinnamon
+type -P gnome-shell >/dev/null && THEMES+=",gnome-shell"
+type -P cinnamon-session >/dev/null && THEMES+=",cinnamon"
+
+# Build transparent theme
+mkdir build
+cd build
+  meson setup .. \
+    --prefix=/usr \
+    -Dthemes=$THEMES
+  "${NINJA:=ninja}"
+  DESTDIR=$PKG $NINJA install
+cd ..
+
+# Build solid theme
+rm -rf build
+mkdir build
+cd build
+  meson setup .. \
+    --prefix=/usr \
+    -Dtransparency=false \
+    -Dthemes=$THEMES
+  "${NINJA:=ninja}"
+  DESTDIR=$PKG $NINJA install
+cd ..
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS COPYING HACKING.md README.md $PKG/usr/doc/$PRGNAM-$VERSION