development/bacon: Updated for version 5.0, add GTK3 GUI.

Signed-off-by: B. Watson <urchlay@slackware.uk>

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

3 files changed, 37 insertions, 23 deletions

diff --git a/development/bacon/README b/development/bacon/README
index 121f2c54bdf5..93c0e25a06f8 100644
--- a/development/bacon/README
+++ b/development/bacon/README
@@ -16,5 +16,6 @@ build time, the BaCon FLTK GUI will be built instead of the TK GUI.
 If you have fltk installed but prefer the TK GUI, export FLTK=no in
 the script's environment.
 
-Note: BaCon has a GTK+ GUI option, but it is not supported by this
-SlackBuild.
+Optional dependency: gtksourceview4 (NOT autodetected). Install this
+and export GTK3=yes in the environment, to build the GTK3 GUI instead
+of FLTK or TK.
diff --git a/development/bacon/bacon.SlackBuild b/development/bacon/bacon.SlackBuild
index 904c4302e04c..cc5966a9d502 100644
--- a/development/bacon/bacon.SlackBuild
+++ b/development/bacon/bacon.SlackBuild
@@ -6,6 +6,9 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20240812 bkw:
+# - update for v5.0.
+# - enable the GTK3 GUI.
 # 20230814 bkw:
 # - update to v4.7.
 # - switch to self-hosted download, as upstreams disappears the
@@ -16,7 +19,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=bacon
-VERSION=${VERSION:-4.7}
+VERSION=${VERSION:-5.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -54,6 +57,31 @@ fi
 
 set -e
 
+# The --enable-gui-* and --disable-gui-* don't actually work.
+# We can't run autoreconf either (fails).
+# The intent here is to build:
+# The GTK3 gui if requested by the user (but never automatically),
+# The FLTK gui if fltk is installed and not disabled with FLTK=no,
+# or the TK gui if fltk is missing or disabled via FLTK=no.
+# Either way, we don't currently support the gtk 2 gui (it depends
+# on webkitgtk 2.x, which is outdated and gone from our repo).
+if [ "${GTK3:-no}" = "yes" ]; then
+  if ! pkg-config --exists gtksourceview-4; then
+  cat <<EOF
+$0: GTK=3 is set, but gtksourceview4 is not installed. Aborting.
+EOF
+    exit 1
+  fi
+  GUI="FLTK=false TK=false GTK3=true LEGACY=false"
+  GUITYPE=GTK3
+elif [ "${FLTK:-yes}" = "yes" -a -x /usr/bin/fltk-config ]; then
+  GUI="FLTK=true TK=false GTK3=false LEGACY=false"
+  GUITYPE=FLTK
+else
+  GUI="FLTK=false TK=true GTK3=false LEGACY=false"
+  GUITYPE=TK
+fi
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
@@ -64,23 +92,6 @@ chown -R root:root .
 find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
         \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
-# The --enable-gui-* and --disable-gui-* don't actually work.
-# We can't run autoreconf either (fails).
-# The intent here is to build the fltk gui if fltk is installed and
-# not disabled with FLTK=no, or the tk gui if fltk is missing or
-# disabled.
-# Either way, we don't currently support the gtk 2 gui (it depends
-# on webkitgtk 2.x, which is outdated and gone from our repo) or the
-# gtk 3 gui (because I don't feel like dealing with webkit2gtk as a
-# dependency, not even an optional one).
-if [ "${FLTK:-yes}" = "yes" -a -x /usr/bin/fltk-config ]; then
-  GUI="FLTK=true TK=false GTK3=false GTK2=false"
-  GUITYPE=FLTK
-else
-  GUI="FLTK=false TK=true GTK3=false GTK2=false"
-  GUITYPE=TK
-fi
-
 # Keep the .xbm icon in a private directory, so nothing else accidentally
 # uses it (it's ugly).
 sed -i 's,/share/pixmaps/,/share/BaCon/,' bacon.bac
@@ -143,6 +154,8 @@ cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
 mkdir -p $PKG/usr/share/vim/vimfiles/syntax/
 mv $PKG/usr/share/BaCon/syntax/bacon.vim $PKG/usr/share/vim/vimfiles/syntax/bacon.vim
 mkdir -p $PKG/usr/share/gtksourceview-3.0/language-specs/
+mkdir -p $PKG/usr/share/gtksourceview-4/language-specs
+cp $PKG/usr/share/BaCon/syntax/bacon.lang $PKG/usr/share/gtksourceview-4/language-specs
 mv $PKG/usr/share/BaCon/syntax/bacon.lang $PKG/usr/share/gtksourceview-3.0/language-specs/bacon.lang
 
 # The vim syntax file works, but won't be used automatically without this:
diff --git a/development/bacon/bacon.info b/development/bacon/bacon.info
index 49b00c47d6da..fb5a9b799928 100644
--- a/development/bacon/bacon.info
+++ b/development/bacon/bacon.info
@@ -1,8 +1,8 @@
 PRGNAM="bacon"
-VERSION="4.7"
+VERSION="5.0"
 HOMEPAGE="http://www.basic-converter.org/"
-DOWNLOAD="https://slackware.uk/~urchlay/src/bacon-4.7.tar.gz"
-MD5SUM="6b27d53997f9fc7f37b4382db32099cf"
+DOWNLOAD="https://slackware.uk/~urchlay/src/bacon-5.0.tar.gz"
+MD5SUM="c9e97a8186eda0361d8d6ba726ca61e9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""