system/gnome-terminal: Updated for version 2.33.5.

Signed-off-by: B. Watson <yalhcru@gmail.com>

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

5 files changed, 44 insertions, 18 deletions

diff --git a/system/gnome-terminal/README b/system/gnome-terminal/README
index ff0e0b5659..e97963521c 100644
--- a/system/gnome-terminal/README
+++ b/system/gnome-terminal/README
@@ -1,7 +1,5 @@
-========================================================================
-
-This is the GNOME terminal emulator application.  gnome-terminal is    
-only the shell (menubar, prefs dialog); the terminal emulation ("stuff 
+This is the GNOME terminal emulator application.  gnome-terminal is
+only the shell (menubar, prefs dialog); the terminal emulation ("stuff
 in the middle") comes from the VTE widget.
 
 How it works:
diff --git a/system/gnome-terminal/doinst.sh b/system/gnome-terminal/doinst.sh
index 7099757b97..e8dcf436cb 100644
--- a/system/gnome-terminal/doinst.sh
+++ b/system/gnome-terminal/doinst.sh
@@ -14,6 +14,16 @@ if [ -e usr/share/glib-2.0/schemas ]; then
   fi
 fi
 
+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 gnome-terminal.schemas
+
 if [ -x usr/bin/rarian-sk-update ]; then
   usr/bin/rarian-sk-update 1> /dev/null 2> /dev/null
 fi
diff --git a/system/gnome-terminal/gnome-terminal.SlackBuild b/system/gnome-terminal/gnome-terminal.SlackBuild
index c7821c9868..7c5ed5faf1 100644
--- a/system/gnome-terminal/gnome-terminal.SlackBuild
+++ b/system/gnome-terminal/gnome-terminal.SlackBuild
@@ -22,10 +22,16 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220211 bkw: Modified by SlackBuilds.org.
+# - updated for v2.33.5, the last of the 2.x versions. it's still
+#   10 years old.
+# - fix build on 15.0.
+# - stop writing outside of $TMP (i'm looking at you, gconf).
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=gnome-terminal
-VERSION=${VERSION:-2.32.1}
+VERSION=${VERSION:-2.33.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -38,9 +44,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
@@ -75,10 +78,15 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
+
+# 20220211 bkw: --disable-schemas-install is needed because without it,
+# it compiles the .schemas directly to /etc/gconf (pollutes the build box).
+# Instead, we do this in the doinst.sh.
 
+LIBS="-lICE" \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -90,13 +98,23 @@ CXXFLAGS="$SLKCFLAGS" \
   --disable-static \
   --disable-scrollkeeper \
   --disable-maintainer-mode \
+  --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
+# 20220211 bkw: bit of a dirty hack, to get 'make install' to finish.
+# I think this is fine, but even if it's not, it only affects a few
+# translations. It's caused by --disable-scrollkeeper...
+for i in help/*/gnome-terminal-*.omf; do
+  cp $i $i.out
+done
+
+# 20220211 bkw: have to install this manually.
+mkdir -p $PKG/etc/gconf/schemas
+cp -a src/gnome-terminal.schemas $PKG/etc/gconf/schemas
+
+make install-strip DESTDIR=$PKG
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS ChangeLog* COPYING HACKING NEWS README* $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/system/gnome-terminal/gnome-terminal.info b/system/gnome-terminal/gnome-terminal.info
index e28f430da0..848ed7b146 100644
--- a/system/gnome-terminal/gnome-terminal.info
+++ b/system/gnome-terminal/gnome-terminal.info
@@ -1,8 +1,8 @@
 PRGNAM="gnome-terminal"
-VERSION="2.32.1"
+VERSION="2.33.5"
 HOMEPAGE="https://www.gnome.org"
-DOWNLOAD="https://ftp.gnome.org/pub/gnome/sources/gnome-terminal/2.32/gnome-terminal-2.32.1.tar.gz"
-MD5SUM="cb7843b97a78a3bbaac9381f78bb8569"
+DOWNLOAD="https://ftp.gnome.org/pub/gnome/sources/gnome-terminal/2.33/gnome-terminal-2.33.5.tar.gz"
+MD5SUM="fd02ea27754348cdd53ba1d9032b3179"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libgnome rarian vte2"
diff --git a/system/gnome-terminal/slack-desc b/system/gnome-terminal/slack-desc
index 8693da8224..517e883e4f 100644
--- a/system/gnome-terminal/slack-desc
+++ b/system/gnome-terminal/slack-desc
@@ -8,7 +8,8 @@
               |-----handy-ruler------------------------------------------------------|
 gnome-terminal: gnome-terminal (GNOME terminal)
 gnome-terminal:
-gnome-terminal: This is the GNOME terminal
+gnome-terminal: This is the GNOME terminal.
+gnome-terminal:
 gnome-terminal:
 gnome-terminal:
 gnome-terminal:
@@ -16,4 +17,3 @@ gnome-terminal:
 gnome-terminal:
 gnome-terminal:
 gnome-terminal:
-gnome-terminal: Home: gnome.org