obconf: rebuilt for Slackware 15.0

1 files changed, 18 insertions, 10 deletions

diff --git a/obconf/build/obconf.SlackBuild b/obconf/build/obconf.SlackBuild
index 0a4c5c8b..2e54f662 100755
--- a/obconf/build/obconf.SlackBuild
+++ b/obconf/build/obconf.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 # $Id$
-# Copyright 2008, 2009, 2013, 2016  Eric Hameleers, Eindhoven, NL
+# Copyright 2008, 2009, 2013, 2016, 2022  Eric Hameleers, Eindhoven, NL
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -38,16 +38,19 @@
 #               snapshot because the latest release tarball is way too old.
 # 2.0.4-1:    10/aug/2016 by Eric Hameleers <alien@slackware.com>
 #             * Update.
+# 2.0.4-2:    05/feb/2022 by Eric Hameleers <alien@slackware.com>
+#             * Rebuilt. Switch to gtk+-3 and stop using libglade,
+#               (thanks Arch Linux).
 # 
 # Run 'sh obconf.SlackBuild' to build a Slackware package.
-# The package (.tgz) plus descriptive .txt file are created in /tmp .
+# The package (.txz) plus descriptive .txt file are created in /tmp .
 # Install using 'installpkg'. 
 #
 # -----------------------------------------------------------------------------
 
 PRGNAM=obconf
 VERSION=${VERSION:-2.0.4}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-alien}
 
 DOCS="ABOUT-NLS AUTHORS CHANGELOG COPYING NEWS README TODO"
@@ -120,7 +123,7 @@ mkdir -p $TMP/tmp-$PRGNAM # location to build the source
 mkdir -p $PKG             # place for the package to be built
 rm -rf $PKG/*             # always erase old package's contents
 rm -rf $TMP/tmp-$PRGNAM/* # remove the remnants of previous build
-rm -rf $OUTPUT/{configure,make,install,error,makepkg}-$PRGNAM.log
+rm -rf $OUTPUT/{autoreconf,configure,make,install,makepkg}-$PRGNAM.log
                           # remove old log files
 
 # Source file availability:
@@ -161,11 +164,16 @@ cd ${PRGNAM}-${VERSION}
 chown -R root:root .
 chmod -R u+w,go+r-w,a+X-s .
 
-## Include a patch by Andrew Rowland to fix build errors:
-#cat $SRCDIR/obconf_git_preview.patch | patch -p1 --verbose \
-#  2>&1 | tee $OUTPUT/patch-$PRGNAM.log
+# Get rid of libglade and switch to gtk+-3 (thanks Arch Linux):
+touch $OUTPUT/patch-$PRGNAM.log
+cat $SRCDIR/patches/obconf_no_libglade.patch | patch -p1 --verbose \
+  2>&1 | tee -a $OUTPUT/patch-$PRGNAM.log
+cat $SRCDIR/patches/obconf_switch_to_gtk3.patch | patch -p1 --verbose \
+  2>&1 | tee -a $OUTPUT/patch-$PRGNAM.log
 
 echo Building ...
+autoreconf -vif 2>&1 | tee $OUTPUT/autoreconf-$PRGNAM.log
+
 export LDFLAGS="$SLKLDFLAGS"
 export CXXFLAGS="$SLKCFLAGS"
 export CFLAGS="$SLKCFLAGS"
@@ -210,14 +218,14 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
 # Add a package description:
 mkdir -p $PKG/install
 cat $SRCDIR/slack-desc > $PKG/install/slack-desc
-#cat $SRCDIR/doinst.sh >> $PKG/install/doinst.sh
 cat $SRCDIR/slack-required > $PKG/install/slack-required
+#cat $SRCDIR/doinst.sh >> $PKG/install/doinst.sh
 
 # Build the package:
 cd $PKG
-makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.tgz 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log
+makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txz 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log
 cd $OUTPUT
-md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.tgz > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.tgz.md5
+md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txz > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txz.md5
 cd -
 cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt
 cat $PKG/install/slack-required > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.dep