summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
Diffstat (limited to 'source')
-rwxr-xr-xsource/a/aaa_libraries/aaa_libraries.SlackBuild2
-rw-r--r--source/a/aaa_libraries/symlinks-to-tracked-libs1
-rwxr-xr-xsource/d/doxygen/doxygen.SlackBuild17
-rw-r--r--source/k/kernel-configs/config-generic-5.15.13 (renamed from source/k/kernel-configs/config-generic-5.15.12)2
-rw-r--r--source/k/kernel-configs/config-generic-5.15.13.x64 (renamed from source/k/kernel-configs/config-generic-5.15.12.x64)2
-rw-r--r--source/k/kernel-configs/config-generic-smp-5.15.13-smp (renamed from source/k/kernel-configs/config-generic-smp-5.15.12-smp)2
-rw-r--r--source/k/kernel-configs/config-huge-5.15.13 (renamed from source/k/kernel-configs/config-huge-5.15.12)2
-rw-r--r--source/k/kernel-configs/config-huge-5.15.13.x64 (renamed from source/k/kernel-configs/config-huge-5.15.12.x64)2
-rw-r--r--source/k/kernel-configs/config-huge-smp-5.15.13-smp (renamed from source/k/kernel-configs/config-huge-smp-5.15.12-smp)2
-rw-r--r--source/l/pipewire/doinst.sh4
-rw-r--r--source/l/pipewire/pipewire-disable.sh6
-rw-r--r--source/l/pipewire/pipewire-pulse.desktop.sample1
-rwxr-xr-xsource/l/pipewire/pipewire.SlackBuild3
13 files changed, 28 insertions, 18 deletions
diff --git a/source/a/aaa_libraries/aaa_libraries.SlackBuild b/source/a/aaa_libraries/aaa_libraries.SlackBuild
index 1ce486cb..b23dad63 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.0}
-BUILD=${BUILD:-11}
+BUILD=${BUILD:-12}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
diff --git a/source/a/aaa_libraries/symlinks-to-tracked-libs b/source/a/aaa_libraries/symlinks-to-tracked-libs
index 58272c5f..44634974 100644
--- a/source/a/aaa_libraries/symlinks-to-tracked-libs
+++ b/source/a/aaa_libraries/symlinks-to-tracked-libs
@@ -87,6 +87,7 @@
/usr/lib/libtdb.so.1
/usr/lib/libtiffxx.so.5
/usr/lib/libtiff.so.5
+/usr/lib/libunwind.so.8
/usr/lib/libusb-0.1.so.4
/usr/lib/libusb-1.0.so.0
/usr/lib/libvga.so.1
diff --git a/source/d/doxygen/doxygen.SlackBuild b/source/d/doxygen/doxygen.SlackBuild
index f0b364b6..a1108753 100755
--- a/source/d/doxygen/doxygen.SlackBuild
+++ b/source/d/doxygen/doxygen.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2008, 2009, 2010, 2018, 2021 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2018, 2021, 2022 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=doxygen
VERSION=${VERSION:-$(basename $(echo doxygen-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) .src)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
@@ -87,7 +87,7 @@ cd build
-DDOC_INSTALL_DIR:STRING="/doc/doxygen-$VERSION" \
-DBUILD_SHARED_LIBS=OFF \
-Dbuild_app=ON \
- -Dbuild_doc=OFF \
+ -Dbuild_doc=ON \
-Dbuild_parse=ON \
-Dbuild_search=ON \
-Dbuild_wizard=ON \
@@ -95,17 +95,18 @@ cd build
-Duse_sqlite3=ON \
-G "Unix Makefiles" .. || exit 1
make $NUMJOBS || make || exit 1
+ make $NUMJOBS docs || make docs || exit 1
make install DESTDIR=$PKG || 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
-# Install manpages:
-mkdir -p $PKG/usr/man/man1
-cp -a doc/*.1 $PKG/usr/man/man1
-chown root:root $PKG/usr/man/man1/*
-chmod 644 $PKG/usr/man/man1/*
+# Fix manpages location:
+if [ -d $PKG/usr/share/man ]; then
+ mv $PKG/usr/share/man $PKG/usr
+ rmdir $PKG/usr/share
+fi
# Compress and if needed symlink the man pages:
if [ -d $PKG/usr/man ]; then
diff --git a/source/k/kernel-configs/config-generic-5.15.12 b/source/k/kernel-configs/config-generic-5.15.13
index f9a18c82..5d9351b8 100644
--- a/source/k/kernel-configs/config-generic-5.15.12
+++ b/source/k/kernel-configs/config-generic-5.15.13
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.15.12 Kernel Configuration
+# Linux/x86 5.15.13 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0"
CONFIG_CC_IS_GCC=y
diff --git a/source/k/kernel-configs/config-generic-5.15.12.x64 b/source/k/kernel-configs/config-generic-5.15.13.x64
index 29ad7773..939b7f83 100644
--- a/source/k/kernel-configs/config-generic-5.15.12.x64
+++ b/source/k/kernel-configs/config-generic-5.15.13.x64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.15.12 Kernel Configuration
+# Linux/x86 5.15.13 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0"
CONFIG_CC_IS_GCC=y
diff --git a/source/k/kernel-configs/config-generic-smp-5.15.12-smp b/source/k/kernel-configs/config-generic-smp-5.15.13-smp
index fd6ce0b9..34de843b 100644
--- a/source/k/kernel-configs/config-generic-smp-5.15.12-smp
+++ b/source/k/kernel-configs/config-generic-smp-5.15.13-smp
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.15.12 Kernel Configuration
+# Linux/x86 5.15.13 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0"
CONFIG_CC_IS_GCC=y
diff --git a/source/k/kernel-configs/config-huge-5.15.12 b/source/k/kernel-configs/config-huge-5.15.13
index 8de653f9..62d96eb0 100644
--- a/source/k/kernel-configs/config-huge-5.15.12
+++ b/source/k/kernel-configs/config-huge-5.15.13
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.15.12 Kernel Configuration
+# Linux/x86 5.15.13 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0"
CONFIG_CC_IS_GCC=y
diff --git a/source/k/kernel-configs/config-huge-5.15.12.x64 b/source/k/kernel-configs/config-huge-5.15.13.x64
index 623dd40b..043a627e 100644
--- a/source/k/kernel-configs/config-huge-5.15.12.x64
+++ b/source/k/kernel-configs/config-huge-5.15.13.x64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.15.12 Kernel Configuration
+# Linux/x86 5.15.13 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0"
CONFIG_CC_IS_GCC=y
diff --git a/source/k/kernel-configs/config-huge-smp-5.15.12-smp b/source/k/kernel-configs/config-huge-smp-5.15.13-smp
index a0605c12..dd288ab0 100644
--- a/source/k/kernel-configs/config-huge-smp-5.15.12-smp
+++ b/source/k/kernel-configs/config-huge-smp-5.15.13-smp
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.15.12 Kernel Configuration
+# Linux/x86 5.15.13 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0"
CONFIG_CC_IS_GCC=y
diff --git a/source/l/pipewire/doinst.sh b/source/l/pipewire/doinst.sh
new file mode 100644
index 00000000..46eff437
--- /dev/null
+++ b/source/l/pipewire/doinst.sh
@@ -0,0 +1,4 @@
+# Toss redundant sample files:
+for file in pipewire.desktop pipewire-media-session.desktop pipewire-pulse.desktop ; do
+ cmp etc/xdg/autostart/${file} etc/xdg/autostart/${file}.sample 2> /dev/null && rm etc/xdg/autostart/${file}.sample
+done
diff --git a/source/l/pipewire/pipewire-disable.sh b/source/l/pipewire/pipewire-disable.sh
index 8761d261..e69cf690 100644
--- a/source/l/pipewire/pipewire-disable.sh
+++ b/source/l/pipewire/pipewire-disable.sh
@@ -22,9 +22,11 @@
# This script will attempt to disable pipewire as the default audio server,
# changing it back to pulseaudio.
-# Rename the XDG autostart files:
+# Remove or rename the XDG autostart files:
for file in /etc/xdg/autostart/pipewire-media-session.desktop /etc/xdg/autostart/pipewire-pulse.desktop /etc/xdg/autostart/pipewire.desktop ; do
- if [ -r $file ]; then
+ if [ -r ${file}.sample ]; then
+ rm -f $file
+ elif [ -r $file ]; then
mv ${file} ${file}.sample
fi
done
diff --git a/source/l/pipewire/pipewire-pulse.desktop.sample b/source/l/pipewire/pipewire-pulse.desktop.sample
index ff34dcbc..6c1f61ca 100644
--- a/source/l/pipewire/pipewire-pulse.desktop.sample
+++ b/source/l/pipewire/pipewire-pulse.desktop.sample
@@ -6,3 +6,4 @@ Exec=/usr/bin/daemon -frB --pidfiles=~/.run --name=pipewire-pulse /usr/bin/pipew
Terminal=false
Type=Application
X-GNOME-Autostart-Phase=Initialization
+X-KDE-autostart-phase=1
diff --git a/source/l/pipewire/pipewire.SlackBuild b/source/l/pipewire/pipewire.SlackBuild
index 71e68602..7225da96 100755
--- a/source/l/pipewire/pipewire.SlackBuild
+++ b/source/l/pipewire/pipewire.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=pipewire
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -151,6 +151,7 @@ if [ -r NEWS ]; then
fi
mkdir -p $PKG/install
+zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
cat $CWD/slack-desc > $PKG/install/slack-desc
cd $PKG