Mon Apr 29 21:32:37 UTC 2024HEAD20240429213237master

a/aaa_libraries-15.1-x86_64-31.txz:  Rebuilt.
  Added: libncurses++w.so.6.5, libtic.so.6.5.
  Upgraded: libformw.so.6.5, libmenuw.so.6.5, libncursesw.so.6.5,
  libpanelw.so.6.5, libtinfo.so.6.5.
  Removed (with compat symlinks made): libform.so.6.4, libmenu.so.6.4,
  libncurses.so.6.4, libpanel.so.6.4.
a/aaa_terminfo-6.5-x86_64-1.txz:  Upgraded.
l/ncurses-6.5-x86_64-1.txz:  Upgraded.
  This seemed like a good opportunity to go over my notes and try to make this
  SlackBuild at least defensible, if not correct. :-) The non-wide libraries
  have all been purged and replaced with compatibility symlinks pointing to the
  wide versions. Anything trying to use -lncurses (etc) will be redirected to
  -lncursesw (etc) at compile time. Looks like nearly 50 packages are linked to
  the non-wide libraries, but everything works this way.
  Thanks to GazL who provided most of the suggestions used.
l/python-pyproject-hooks-1.1.0-x86_64-1.txz:  Upgraded.
n/lynx-2.9.1-x86_64-1.txz:  Upgraded.
x/xconsole-1.1.0-x86_64-1.txz:  Upgraded.
xap/mozilla-firefox-125.0.3-x86_64-1.txz:  Upgraded.
  This is a bugfix release.
  For more information, see:
    https://www.mozilla.org/en-US/firefox/125.0.3/releasenotes/

2 files changed, 16 insertions, 8 deletions

diff --git a/source/a/aaa_libraries/aaa_libraries.SlackBuild b/source/a/aaa_libraries/aaa_libraries.SlackBuild
index 3d1cc496b..6e6bd5df4 100755
--- a/source/a/aaa_libraries/aaa_libraries.SlackBuild
+++ b/source/a/aaa_libraries/aaa_libraries.SlackBuild
@@ -23,7 +23,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=aaa_libraries
 VERSION=${VERSION:-15.1}
-BUILD=${BUILD:-30}
+BUILD=${BUILD:-31}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -142,6 +142,16 @@ chmod 755 $PKG/lib${LIBDIRSUFFIX}/lib*.so.* $PKG/usr/lib${LIBDIRSUFFIX}/lib*.so.
 # installpkg will create them if needed by running ldconfig.
 find $PKG -type l -exec rm --verbose "{}" \+
 
+# Time to ask for trouble. We should add a few compatibility symlinks for the
+# non-wide ncurses libraries, and for the now built-in tic/tinfo:
+( cd $PKG/lib${LIBDIRSUFFIX}
+  ln -sf libformw.so.6 libform.so.6
+  ln -sf libmenuw.so.6 libmenu.so.6
+  ln -sf libncurses++w.so.6 libncurses++.so.6
+  ln -sf libncursesw.so.6 libncurses.so.6
+  ln -sf libpanelw.so.6 libpanel.so.6
+)
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
diff --git a/source/a/aaa_libraries/symlinks-to-tracked-libs b/source/a/aaa_libraries/symlinks-to-tracked-libs
index 9ee542272..5895b029b 100644
--- a/source/a/aaa_libraries/symlinks-to-tracked-libs
+++ b/source/a/aaa_libraries/symlinks-to-tracked-libs
@@ -9,6 +9,7 @@
 /lib/libcap.so.2
 /lib/libdm.so.0
 /lib/libelf.so.1
+/lib/libformw.so.6
 /lib/libfuse.so.2
 /lib/libgpm.so.2
 /lib/libkeyutils.so.1
@@ -17,12 +18,14 @@
 /lib/libk5crypto.so.3
 /lib/libgssapi_krb5.so.2
 /lib/liblzma.so.5
+/lib/libmenuw.so.6
 /lib/libncurses.so.5
-/lib/libncurses.so.6
 /lib/libncursesw.so.5
 /lib/libncursesw.so.6
+/lib/libncurses++w.so.6
 /lib/libnsl.so.2
 /lib/libnsl.so.3
+/lib/libpanelw.so.6
 /lib/libpcre.so.1
 /lib/libpcre2-8.so.0
 /lib/libpcreposix.so.0
@@ -30,6 +33,7 @@
 /lib/libsigsegv.so.2
 /lib/libsysfs.so.2
 /lib/libtermcap.so.2
+/lib/libtic.so.6
 /lib/libtinfo.so.6
 /lib/libtirpc.so.3
 /lib/libudev.so.1
@@ -42,9 +46,7 @@
 /usr/lib/libexpat.so.1
 /usr/lib/libffi.so.8
 /usr/lib/libform.so.5
-/usr/lib/libform.so.6
 /usr/lib/libformw.so.5
-/usr/lib/libformw.so.6
 /usr/lib/libgdbm.so.4
 /usr/lib/libgdbm.so.6
 /usr/lib/libglib-2.0.so.0
@@ -64,14 +66,10 @@
 /usr/lib/libldap.so.2
 /usr/lib/libltdl.so.7
 /usr/lib/libmenu.so.5
-/usr/lib/libmenu.so.6
 /usr/lib/libmenuw.so.5
-/usr/lib/libmenuw.so.6
 /usr/lib/libmm.so.14
 /usr/lib/libpanel.so.5
-/usr/lib/libpanel.so.6
 /usr/lib/libpanelw.so.5
-/usr/lib/libpanelw.so.6
 /usr/lib/libpng14.so.14
 /usr/lib/libpng16.so.16
 /usr/lib/libpsl.so.5