4 files changed, 40 insertions, 57 deletions
diff --git a/system/guake/doinst.sh b/system/guake/doinst.sh
index c9b09eac641f2..5c97dbdc868ec 100644
--- a/system/guake/doinst.sh
+++ b/system/guake/doinst.sh
@@ -1,13 +1,3 @@
-schema_install() {
-  SCHEMA="$1"
-  GCONF_CONFIG_SOURCE="xml::etc/gconf/gconf.xml.defaults" \
-  chroot . gconftool-2 --makefile-install-rule \
-    /etc/gconf/schemas/$SCHEMA \
-    1>/dev/null
-}
-
-    schema_install guake.schemas
-
 if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
@@ -20,6 +10,6 @@ fi
 
 if [ -e usr/share/glib-2.0/schemas ]; then
   if [ -x /usr/bin/glib-compile-schemas ]; then
-    /usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas >/dev/null 2>&1
+      /usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas >/dev/null 2>&1
   fi
 fi
diff --git a/system/guake/guake-3.7.0-fix-paths.patch b/system/guake/guake-3.7.0-fix-paths.patch
new file mode 100644
index 0000000000000..0cd91ef062143
--- /dev/null
+++ b/system/guake/guake-3.7.0-fix-paths.patch
@@ -0,0 +1,22 @@
+--- guake/paths.py.orig	2020-02-10 16:10:10.000000000 -0500
++++ guake/paths.py	2020-06-08 20:32:03.423403158 -0400
+@@ -55,8 +55,8 @@
+ 
+ 
+ def get_default_locale_dir():
+-    d = os.path.join(get_data_files_dir(), "po")
+-    log.debug("Using guake image directory: %s", d)
++    d = '/usr/share/locale'
++    log.debug("Using guake locale directory: %s", d)
+     return d
+ 
+ 
+@@ -73,7 +73,7 @@
+ 
+ 
+ def get_default_schema_dir():
+-    d = get_default_data_dir()
++    d = '/usr/share/glib-2.0/schemas'
+     log.debug("Using guake scheme directory: %s", d)
+     return d
+ 
diff --git a/system/guake/guake.SlackBuild b/system/guake/guake.SlackBuild
index 0bf0b55b94933..2713b9539eeb5 100644
--- a/system/guake/guake.SlackBuild
+++ b/system/guake/guake.SlackBuild
@@ -1,8 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for guake
 
 # Copyright 2017-2018 Donald Cooley South Haven, IN USA
+# Copyright (C) 2020 Logan Rathbone <poprocks@gmail.com> Province of Ontario, Canada
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=guake
-VERSION=${VERSION:-0.8.14}
+VERSION=${VERSION:-3.7.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -40,20 +41,6 @@ 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
@@ -69,35 +56,19 @@ 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" \
-./autogen.sh \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --disable-schemas-install \
-  --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
-
-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
+# fix some of the broken paths
+patch -p0 < $CWD/guake-3.7.0-fix-paths.patch
 
-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
+make generate-desktop generate-mo compile-glib-schemas-dev
+make DESTDIR="$PKG" PREFIX='/usr' install-schemas install-locale
+python3 setup.py install --root "$PKG" --prefix="/usr" --optimize=1
 
-find $PKG -name perllocal.pod \
-  -o -name ".packlist" \
-  -o -name "*.bs" \
-  | xargs rm -f
+# don't ship duplicate .mo and .po files
+rm -rf $PKG/usr/share/guake/po
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  AUTHORS COPYING INSTALL NEWS README.rst ChangeLog \
+  COPYING NEWS.rst README.rst \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/system/guake/guake.info b/system/guake/guake.info
index 4318250bec7ca..4bc7673e193c5 100644
--- a/system/guake/guake.info
+++ b/system/guake/guake.info
@@ -1,10 +1,10 @@
 PRGNAM="guake"
-VERSION="0.8.14"
+VERSION="3.7.0"
 HOMEPAGE="http://guake.org"
-DOWNLOAD="https://github.com/Guake/guake/archive/0.8.14/guake-0.8.14.tar.gz"
-MD5SUM="a0155a28c4417d3c6200afbdebe2c306"
+DOWNLOAD="https://files.pythonhosted.org/packages/f1/20/32c2c8fe2ec4d5c38dbdd2b2ee60a382a529d0409c7a9960b2453e50d0d7/guake-3.7.0.tar.gz"
+MD5SUM="7934c9c214e25cbc706cd9a8e806becd"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="pyxdg python-keybinder gnome-python2-gconf gnome-common"
-MAINTAINER="Donald Cooley"
-EMAIL="chytraeu@sdf.org"
+REQUIRES="libwnck3 vte3 python3 py3cairo dbus-python3 pygobject3-python3 pbr"
+MAINTAINER="Logan Rathbone"
+EMAIL="poprocks@gmail.com"