summaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2020-12-25 21:31:29 +0000
committer Eric Hameleers <alien@slackware.com>2020-12-26 08:59:51 +0100
commit3febc9e648f6e4ea429b1a7e51a02c284f886ae2 (patch)
tree2762e64c5e31f45880268cf9e1c02216240c1a6c /source
parent6ca133bba768c73be2f69616014a53d1389b2633 (diff)
downloadcurrent-3febc9e648f6e4ea429b1a7e51a02c284f886ae2.tar.gz
current-3febc9e648f6e4ea429b1a7e51a02c284f886ae2.tar.xz
Fri Dec 25 21:31:29 UTC 202020201225213129
l/keyutils-1.6.3-x86_64-1.txz: Upgraded. l/pulseaudio-14.0-x86_64-3.txz: Rebuilt. Patched to support detecting elogind at compile time when built with meson. This restores PulseAudio exiting upon user logout. Thanks to LuckyCyborg for the bug report and patch. l/system-config-printer-1.5.13-x86_64-1.txz: Upgraded. n/mobile-broadband-provider-info-20201225-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source')
-rw-r--r--source/l/keyutils/keyutils.url1
-rwxr-xr-xsource/l/pulseaudio/pulseaudio.SlackBuild5
-rw-r--r--source/l/pulseaudio/pulseaudio.elogind.meson.diff52
-rw-r--r--source/l/system-config-printer/slack-desc2
-rwxr-xr-xsource/l/system-config-printer/system-config-printer.SlackBuild2
5 files changed, 59 insertions, 3 deletions
diff --git a/source/l/keyutils/keyutils.url b/source/l/keyutils/keyutils.url
new file mode 100644
index 000000000..7364bdcb9
--- /dev/null
+++ b/source/l/keyutils/keyutils.url
@@ -0,0 +1 @@
+https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/
diff --git a/source/l/pulseaudio/pulseaudio.SlackBuild b/source/l/pulseaudio/pulseaudio.SlackBuild
index 2f6512138..dab661bf6 100755
--- a/source/l/pulseaudio/pulseaudio.SlackBuild
+++ b/source/l/pulseaudio/pulseaudio.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=pulseaudio
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
@@ -93,6 +93,9 @@ echo "X-MATE-Autostart-Phase=Initialization" >> src/daemon/pulseaudio.desktop.in
# If autospawn isn't working, start-pulseaudio-x11 should start it manually:
zcat $CWD/pulseaudio-autostart.patch.gz | patch -p1 --verbose || exit 1
+# Add support for meson to detect elogind:
+zcat $CWD/pulseaudio.elogind.meson.diff.gz | patch -p1 --verbose || exit 1
+
# Configure, build, and install:
export CFLAGS="$SLKCFLAGS"
export CXXFLAGS="$SLKCFLAGS"
diff --git a/source/l/pulseaudio/pulseaudio.elogind.meson.diff b/source/l/pulseaudio/pulseaudio.elogind.meson.diff
new file mode 100644
index 000000000..8538a3683
--- /dev/null
+++ b/source/l/pulseaudio/pulseaudio.elogind.meson.diff
@@ -0,0 +1,52 @@
+diff -urN pulseaudio-14.0.orig/meson.build pulseaudio-14.0/meson.build
+--- pulseaudio-14.0.orig/meson.build 2020-11-23 20:31:13.000000000 +0200
++++ pulseaudio-14.0/meson.build 2020-12-24 22:24:03.166596631 +0200
+@@ -602,6 +602,11 @@
+ systemduserunitdir = systemd_dep.get_pkgconfig_variable('systemduserunitdir')
+ endif
+
++libelogind_dep = dependency('libelogind', required : get_option('elogind'))
++if libelogind_dep.found()
++ cdata.set('HAVE_SYSTEMD_LOGIN', 1)
++endif
++
+ x11_dep = dependency('x11-xcb', required : get_option('x11'))
+ if x11_dep.found()
+ xcb_dep = dependency('xcb', required : true, version : '>= 1.6')
+@@ -829,6 +834,7 @@
+ 'Enable udev: @0@'.format(udev_dep.found()),
+ ' Enable HAL->udev compat: @0@'.format(get_option('hal-compat')),
+ 'Enable systemd: @0@'.format(libsystemd_dep.found()),
++ 'Enable elogind: @0@'.format(libelogind_dep.found()),
+ # 'Enable TCP Wrappers: @0@'.format(${ENABLE_TCPWRAP}),
+ 'Enable libsamplerate: @0@'.format(samplerate_dep.found()),
+ 'Enable IPv6: @0@'.format(get_option('ipv6')),
+diff -urN pulseaudio-14.0.orig/meson_options.txt pulseaudio-14.0/meson_options.txt
+--- pulseaudio-14.0.orig/meson_options.txt 2020-11-11 04:07:46.000000000 +0200
++++ pulseaudio-14.0/meson_options.txt 2020-12-24 22:18:27.921584579 +0200
+@@ -135,6 +135,9 @@
+ option('systemd',
+ type : 'feature', value : 'auto',
+ description : 'Optional systemd support')
++option('elogind',
++ type : 'feature', value : 'auto',
++ description : 'Optional elogind support')
+ option('udev',
+ type : 'feature', value : 'auto',
+ description : 'Optional udev support')
+diff -urN pulseaudio-14.0.orig/src/modules/meson.build pulseaudio-14.0/src/modules/meson.build
+--- pulseaudio-14.0.orig/src/modules/meson.build 2020-11-11 04:07:46.000000000 +0200
++++ pulseaudio-14.0/src/modules/meson.build 2020-12-24 22:20:06.143588110 +0200
+@@ -188,6 +188,12 @@
+ ]
+ endif
+
++if libelogind_dep.found()
++ all_modules += [
++ [ 'module-systemd-login', 'module-systemd-login.c', [], [], [libelogind_dep] ],
++ ]
++endif
++
+ if udev_dep.found()
+ all_modules += [ [ 'module-udev-detect', 'module-udev-detect.c', [], [], [udev_dep] ] ]
+ if get_option('hal-compat')
diff --git a/source/l/system-config-printer/slack-desc b/source/l/system-config-printer/slack-desc
index c1b638a71..52382f377 100644
--- a/source/l/system-config-printer/slack-desc
+++ b/source/l/system-config-printer/slack-desc
@@ -15,5 +15,5 @@ system-config-printer: CUPS API. It is largely the same as using the CUPS web in
system-config-printer: configuring printers, but has the advantage of being a native
system-config-printer: application rather than a web page.
system-config-printer:
-system-config-printer: Home: https://github.com/zdohnal/system-config-printer
+system-config-printer: Homepage: https://github.com/OpenPrinting/system-config-printer
system-config-printer:
diff --git a/source/l/system-config-printer/system-config-printer.SlackBuild b/source/l/system-config-printer/system-config-printer.SlackBuild
index b5f541bb1..4b8b6ef3c 100755
--- a/source/l/system-config-printer/system-config-printer.SlackBuild
+++ b/source/l/system-config-printer/system-config-printer.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=system-config-printer
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-6}
+BUILD=${BUILD:-1}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}