Sun Apr 28 19:20:42 UTC 202420240428192042

a/iniparser-4.2-x86_64-1.txz:  Upgraded.
ap/hplip-3.23.12-x86_64-5.txz:  Rebuilt.
  Replace a single unicode space character in models.dat with an ASCII space
  to prevent python3 from tripping over it in some cases. This seems to follow
  the extreme programming motto of "do the simplest thing that could possibly
  work", so we'll see if it does.
  Thanks to pdags.
ap/jove-4.17.5.3-x86_64-1.txz:  Upgraded.
l/enchant-2.7.2-x86_64-1.txz:  Upgraded.
l/jasper-4.2.4-x86_64-1.txz:  Upgraded.
l/libgtop-2.41.3-x86_64-1.txz:  Upgraded.
l/mlt-7.24.0-x86_64-1.txz:  Upgraded.

6 files changed, 70 insertions, 202 deletions

diff --git a/source/ap/hplip/0026-remove-unicode-space-from-models.dat b/source/ap/hplip/0026-remove-unicode-space-from-models.dat
new file mode 100644
index 000000000..67434f3a0
--- /dev/null
+++ b/source/ap/hplip/0026-remove-unicode-space-from-models.dat
@@ -0,0 +1,11 @@
+--- ./data/models/models.dat.orig	2023-11-27 09:06:40.000000000 -0600
++++ ./data/models/models.dat	2024-04-28 14:03:19.702517817 -0500
+@@ -77629,7 +77629,7 @@
+ io-support=14
+ job-storage=0
+ linefeed-cal-type=0
+-model1=HP Color LaserJet Enterprise MFP X58045dn 
++model1=HP Color LaserJet Enterprise MFP X58045dn
+ model2=HP Color LaserJet Enterprise MFP X58045
+ monitor-type=0
+ panel-check-type=0
diff --git a/source/ap/hplip/hplip.SlackBuild b/source/ap/hplip/hplip.SlackBuild
index ba76a081c..682377996 100755
--- a/source/ap/hplip/hplip.SlackBuild
+++ b/source/ap/hplip/hplip.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=hplip
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-5}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
@@ -126,6 +126,9 @@ zcat $CWD/0003-models.dat-Re-add-drivers-missing-from-3.19.1.patch.gz | patch -p
 # Allow-non-JPEG-scanning-on-the-HP-DeskJet-3520-All-i(n-one and similar):
 zcat $CWD/0018-Allow-non-JPEG-scanning-on-the-HP-DeskJet-3520-All-i.patch.gz | patch -p1 --verbose || exit 1
 
+# Remove a unicode space character to fix more python3 breakage:
+zcat $CWD/0026-remove-unicode-space-from-models.dat.gz | patch -p1 --verbose || exit 1
+
 # autoreconf will fail if these files do not exist:
 for file in NEWS README AUTHORS ChangeLog ; do
   if [ ! -r $file ]; then
diff --git a/source/ap/jove/jove.SlackBuild b/source/ap/jove/jove.SlackBuild
index e29dc8e76..af64248c6 100755
--- a/source/ap/jove/jove.SlackBuild
+++ b/source/ap/jove/jove.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2008, 2009, 2010, 2017, 2018  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2024  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,17 +23,18 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=jove
-VERSION=4.16.0.74
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) export ARCH=i586 ;;
-    arm*) export ARCH=arm ;;
+  case "$(uname -m)" in
+    i?86) ARCH=i586 ;;
+    arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;;
     # Unless $ARCH is already set, use uname -m for all other archs:
-       *) export ARCH=$( uname -m ) ;;
+    *) ARCH=$(uname -m) ;;
   esac
+  export ARCH
 fi
 
 # If the variable PRINT_PACKAGE_NAME is set, then this script will report what
@@ -44,32 +45,47 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   exit 0
 fi
 
-NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
+NUMJOBS=${NUMJOBS:-" -j $(expr $(nproc) + 1) "}
 
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "armv7hl" ]; then
+  SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16"
+  LIBDIRSUFFIX=""
 else
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
 fi
 
 TMP=${TMP:-/tmp}
-PKG=$TMP/package-jove
+PKG=$TMP/package-$PKGNAM
 
 rm -rf $PKG
 mkdir -p $TMP $PKG
 
 cd $TMP
-rm -rf jove$VERSION
-tar xvf $CWD/jove$VERSION.tar.?z* || exit 1
-cd jove$VERSION || exit 1
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1
+cd $PKGNAM-$VERSION || exit 1
+
+# Fix install prefix:
+sed -i "s|JOVEHOME = /usr/local|JOVEHOME = /usr|g" Makefile
+
+# Use lib64 if needed:
+if [ "$LIBDIRSUFFIX" = "64" ]; then
+  sed -i "s|JLIBDIR = \$(JOVEHOME)/lib/jove|JLIBDIR = \$(JOVEHOME)/lib64/jove|g" Makefile
+fi
+
 chown -R root:root .
 find . \
   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -77,49 +93,38 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \+
 
-zcat $CWD/jove.makefile.diff.gz | patch -p1 --verbose --backup || exit 1
-
-# Patch due to removal of stropts.h:
-zcat $CWD/jove.glibc-2.30.diff.gz | patch -p1 --verbose --backup || exit 1
-
-# More patching needed now:
-sed -i -e "s#/lib/jove#/lib${LIBDIRSUFFIX}/jove#" \
-  -e "s#^OPTFLAGS = .*#OPTFLAGS = $SLKCFLAGS#" Makefile
-
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
 
-# Create jove-recover symlink
-( cd $PKG/usr/bin
-  ln -s ../lib${LIBDIRSUFFIX}/jove/recover jove-recover
-)
-
-# Install teach-jove file:
-cp -a --verbose doc/teach-jove $PKG/usr/lib${LIBDIRSUFFIX}/jove/teach-jove
-chown root:root $PKG/usr/lib${LIBDIRSUFFIX}/jove/teach-jove
-chmod 644 $PKG/usr/lib${LIBDIRSUFFIX}/jove/teach-jove
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" \
-  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-
-# Compress man pages
-( cd $PKG/usr/man
-  rm man1/jovetool.1 man1/xjove.1
-  find . -type f -exec gzip -9 {} \+
-  for i in $( find . -type l ) ; do
-    ln -s $( readlink $i ).gz $i.gz ; rm $i
-  done
-)
-
-# Copy program documentation into the package
-mkdir -p $PKG/usr/doc/jove$VERSION
+# Strip binaries:
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+
+# Compress manual pages:
+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
+
+# Add a documentation directory:
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
 cp -a \
-  README* $PKG/usr/doc/jove$VERSION
+  ChangeLog LICENSE* README* \
+  $PKG/usr/doc/${PKGNAM}-$VERSION
+
+mv $PKG/usr/share/doc/jove/example.rc $PKG/usr/doc/${PKGNAM}-$VERSION
+rm -r $PKG/usr/share/doc
+
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
-# Build the package:
 cd $PKG
-/sbin/makepkg -l y -c n $TMP/jove-$VERSION-$ARCH-$BUILD.txz
-
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
diff --git a/source/ap/jove/jove.glibc-2.30.diff b/source/ap/jove/jove.glibc-2.30.diff
deleted file mode 100644
index 684e73d4f..000000000
--- a/source/ap/jove/jove.glibc-2.30.diff
+++ /dev/null
@@ -1,17 +0,0 @@
---- ./iproc.c.orig	2008-05-20 21:35:18.000000000 -0500
-+++ ./iproc.c	2019-08-19 17:28:01.899194246 -0500
-@@ -536,14 +536,6 @@
- 
- # ifdef SVR4_PTYS
- #  include <stdlib.h>	/* for grantpt and unlockpt, at least in Solaris 2.3 */
--#  if _XOPEN_SOURCE >= 500
--    /* Linux/glibc no longer pretends to support STREAMS (XSR) (2008) */
--#   if _XOPEN_STREAMS != -1
--#    include <stropts.h>
--#   endif
--#  else
--#   include <sys/stropts.h>
--#  endif
-   extern char	*ptsname proto((int /*filedes*/));	/* get name of slave */
- # endif
- 
diff --git a/source/ap/jove/jove.makefile.diff b/source/ap/jove/jove.makefile.diff
deleted file mode 100644
index 8bf2be4bc..000000000
--- a/source/ap/jove/jove.makefile.diff
+++ /dev/null
@@ -1,132 +0,0 @@
---- jove4.16.0.70/Makefile	2005-09-30 19:14:41.000000000 -0300
-+++ jove4.16.0.70.new/Makefile	2009-03-04 02:01:26.000000000 -0300
-@@ -21,13 +21,14 @@
- # If they don't exist, this makefile will try to create the directories
- # LIBDIR and SHAREDIR.  All others must already exist.
- 
--JOVEHOME = /usr/local
-+JOVEHOME = /usr
- SHAREDIR = $(JOVEHOME)/lib/jove
- LIBDIR = $(JOVEHOME)/lib/jove
- BINDIR = $(JOVEHOME)/bin
- XEXT=
- MANDIR = $(JOVEHOME)/man/man$(MANEXT)
- MANEXT = 1
-+DESTDIR := ${DESTDIR}
- 
- # TMPDIR is where the tmp files get stored, usually /tmp, /var/tmp, or
- # /usr/tmp.  If you wish to be able to recover buffers after a system
-@@ -56,12 +57,12 @@
- INSTALLFLAGS = # -g bin -o root
- 
- # to install executable files
--XINSTALL=cp
-+XINSTALL=/usr/bin/install -c -m 755 -D
- #XINSTALL=/usr/ucb/install $(INSTALLFLAGS) -c -m 755 # -s
- #CYGWIN32: XINSTALL=install $(INSTALLFLAGS) -c -m 755
- 
- # to install text files
--TINSTALL=cp
-+TINSTALL=/usr/bin/install -c -m 644 -D
- #TINSTALL=/usr/ucb/install $(INSTALLFLAGS) -c -m 644
- #CYGWIN32: TINSTALL=install $(INSTALLFLAGS) -c -m 644
- 
-@@ -137,7 +138,7 @@
- # Add -DUSE_EXIT if you're profiling or using purify (this causes Jove
- # to exit using exit(), instead of _exit()).
- 
--SYSDEFS = -DBSDPOSIX_STDC
-+SYSDEFS = -DSYSVR4 -D_XOPEN_SOURCE=500
- 
- # Select optimization level (flags passed to compiling and linking steps).
- # On most systems: -g for debugging, -O for optimization.
-@@ -146,7 +147,7 @@
- # On DEC OSF/1 and Digital UNIX VV4.0, add -std1 to enable ANSI C features
- # and perhaps -g3 for more debugging info with optimization.
- 
--OPTFLAGS = -O
-+OPTFLAGS := ${OPTFLAGS}
- 
- # For making dependencies under BSD systems
- DEPENDFLAG = -M
-@@ -360,7 +361,7 @@
- install: $(LIBDIR) $(SHAREDIR) \
- 	 $(TEACH-JOVE) $(CMDS.DOC) $(TERMSDIR)docs \
- 	 $(PORTSRVINST) $(RECOVER) $(JOVE) $(TEACHJOVE) $(MANUALS)
--	$(TINSTALL) doc/jove.rc $(JOVERC)
-+	$(TINSTALL) doc/jove.rc $(DESTDIR)$(JOVERC)
- 	@echo See the README about changes to /etc/rc or /etc/rc.local
- 	@echo so that the system recovers jove files on reboot after a crash
- 
-@@ -371,7 +372,7 @@
- 	test -d $(SHAREDIR) || mkdir $(SHAREDIR)
- 
- $(TEACH-JOVE): doc/teach-jove
--	$(TINSTALL) doc/teach-jove $(TEACH-JOVE)
-+	$(TINSTALL) doc/teach-jove $(DESTDIR)$(TEACH-JOVE)
- 
- doc/cmds.doc:	doc/cmds.macros.nr doc/cmds.nr
- 	$(NROFF) doc/cmds.macros.nr doc/cmds.nr > doc/cmds.doc
-@@ -383,25 +384,25 @@
- 	( cd doc; tbl intro.nr | $(TROFF) -ms - cmds.nr contents.nr $(TROFFPOST) >jove.man.ps )
- 
- $(CMDS.DOC): doc/cmds.doc
--	$(TINSTALL) doc/cmds.doc $(CMDS.DOC)
-+	$(TINSTALL) doc/cmds.doc $(DESTDIR)$(CMDS.DOC)
- 
- $(JOVERC): doc/jove.rc
--	$(TINSTALL) doc/jove.rc $(JOVERC)
-+	$(TINSTALL) doc/jove.rc $(DESTDIR)$(JOVERC)
- 
- $(TERMSDIR)docs: $(DOCTERMS)
--	$(TINSTALL) $(DOCTERMS) $(TERMSDIR)
-+	$(TINSTALL) $(DOCTERMS) $(DESTDIR)$(TERMSDIR)
- 
- $(PORTSRV): portsrv$(XEXT)
--	$(XINSTALL) portsrv$(XEXT) $(PORTSRV)
-+	$(XINSTALL) portsrv$(XEXT) $(DESTDIR)$(PORTSRV)
- 
- $(RECOVER): recover$(XEXT)
--	$(XINSTALL) recover$(XEXT) $(RECOVER)
-+	$(XINSTALL) recover$(XEXT) $(DESTDIR)$(RECOVER)
- 
- $(JOVE): jjove$(XEXT)
--	$(XINSTALL) jjove$(XEXT) $(JOVE)
-+	$(XINSTALL) jjove$(XEXT) $(DESTDIR)$(JOVE)
- 
- $(TEACHJOVE): teachjove$(XEXT)
--	$(XINSTALL) teachjove$(XEXT) $(TEACHJOVE)
-+	$(XINSTALL) teachjove$(XEXT) $(DESTDIR)$(TEACHJOVE)
- 
- doc/jove.$(MANEXT): doc/jove.nr
- 	sed -e 's;<TMPDIR>;$(TMPDIR);' \
-@@ -410,7 +411,7 @@
- 	     -e 's;<SHELL>;$(DFLTSHELL);' doc/jove.nr > doc/jove.$(MANEXT)
- 
- $(JOVEM): doc/jove.$(MANEXT)
--	$(TINSTALL) doc/jove.$(MANEXT) $(JOVEM)
-+	$(TINSTALL) doc/jove.$(MANEXT) $(DESTDIR)$(JOVEM)
- 
- # doc/jove.doc is the formatted manpage (only needed by DOS)
- # Building it should be like building $(JOVEM) except that we
-@@ -427,17 +428,17 @@
- 	     -e 's;<SHELL>;$(DFLTSHELL);' doc/teachjove.nr > doc/teachjove.$(MANEXT)
- 
- $(TEACHJOVEM): doc/teachjove.$(MANEXT)
--	$(TINSTALL) doc/teachjove.$(MANEXT) $(TEACHJOVEM)
-+	$(TINSTALL) doc/teachjove.$(MANEXT) $(DESTDIR)$(TEACHJOVEM)
- 
- $(XJOVEM): doc/xjove.nr
--	$(TINSTALL) doc/xjove.nr $(XJOVEM)
-+	$(TINSTALL) doc/xjove.nr $(DESTDIR)$(XJOVEM)
- 
- doc/jovetool.$(MANEXT): doc/jovetool.nr
- 	sed -e 's;<MANDIR>;$(MANDIR);' \
- 	     -e 's;<MANEXT>;$(MANEXT);' doc/jovetool.nr > doc/jovetool.$(MANEXT)
- 
- $(JOVETOOLM): doc/jovetool.$(MANEXT)
--	$(TINSTALL) doc/jovetool.$(MANEXT) $(JOVETOOLM)
-+	$(TINSTALL) doc/jovetool.$(MANEXT) $(DESTDIR)$(JOVETOOLM)
- 
- echo:
- 	@echo $(C-FILES) $(HEADERS)
diff --git a/source/ap/jove/jove.url b/source/ap/jove/jove.url
index 024b00c40..1b3868917 100644
--- a/source/ap/jove/jove.url
+++ b/source/ap/jove/jove.url
@@ -1,3 +1 @@
-ftp://ftp.cs.toronto.edu/cs/ftp/pub/hugh/jove-dev
-# Old stable site:
-#ftp://ftp.cs.toronto.edu/cs/ftp/pub/moraes/jove
+https://github.com/jonmacs/jove