development/ghex: Update for 42.0; new maintainer

- L. Rathbone assumed maintainership with permission of B. Watson as
  upstream ghex maintainer
- Update README and slack-desc
- doinst.sh updated for gtk4
- Build options, etc. updated for 42.0
- Remove manpage; it contains incorrect information and is no more
  useful than running ghex --help
- Add build options: YELP and GTK_DOC

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

6 files changed, 48 insertions, 141 deletions

diff --git a/development/ghex/README b/development/ghex/README
index 0bb79b17b4..2426843295 100644
--- a/development/ghex/README
+++ b/development/ghex/README
@@ -1,17 +1,21 @@
-ghex (hex editor with GTK+3 GUI)
+ghex (hex editor with GTK4 GUI)
 
 GHex allows the user to load data from any file, view and edit it in
 either hex or ASCII. Useful for debugging problems with object code
 or encodings. Also used by kids who cheat at computer games, by adding
 score or lives to saved games.
 
-Optional dependency: yelp. Required for viewing the built-in help
-(Help->Contents, or F1 key). Alternatively, an HTML version of the
-help is included in /usr/doc/ghex-$VERSION/html/index.html for your
-perusal (in English only, though).
+Optional dependency: yelp. Enable by setting the SlackBuild option
+YELP=true if desired. This allows for the built-in help to be viewed
+natively with the standard GNOME help tool.
 
-Note: Trying to copy/paste arbitrary binary data into or out of
-ghex isn't going to work very well, because modern GTK+ insists the
-copy buffer has to be UTF-8 encoded Unicode. The result is lots
-of "\Uffffffff" (meaning "Invalid UTF-8") rather than the binary
-data. There's nothing we can do to fix this without major surgery.
+If this option is not enabled, the build will enable static HTML help by
+default, which will allow the built-in help to be viewed with other help
+viewers, such as KDE's help viewer, or by manually navigating to
+/usr/doc/HTML/{lang}/ghex, where "{lang}" is the applicable ISO language
+code.
+
+Buliding the libgtkhex API documentation requires `gi-docgen`, which is
+not presently in the slackbuilds.org repositories at the of writing. If
+you choose to install this manually and wish to build the API
+documentation, you can set the SlackBuild option GTK_DOC=true
diff --git a/development/ghex/doinst.sh b/development/ghex/doinst.sh
index 9b26fbab9d..8f75dac35d 100644
--- a/development/ghex/doinst.sh
+++ b/development/ghex/doinst.sh
@@ -4,8 +4,8 @@ if [ -x /usr/bin/update-desktop-database ]; then
 fi
 
 if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
-  if [ -x /usr/bin/gtk-update-icon-cache ]; then
-    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  if [ -x /usr/bin/gtk4-update-icon-cache ]; then
+    /usr/bin/gtk4-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
   fi
 fi
 
diff --git a/development/ghex/ghex.1 b/development/ghex/ghex.1
deleted file mode 100644
index c30b0d8c13..0000000000
--- a/development/ghex/ghex.1
+++ /dev/null
@@ -1,85 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\"
-.\" $Id: ghex.1,v 1.1 2001/04/14 19:41:50 epg Exp $
-.\"
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH GHEX 1 "April 14, 2001"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-ghex \- A GNOME Hex Editor
-.SH SYNOPSIS
-.B ghex
-.RI [ options ] " files" ...
-.SH DESCRIPTION
-This manual page documents briefly the
-.B ghex
-command.
-This manual page was written for the Debian GNU/Linux distribution
-because the original program does not have a manual page.
-Instead, it has documentation in the GNOME help system.
-.PP
-.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
-.\" respectively.
-\fBghex\fP allows the user to load data from any file, view and
-edit it in either hex or ascii. A must for anyone playing games
-that use non-ascii format for saving.
-.SH OPTIONS
-These programs follow the usual GNU command line syntax, with long
-options starting with two dashes (`-').
-A summary of options is included below.
-
-Usage: ghex [OPTION...]
-
-GNOME options
-  --disable-sound             Disable sound server usage
-  --enable-sound              Enable sound server usage
-  --espeaker=HOSTNAME:PORT    Host:port on which the sound server to use is
-                              running
-  --version
-
-Help options
-  -?, --help                  Show this help message
-  --usage                     Display brief usage message
-
-GTK options
-  --gdk-debug=FLAGS           Gdk debugging flags to set
-  --gdk-no-debug=FLAGS        Gdk debugging flags to unset
-  --display=DISPLAY           X display to use
-  --sync                      Make X calls synchronous
-  --no-xshm                   Don't use X shared memory extension
-  --name=NAME                 Program name as used by the window manager
-  --class=CLASS               Program class as used by the window manager
-  --gxid_host=HOST
-  --gxid_port=PORT
-  --xim-preedit=STYLE
-  --xim-status=STYLE
-  --gtk-debug=FLAGS           Gtk+ debugging flags to set
-  --gtk-no-debug=FLAGS        Gtk+ debugging flags to unset
-  --g-fatal-warnings          Make all warnings fatal
-  --gtk-module=MODULE         Load an additional Gtk module
-
-GNOME GUI options
-  --disable-crash-dialog
-
-Session management options
-  --sm-client-id=ID           Specify session management ID
-  --sm-config-prefix=PREFIX   Specify prefix of saved configuration
-  --sm-disable                Disable connection to session manager
-
-.SH AUTHOR
-This manual page was written by Eric Gillespie, Jr. <epg@debian.org>,
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/development/ghex/ghex.SlackBuild b/development/ghex/ghex.SlackBuild
index 492c7eefc3..cbeb4c69f6 100644
--- a/development/ghex/ghex.SlackBuild
+++ b/development/ghex/ghex.SlackBuild
@@ -2,24 +2,17 @@
 
 # Slackware build script for ghex
 
-# Written by B. Watson (yalhcru@gmail.com)
-
+# Originally written by B. Watson (yalhcru@gmail.com), Copyright © 2020-2021
+# Updated for GHex 4.x by Logan Rathbone <poprocks@gmail.com>, Copyright © 2022
+#
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
-
-# Although upstream describes this as "a hex editor for GNOME", it has
-# no gnome dependencies (just GTK3). Previous versions (2.x) did depend
-# on gnome so I never wanted to package them...
-
-# 20210831 bkw: update for v3.41.beta. Normally I wouldn't package
-# a beta, but the beta has the ability to copy/paste raw binary
-# data between ghex windows (of the same instance of ghex, anyway).
-# And the new upstream ghex maintainer is a friend (and also a SBo
-# contributor; hi Logan!)
+#
+# For ChangeLog, see SBo git log history.
 
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=ghex
-VERSION=${VERSION:-3.41.beta}
+VERSION=${VERSION:-42.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -67,42 +60,37 @@ 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 {} \+
 
-# Fix the .docbook help files so they work with 14.2's docbook,
-# and so they don't cause docbook2html to connect to a remote site.
-# DTD may have to change for some future Slackware release.
-DTD="/usr/share/xml/docbook/xml-dtd-4.5/docbookx.dtd"
-sed -i \
-    -e '/<xi:include.*legal/s,.*,\&legal;,' \
-    -e '/docbookx.dtd/a  <!ENTITY legal SYSTEM "legal.xml">' \
-    -e 's,"http://www\.oasis.*dtd","'$DTD'",' \
-    help/*/index.docbook
+# Process optional yelp dependency option
+if [ "$YELP" = "true" ]; then
+  STATIC_HELP="false"
+else
+  STATIC_HELP="true"
+fi
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 meson \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --strip \
+  -Dbuildtype=plain \
+  -Dprefix=/usr \
+  -Dlibdir=/usr/lib${LIBDIRSUFFIX} \
+  -Dsysconfdir=/etc \
+  -Dlocalstatedir=/var \
+  -Ddocdir=/usr/doc \
+  -Dstrip=true \
+  -Dgtk_doc=${GTK_DOC:-false} \
+  -Dstatic-html-help=${STATIC_HELP} \
   build
 
-DESTDIR="$PKG" ${NINJA:-ninja} -C build install
+DESTDIR="$PKG" ${NINJA:-ninja} -v -C build install
+
+# Don't ship .la files:
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
 
 PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
 mkdir -p $PKGDOC
 cp -a COPYING* HACKING NEWS README* $PKGDOC
 cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
 
-# Generate the HTML help, for those who don't want to install yelp.
-docbook2html -u -o $PKGDOC/html/ $PKG/usr/share/help/C/$PRGNAM/index.docbook
-ln -s ../../../share/help/C/$PRGNAM/figures $PKGDOC/html/
-
-# Man page is fairly useless, include it anyway (from Debian).
-mkdir -p $PKG/usr/man/man1
-gzip -9c < $CWD/$PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
-
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
diff --git a/development/ghex/ghex.info b/development/ghex/ghex.info
index 82e456ad9f..701ceb21c7 100644
--- a/development/ghex/ghex.info
+++ b/development/ghex/ghex.info
@@ -1,10 +1,10 @@
 PRGNAM="ghex"
-VERSION="3.41.beta"
-HOMEPAGE="https://wiki.gnome.org/Apps/Ghex"
-DOWNLOAD="https://ftp.gnome.org/pub/GNOME/sources/ghex/3.41/ghex-3.41.beta.tar.xz"
-MD5SUM="47465a20af4b088694d3eec6dbc68a94"
+VERSION="42.0"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/ghex"
+DOWNLOAD="https://download.gnome.org/sources/ghex/42/ghex-42.0.tar.xz"
+MD5SUM="0f4b4b7bb38e18adb51f54fbf2c98367"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+MAINTAINER="Logan Rathbone"
+EMAIL="poprocks@gmail.com"
diff --git a/development/ghex/slack-desc b/development/ghex/slack-desc
index b22591eec1..f591cd57cc 100644
--- a/development/ghex/slack-desc
+++ b/development/ghex/slack-desc
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
     |-----handy-ruler------------------------------------------------------|
-ghex: ghex (hex editor with GTK+3 GUI)
+ghex: ghex (hex editor with GTK4 GUI)
 ghex:
 ghex: GHex allows the user to load data from any file, view and edit it
 ghex: in either hex or ASCII. Useful for debugging problems with object