summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
Diffstat (limited to 'source')
-rwxr-xr-xsource/a/aaa_libraries/aaa_libraries.SlackBuild5
-rw-r--r--source/a/aaa_libraries/doinst.sh9
-rw-r--r--source/a/aaa_libraries/tracked-files-tmp.d/boost40
-rw-r--r--source/k/kernel-configs/config-generic-5.19.9 (renamed from source/k/kernel-configs/config-generic-5.19.8)2
-rw-r--r--source/k/kernel-configs/config-generic-5.19.9.x64 (renamed from source/k/kernel-configs/config-generic-5.19.8.x64)2
-rw-r--r--source/k/kernel-configs/config-generic-smp-5.19.9-smp (renamed from source/k/kernel-configs/config-generic-smp-5.19.8-smp)2
-rw-r--r--source/k/kernel-configs/config-huge-5.19.9 (renamed from source/k/kernel-configs/config-huge-5.19.8)2
-rw-r--r--source/k/kernel-configs/config-huge-5.19.9.x64 (renamed from source/k/kernel-configs/config-huge-5.19.8.x64)2
-rw-r--r--source/k/kernel-configs/config-huge-smp-5.19.9-smp (renamed from source/k/kernel-configs/config-huge-smp-5.19.8-smp)2
-rwxr-xr-xsource/l/libpng/libpng.SlackBuild2
10 files changed, 19 insertions, 49 deletions
diff --git a/source/a/aaa_libraries/aaa_libraries.SlackBuild b/source/a/aaa_libraries/aaa_libraries.SlackBuild
index e7e74142..082489cf 100755
--- a/source/a/aaa_libraries/aaa_libraries.SlackBuild
+++ b/source/a/aaa_libraries/aaa_libraries.SlackBuild
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2015, 2018, 2020, 2021 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2015, 2018, 2020, 2021, 2022 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=aaa_libraries
VERSION=${VERSION:-15.1}
-BUILD=${BUILD:-9}
+BUILD=${BUILD:-10}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -144,6 +144,7 @@ find $PKG -type l -exec rm --verbose "{}" \+
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
+zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
cd $PKG
/sbin/makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.txz
diff --git a/source/a/aaa_libraries/doinst.sh b/source/a/aaa_libraries/doinst.sh
new file mode 100644
index 00000000..dab615d4
--- /dev/null
+++ b/source/a/aaa_libraries/doinst.sh
@@ -0,0 +1,9 @@
+# Let's attempt to activate these libraries as they might be needed by various
+# install scripts early on. We used to package symlinks in the normal way, and
+# it's possible that would be fine too, but there must(?) have been a reason
+# that we quit doing that...
+cat var/lib/pkgtools/packages/aaa_libraries* 2> /dev/null | grep -e "^lib" -e "/lib" | grep -v "/$" | while read file ; do
+ if [ -r "$file" ]; then
+ ldconfig -l "$file" 1> /dev/null 2> /dev/null
+ fi
+done
diff --git a/source/a/aaa_libraries/tracked-files-tmp.d/boost b/source/a/aaa_libraries/tracked-files-tmp.d/boost
deleted file mode 100644
index ea339bbd..00000000
--- a/source/a/aaa_libraries/tracked-files-tmp.d/boost
+++ /dev/null
@@ -1,40 +0,0 @@
-# We'll keep these around for a little while... probably remove on 2022-08-11 or thereabouts
-/usr/lib/libboost_atomic.so.1.79.0
-/usr/lib/libboost_chrono.so.1.79.0
-/usr/lib/libboost_container.so.1.79.0
-/usr/lib/libboost_context.so.1.79.0
-/usr/lib/libboost_contract.so.1.79.0
-/usr/lib/libboost_coroutine.so.1.79.0
-/usr/lib/libboost_date_time.so.1.79.0
-/usr/lib/libboost_fiber.so.1.79.0
-/usr/lib/libboost_filesystem.so.1.79.0
-/usr/lib/libboost_graph.so.1.79.0
-/usr/lib/libboost_iostreams.so.1.79.0
-/usr/lib/libboost_json.so.1.79.0
-/usr/lib/libboost_locale.so.1.79.0
-/usr/lib/libboost_log.so.1.79.0
-/usr/lib/libboost_log_setup.so.1.79.0
-/usr/lib/libboost_math_c99.so.1.79.0
-/usr/lib/libboost_math_c99f.so.1.79.0
-/usr/lib/libboost_math_c99l.so.1.79.0
-/usr/lib/libboost_math_tr1.so.1.79.0
-/usr/lib/libboost_math_tr1f.so.1.79.0
-/usr/lib/libboost_math_tr1l.so.1.79.0
-/usr/lib/libboost_nowide.so.1.79.0
-/usr/lib/libboost_prg_exec_monitor.so.1.79.0
-/usr/lib/libboost_program_options.so.1.79.0
-/usr/lib/libboost_python27.so.1.79.0
-/usr/lib/libboost_python39.so.1.79.0
-/usr/lib/libboost_random.so.1.79.0
-/usr/lib/libboost_regex.so.1.79.0
-/usr/lib/libboost_serialization.so.1.79.0
-/usr/lib/libboost_stacktrace_addr2line.so.1.79.0
-/usr/lib/libboost_stacktrace_basic.so.1.79.0
-/usr/lib/libboost_stacktrace_noop.so.1.79.0
-/usr/lib/libboost_system.so.1.79.0
-/usr/lib/libboost_thread.so.1.79.0
-/usr/lib/libboost_timer.so.1.79.0
-/usr/lib/libboost_type_erasure.so.1.79.0
-/usr/lib/libboost_unit_test_framework.so.1.79.0
-/usr/lib/libboost_wave.so.1.79.0
-/usr/lib/libboost_wserialization.so.1.79.0
diff --git a/source/k/kernel-configs/config-generic-5.19.8 b/source/k/kernel-configs/config-generic-5.19.9
index 1c0d3ccd..a82b0e62 100644
--- a/source/k/kernel-configs/config-generic-5.19.8
+++ b/source/k/kernel-configs/config-generic-5.19.9
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.19.8 Kernel Configuration
+# Linux/x86 5.19.9 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0"
CONFIG_CC_IS_GCC=y
diff --git a/source/k/kernel-configs/config-generic-5.19.8.x64 b/source/k/kernel-configs/config-generic-5.19.9.x64
index 0dd413b5..dc3fb14c 100644
--- a/source/k/kernel-configs/config-generic-5.19.8.x64
+++ b/source/k/kernel-configs/config-generic-5.19.9.x64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.19.8 Kernel Configuration
+# Linux/x86 5.19.9 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0"
CONFIG_CC_IS_GCC=y
diff --git a/source/k/kernel-configs/config-generic-smp-5.19.8-smp b/source/k/kernel-configs/config-generic-smp-5.19.9-smp
index 220432de..9e06ad46 100644
--- a/source/k/kernel-configs/config-generic-smp-5.19.8-smp
+++ b/source/k/kernel-configs/config-generic-smp-5.19.9-smp
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.19.8 Kernel Configuration
+# Linux/x86 5.19.9 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0"
CONFIG_CC_IS_GCC=y
diff --git a/source/k/kernel-configs/config-huge-5.19.8 b/source/k/kernel-configs/config-huge-5.19.9
index 013e559d..ffe00b12 100644
--- a/source/k/kernel-configs/config-huge-5.19.8
+++ b/source/k/kernel-configs/config-huge-5.19.9
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.19.8 Kernel Configuration
+# Linux/x86 5.19.9 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0"
CONFIG_CC_IS_GCC=y
diff --git a/source/k/kernel-configs/config-huge-5.19.8.x64 b/source/k/kernel-configs/config-huge-5.19.9.x64
index f198d304..806eb7cc 100644
--- a/source/k/kernel-configs/config-huge-5.19.8.x64
+++ b/source/k/kernel-configs/config-huge-5.19.9.x64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.19.8 Kernel Configuration
+# Linux/x86 5.19.9 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0"
CONFIG_CC_IS_GCC=y
diff --git a/source/k/kernel-configs/config-huge-smp-5.19.8-smp b/source/k/kernel-configs/config-huge-smp-5.19.9-smp
index d470e69a..4c5da7ea 100644
--- a/source/k/kernel-configs/config-huge-smp-5.19.8-smp
+++ b/source/k/kernel-configs/config-huge-smp-5.19.9-smp
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.19.8 Kernel Configuration
+# Linux/x86 5.19.9 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0"
CONFIG_CC_IS_GCC=y
diff --git a/source/l/libpng/libpng.SlackBuild b/source/l/libpng/libpng.SlackBuild
index dc597987..3a73ede3 100755
--- a/source/l/libpng/libpng.SlackBuild
+++ b/source/l/libpng/libpng.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=libpng
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then