Thu Sep 28 21:37:06 UTC 202320230928213706

ap/mpg123-1.32.2-x86_64-1.txz:  Upgraded.
l/cairo-1.18.0-x86_64-1.txz:  Upgraded.
l/gtk4-4.12.3-x86_64-1.txz:  Upgraded.
x/fonttosfnt-1.2.3-x86_64-1.txz:  Upgraded.
xap/geeqie-2.1-x86_64-2.txz:  Rebuilt.
  Patched and recompiled against lua-5.4.6.
xap/mozilla-firefox-115.3.1esr-x86_64-1.txz:  Upgraded.
  This update contains a security fix.
  For more information, see:
    https://www.mozilla.org/en-US/firefox/115.3.1/releasenotes/
    https://www.mozilla.org/en-US/security/advisories/mfsa2023-44/
    https://www.cve.org/CVERecord?id=CVE-2023-5217
  (* Security fix *)
xfce/xfce4-panel-4.18.5-x86_64-1.txz:  Upgraded.
testing/packages/aaa_glibc-solibs-2.38-x86_64-1.txz:  Added.
testing/packages/glibc-2.38-x86_64-1.txz:  Added.
  Instead of building the deprecated glibc crypt library, bundle
  libxcrypt-4.4.36 (both .so.1 compat version and .so.2 new API version).
testing/packages/glibc-i18n-2.38-x86_64-1.txz:  Added.
testing/packages/glibc-profile-2.38-x86_64-1.txz:  Added.

6 files changed, 60 insertions, 49 deletions

diff --git a/source/a/FTBFSlog b/source/a/FTBFSlog
index fe0ad8dc4..639305f70 100644
--- a/source/a/FTBFSlog
+++ b/source/a/FTBFSlog
@@ -1,3 +1,6 @@
+Thu Sep 28 19:05:40 UTC 2023
+  gpm: add workaround for ./configure failure.
++--------------------------+
 Sun Oct 16 18:39:12 UTC 2022
   f2fs-tools: patch to build with newer lz4. Thanks to nobodino.
 +--------------------------+
diff --git a/source/a/gpm/gpm.SlackBuild b/source/a/gpm/gpm.SlackBuild
index 42ea90a9d..f5a6ded8b 100755
--- a/source/a/gpm/gpm.SlackBuild
+++ b/source/a/gpm/gpm.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2008, 2009, 2010, 2013, 2014, 2018, 2021  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2013, 2014, 2018, 2021, 2023  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -99,6 +99,12 @@ sh autogen.sh
 # into configure:
 autoconf
 
+# Since we aren't installing any Emacs Lisp files anyway, just brutally
+# hack around this failing part of ./configure. This may be a brittle
+# solution, so if it doesn't apply just go ahead and try without this
+# patch and see if it's working or not.
+zcat $CWD/gpm.configure.diff.gz | patch -p1 --verbose || exit 1
+
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
diff --git a/source/a/gpm/gpm.configure.diff b/source/a/gpm/gpm.configure.diff
new file mode 100644
index 000000000..7b3578e9a
--- /dev/null
+++ b/source/a/gpm/gpm.configure.diff
@@ -0,0 +1,12 @@
+--- ./configure.orig	2023-09-28 14:00:16.498715386 -0500
++++ ./configure	2023-09-28 14:00:55.205713245 -0500
+@@ -12426,8 +12426,7 @@
+ then :
+   printf %s "(cached) " >&6
+ else $as_nop
+-  eval itz_cv_path_site_lisp=`${EMACS} -batch -l ${srcdir}/exec.el -exec "(mapcar 'print load-path)" 2>/dev/null |
+-sed -e '/^$/d' | sed -n -e 2p`
++  eval
+ case x${itz_cv_path_site_lisp} in
+ x*site-lisp*) ;;
+ x*) itz_cv_path_site_lisp='${datadir}/emacs/site-lisp' ;;
diff --git a/source/l/cairo/cairo.SlackBuild b/source/l/cairo/cairo.SlackBuild
index c3cd054e9..8d21d5c78 100755
--- a/source/l/cairo/cairo.SlackBuild
+++ b/source/l/cairo/cairo.SlackBuild
@@ -76,54 +76,29 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \+
 
-# Recommended by BLFS for cairo-1.17.6 to "prevent errors later":
-if ! grep -q exec_prefix util/cairo-script/cairo-script-interpreter.pc.in ; then
-  sed -e "/@prefix@/a exec_prefix=@exec_prefix@" \
-      -i util/cairo-script/cairo-script-interpreter.pc.in
-fi
-
-CFLAGS="$SLKCFLAGS" \
-./configure \
+# Configure, build, and install:
+export CFLAGS="$SLKCFLAGS"
+export CXXFLAGS="$SLKCFLAGS"
+mkdir meson-build
+cd meson-build
+meson setup \
   --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --libdir=lib${LIBDIRSUFFIX} \
+  --libexecdir=/usr/libexec \
+  --bindir=/usr/bin \
+  --sbindir=/usr/sbin \
+  --includedir=/usr/include \
+  --datadir=/usr/share \
   --mandir=/usr/man \
   --sysconfdir=/etc \
-  --disable-gtk-doc \
-  --disable-quartz \
-  --disable-static \
-  --disable-win32 \
-  --disable-trace \
-  --enable-xlib \
-  --enable-xcb \
-  --enable-ps \
-  --enable-pdf \
-  --enable-svg \
-  --enable-tee \
-  --enable-ft \
-  --enable-gl \
-  --enable-gobject \
-  --enable-xml \
-  --build=$ARCH-slackware-linux || exit 1
-
-# None of these are 'stable' yet...
-#  --enable-qt \
-#  --enable-drm \
-
-# Not sure if these two are needed / useful yet; --enable-xcb is now default
-#  --enable-xcb-shm \
-#  ^^ may cause GTK+3 instability
-#  --enable-xlib-xcb \
-#  ^^  this one caused a GIMP slowdown
-
-# Skipping this, because it causes a dependency on the specific
-# version of binutils installed at compile time:
-#  --enable-trace
-
-make $NUMJOBS || make || exit 1
-make install DESTDIR=$PKG || exit 1
-
-# Don't ship .la files:
-rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+  --localstatedir=/var \
+  --buildtype=release \
+  -Dgtk_doc=false \
+  -Dtests=disabled \
+  .. || exit 1
+  "${NINJA:=ninja}" $NUMJOBS || exit 1
+  DESTDIR=$PKG $NINJA install || exit 1
+cd ..
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" \
   | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
@@ -132,7 +107,6 @@ mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
   AUTHORS* BIBLIOGRAPHY* BUGS* ChangeLog CODING_STYLE* COPYING* HACKING* NEWS* PORTING_GUIDE* README* RELEASING* \
   $PKG/usr/doc/$PKGNAM-$VERSION
-( cd $PKG/usr/doc/$PKGNAM-$VERSION ; ln -sf /usr/share/gtk-doc/html/cairo html )
 
 # We do not need the entire NEWS file.
 if [ -r NEWS ]; then
diff --git a/source/xap/geeqie/geeqie-2.1-lua.patch b/source/xap/geeqie/geeqie-2.1-lua.patch
new file mode 100644
index 000000000..c1c3c6de3
--- /dev/null
+++ b/source/xap/geeqie/geeqie-2.1-lua.patch
@@ -0,0 +1,14 @@
+--- geeqie-2.1/src/lua.cc	2023-06-17 14:12:30.000000000 +0200
++++ geeqie-2.1/src/lua.cc.new	2023-07-13 11:28:14.538188452 +0200
+@@ -24,9 +24,11 @@
+ 
+ #define _XOPEN_SOURCE
+ 
++extern "C" {
+ #include <lua.h>
+ #include <lauxlib.h>
+ #include <lualib.h>
++}
+ 
+ #include <stdio.h>
+ #include <glib.h>
diff --git a/source/xap/geeqie/geeqie.SlackBuild b/source/xap/geeqie/geeqie.SlackBuild
index a45031076..d2138c0a4 100755
--- a/source/xap/geeqie/geeqie.SlackBuild
+++ b/source/xap/geeqie/geeqie.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2010, 2011, 2012, 2015, 2016, 2018, 2022  Patrick Volkerding, Sebeka, MN, USA
+# Copyright 2010, 2011, 2012, 2015, 2016, 2018, 2022, 2023  Patrick Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=geeqie
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Download the geeqie Git head if there's no tarball:
 if ! /bin/ls $CWD/geeqie*tar* 1> /dev/null 2> /dev/null ; then
@@ -89,6 +89,8 @@ find . \
 
 mv ChangeLog.gqview ChangeLog
 
+cat $CWD/geeqie-2.1-lua.patch | patch -p1 --verbose || exit 1
+
 # Configure, build, and install:
 export CFLAGS="$SLKCFLAGS"
 export CXXFLAGS="$SLKCFLAGS"