summaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2022-01-04 22:51:41 +0000
committer Eric Hameleers <alien@slackware.com>2022-01-05 08:59:56 +0100
commit8081d50c9c9ed481c230dc45bcb3483b2cbc2e39 (patch)
tree5d81467b1f5897af2e16d3515f2f2771db34e9f7 /source
parent776cc36f81c77479609546ff8ed87b56ec71a279 (diff)
downloadcurrent-8081d50c9c9ed481c230dc45bcb3483b2cbc2e39.tar.gz
current-8081d50c9c9ed481c230dc45bcb3483b2cbc2e39.tar.xz
Tue Jan 4 22:51:41 UTC 202220220104225141
a/bash-5.1.016-x86_64-1.txz: Upgraded. a/haveged-1.9.16-x86_64-1.txz: Upgraded. a/hwdata-0.355-noarch-1.txz: Upgraded. ap/gphoto2-2.5.28-x86_64-1.txz: Upgraded. kde/bluedevil-5.23.5-x86_64-1.txz: Upgraded. kde/breeze-5.23.5-x86_64-1.txz: Upgraded. kde/breeze-grub-5.23.5-x86_64-1.txz: Upgraded. kde/breeze-gtk-5.23.5-x86_64-1.txz: Upgraded. kde/drkonqi-5.23.5-x86_64-1.txz: Upgraded. kde/kactivitymanagerd-5.23.5-x86_64-1.txz: Upgraded. kde/kde-cli-tools-5.23.5-x86_64-1.txz: Upgraded. kde/kde-gtk-config-5.23.5-x86_64-1.txz: Upgraded. kde/kdecoration-5.23.5-x86_64-1.txz: Upgraded. kde/kdeplasma-addons-5.23.5-x86_64-1.txz: Upgraded. kde/kgamma5-5.23.5-x86_64-1.txz: Upgraded. kde/khotkeys-5.23.5-x86_64-1.txz: Upgraded. kde/kinfocenter-5.23.5-x86_64-1.txz: Upgraded. kde/kmenuedit-5.23.5-x86_64-1.txz: Upgraded. kde/konsole-21.12.0-x86_64-2.txz: Rebuilt. Applied upstream patch: [PATCH] Use tighter matching when finding the default profile file name. Thanks to alienBOB. kde/kscreen-5.23.5-x86_64-1.txz: Upgraded. kde/kscreenlocker-5.23.5-x86_64-1.txz: Upgraded. kde/ksshaskpass-5.23.5-x86_64-1.txz: Upgraded. kde/ksystemstats-5.23.5-x86_64-1.txz: Upgraded. kde/kwallet-pam-5.23.5-x86_64-1.txz: Upgraded. kde/kwayland-integration-5.23.5-x86_64-1.txz: Upgraded. kde/kwayland-server-5.23.5-x86_64-1.txz: Upgraded. kde/kwin-5.23.5-x86_64-1.txz: Upgraded. kde/kwrited-5.23.5-x86_64-1.txz: Upgraded. kde/layer-shell-qt-5.23.5-x86_64-1.txz: Upgraded. kde/libkscreen-5.23.5-x86_64-1.txz: Upgraded. kde/libksysguard-5.23.5-x86_64-1.txz: Upgraded. kde/milou-5.23.5-x86_64-1.txz: Upgraded. kde/oxygen-5.23.5-x86_64-1.txz: Upgraded. kde/plasma-browser-integration-5.23.5-x86_64-1.txz: Upgraded. kde/plasma-desktop-5.23.5-x86_64-1.txz: Upgraded. kde/plasma-disks-5.23.5-x86_64-1.txz: Upgraded. kde/plasma-firewall-5.23.5-x86_64-1.txz: Upgraded. kde/plasma-integration-5.23.5-x86_64-1.txz: Upgraded. kde/plasma-nm-5.23.5-x86_64-1.txz: Upgraded. kde/plasma-pa-5.23.5-x86_64-1.txz: Upgraded. kde/plasma-sdk-5.23.5-x86_64-1.txz: Upgraded. kde/plasma-systemmonitor-5.23.5-x86_64-1.txz: Upgraded. kde/plasma-vault-5.23.5-x86_64-1.txz: Upgraded. kde/plasma-workspace-5.23.5-x86_64-1.txz: Upgraded. kde/plasma-workspace-wallpapers-5.23.5-x86_64-1.txz: Upgraded. kde/polkit-kde-agent-1-5.23.5-x86_64-1.txz: Upgraded. kde/powerdevil-5.23.5-x86_64-1.txz: Upgraded. kde/qqc2-breeze-style-5.23.5-x86_64-1.txz: Upgraded. kde/sddm-kcm-5.23.5-x86_64-1.txz: Upgraded. kde/systemsettings-5.23.5-x86_64-1.txz: Upgraded. kde/xdg-desktop-portal-kde-5.23.5-x86_64-1.txz: Upgraded. l/imagemagick-7.1.0_19-x86_64-2.txz: Rebuilt. It seems that even with --enable-opencl, ImageMagick has disabled OpenCL support by default unless the environment variable MAGICK_OCL_DEVICE=true is set, so there should be no harm enabling this feature again. Thanks to denydias. l/iso-codes-4.9.0-noarch-1.txz: Upgraded. l/libgphoto2-2.5.28-x86_64-1.txz: Upgraded. l/pipewire-0.3.42-x86_64-2.txz: Rebuilt. Added sample startup files in /etc/xdg/autostart. Thanks to stormtracknole. Added scripts (pipewire-enable.sh, pipewire-disable.sh) to setup pipewire as the default multimedia server, or to disable it and return to pulseaudio as the default. Thanks to stormtracknole and LuckyCyborg for many useful tips. l/pulseaudio-15.0-x86_64-4.txz: Rebuilt. Install pulseaudio.desktop as a .new file so that future package updates won't overwrite custom content. n/whois-5.5.11-x86_64-1.txz: Upgraded. n/yptools-4.2.3-x86_64-5.txz: Rebuilt. Fixed ypcat installation. Thanks to Stuart Winter. x/libdrm-2.4.109-x86_64-1.txz: Upgraded. x/xdg-desktop-portal-1.12.1-x86_64-1.txz: Upgraded. x/xf86-video-vmware-13.3.0-x86_64-6.txz: Rebuilt. Patched to build against libdrm-2.4.109. Thanks to gmgf.
Diffstat (limited to 'source')
-rw-r--r--source/a/bash/bash-5.1-patches/bash51-01343
-rw-r--r--source/a/bash/bash-5.1-patches/bash51-01448
-rw-r--r--source/a/bash/bash-5.1-patches/bash51-01549
-rw-r--r--source/a/bash/bash-5.1-patches/bash51-01664
-rw-r--r--source/kde/kde/build/konsole2
-rw-r--r--source/kde/kde/build/kscreen2
-rw-r--r--source/kde/kde/build/libkscreen2
-rw-r--r--source/kde/kde/build/plasma-nm2
-rw-r--r--source/kde/kde/patch/konsole.patch1
-rw-r--r--source/kde/kde/patch/konsole/eb44240235fa61e662e9a521f72e8be9213bb536.patch38
-rwxr-xr-xsource/l/imagemagick/imagemagick.SlackBuild4
-rwxr-xr-xsource/l/iso-codes/iso-codes.SlackBuild10
-rw-r--r--source/l/pipewire/pipewire-disable.sh54
-rw-r--r--source/l/pipewire/pipewire-enable.sh48
-rw-r--r--source/l/pipewire/pipewire-media-session.desktop.sample9
-rw-r--r--source/l/pipewire/pipewire-pulse.desktop.sample8
-rwxr-xr-xsource/l/pipewire/pipewire.SlackBuild25
-rw-r--r--source/l/pipewire/pipewire.desktop.sample9
-rw-r--r--source/l/pulseaudio/doinst.sh1
-rwxr-xr-xsource/l/pulseaudio/pulseaudio.SlackBuild3
-rwxr-xr-xsource/n/network-scripts/network-scripts.SlackBuild6
-rwxr-xr-xsource/n/yptools/yptools.SlackBuild4
-rw-r--r--source/x/x11/build/xf86-video-vmware2
-rw-r--r--source/x/x11/patch/xf86-video-vmware.patch2
-rw-r--r--source/x/x11/patch/xf86-video-vmware/50ab008cb965dc9e47e0a84a1950e2485bbd3c44.patch60
25 files changed, 476 insertions, 20 deletions
diff --git a/source/a/bash/bash-5.1-patches/bash51-013 b/source/a/bash/bash-5.1-patches/bash51-013
new file mode 100644
index 000000000..f2413a58d
--- /dev/null
+++ b/source/a/bash/bash-5.1-patches/bash51-013
@@ -0,0 +1,43 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 5.1
+Patch-ID: bash51-013
+
+Bug-Reported-by: Anders Kaseorg <andersk@mit.edu>
+Bug-Reference-ID: <de65540274064d7b95f17e9c46a3a6d8@oc11expo7.exchange.mit.edu>
+Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2021-11/msg00025.html
+
+Bug-Description:
+
+Bash did not always perform tilde expansion following an unquoted colon on
+the rhs of an assignment statement in posix mode.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-20211028/subst.c 2021-10-18 16:09:58.000000000 -0400
+--- subst.c 2021-11-30 11:19:47.000000000 -0500
+***************
+*** 3826,3829 ****
+--- 3826,3830 ----
+ td.flags = W_ASSIGNRHS;
+ #endif
++ td.flags |= (W_NOGLOB|W_TILDEEXP);
+ td.word = savestring (string);
+ value = call_expand_word_internal (&td, quoted, 0, (int *)NULL, (int *)NULL);
+
+*** ../bash-5.1/patchlevel.h 2020-06-22 14:51:03.000000000 -0400
+--- patchlevel.h 2020-10-01 11:01:28.000000000 -0400
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 12
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 13
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/source/a/bash/bash-5.1-patches/bash51-014 b/source/a/bash/bash-5.1-patches/bash51-014
new file mode 100644
index 000000000..cd8df23ab
--- /dev/null
+++ b/source/a/bash/bash-5.1-patches/bash51-014
@@ -0,0 +1,48 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 5.1
+Patch-ID: bash51-014
+
+Bug-Reported-by: platon7pronko@gmail.com
+Bug-Reference-ID:
+Bug-Reference-URL: https://savannah.gnu.org/patch/?10035
+
+Bug-Description:
+
+Bash may produce corrupted input if a multibyte character spans a 512-byte
+boundary while reading the output of a command substitution.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-20210217/subst.c 2021-02-03 10:32:08.000000000 -0500
+--- subst.c 2021-03-01 16:47:52.000000000 -0500
+***************
+*** 6243,6247 ****
+ /* punt on the hard case for now */
+ memset (&ps, '\0', sizeof (mbstate_t));
+! mblen = mbrtowc (&wc, bufp-1, bufn+1, &ps);
+ if (MB_INVALIDCH (mblen) || mblen == 0 || mblen == 1)
+ istring[istring_index++] = c;
+--- 6243,6247 ----
+ /* punt on the hard case for now */
+ memset (&ps, '\0', sizeof (mbstate_t));
+! mblen = mbrtowc (&wc, bufp-1, bufn, &ps);
+ if (MB_INVALIDCH (mblen) || mblen == 0 || mblen == 1)
+ istring[istring_index++] = c;
+
+*** ../bash-5.1/patchlevel.h 2020-06-22 14:51:03.000000000 -0400
+--- patchlevel.h 2020-10-01 11:01:28.000000000 -0400
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 13
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 14
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/source/a/bash/bash-5.1-patches/bash51-015 b/source/a/bash/bash-5.1-patches/bash51-015
new file mode 100644
index 000000000..5ae65811a
--- /dev/null
+++ b/source/a/bash/bash-5.1-patches/bash51-015
@@ -0,0 +1,49 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 5.1
+Patch-ID: bash51-015
+
+Bug-Reported-by: Volodymyr Prodan <vovcat@gmail.com>
+Bug-Reference-ID:
+Bug-Reference-URL: https://savannah.gnu.org/patch/?10076
+
+Bug-Description:
+
+Patch (apply with `patch -p0'):
+
+There are some characters (e.g., cyrillic) that can't be displayed using
+certain single-byte encodings (e.g., cp1251) because the negative signed
+int is interpreted as EOF and not displayed.
+
+*** ../bash-20210524/lib/readline/display.c 2021-03-16 18:12:20.000000000 -0400
+--- lib/readline/display.c 2021-06-07 16:53:08.000000000 -0400
+***************
+*** 1599,1603 ****
+
+ for (cur_face = FACE_NORMAL, i = 0; i < n; i++)
+! putc_face (str[i], face[i], &cur_face);
+ putc_face (EOF, FACE_NORMAL, &cur_face);
+ }
+--- 1599,1603 ----
+
+ for (cur_face = FACE_NORMAL, i = 0; i < n; i++)
+! putc_face ((unsigned char) str[i], face[i], &cur_face);
+ putc_face (EOF, FACE_NORMAL, &cur_face);
+ }
+
+*** ../bash-5.1/patchlevel.h 2020-06-22 14:51:03.000000000 -0400
+--- patchlevel.h 2020-10-01 11:01:28.000000000 -0400
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 14
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 15
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/source/a/bash/bash-5.1-patches/bash51-016 b/source/a/bash/bash-5.1-patches/bash51-016
new file mode 100644
index 000000000..4694498b2
--- /dev/null
+++ b/source/a/bash/bash-5.1-patches/bash51-016
@@ -0,0 +1,64 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 5.1
+Patch-ID: bash51-016
+
+Bug-Reported-by: Vincent Menegaux <vincent.menegaux@gmail.com>
+Bug-Reference-ID:
+Bug-Reference-URL: https://savannah.gnu.org/patch/?10070
+
+Bug-Description:
+
+Multiple `!' tokens should toggle negation of an expression in a [[
+conditional command, instead of simply negating the expression.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-20210515/parse.y 2021-04-21 15:32:50.000000000 -0400
+--- parse.y 2021-05-24 11:53:30.000000000 -0400
+***************
+*** 4797,4801 ****
+ term = cond_term ();
+ if (term)
+! term->flags |= CMD_INVERT_RETURN;
+ }
+ else if (tok == WORD && yylval.word->word[0] == '-' && yylval.word->word[1] && yylval.word->word[2] == 0 && test_unop (yylval.word->word))
+--- 4797,4801 ----
+ term = cond_term ();
+ if (term)
+! term->flags ^= CMD_INVERT_RETURN;
+ }
+ else if (tok == WORD && yylval.word->word[0] == '-' && yylval.word->word[1] && yylval.word->word[2] == 0 && test_unop (yylval.word->word))
+
+*** ../bash-20210515/y.tab.c 2021-05-14 15:50:41.000000000 -0400
+--- y.tab.c 2021-05-24 16:35:55.000000000 -0400
+***************
+*** 7091,7095 ****
+ term = cond_term ();
+ if (term)
+! term->flags |= CMD_INVERT_RETURN;
+ }
+ else if (tok == WORD && yylval.word->word[0] == '-' && yylval.word->word[1] && yylval.word->word[2] == 0 && test_unop (yylval.word->word))
+--- 7091,7095 ----
+ term = cond_term ();
+ if (term)
+! term->flags ^= CMD_INVERT_RETURN;
+ }
+ else if (tok == WORD && yylval.word->word[0] == '-' && yylval.word->word[1] && yylval.word->word[2] == 0 && test_unop (yylval.word->word))
+
+*** ../bash-5.1/patchlevel.h 2020-06-22 14:51:03.000000000 -0400
+--- patchlevel.h 2020-10-01 11:01:28.000000000 -0400
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 15
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 16
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/source/kde/kde/build/konsole b/source/kde/kde/build/konsole
index d00491fd7..0cfbf0888 100644
--- a/source/kde/kde/build/konsole
+++ b/source/kde/kde/build/konsole
@@ -1 +1 @@
-1
+2
diff --git a/source/kde/kde/build/kscreen b/source/kde/kde/build/kscreen
index 0cfbf0888..d00491fd7 100644
--- a/source/kde/kde/build/kscreen
+++ b/source/kde/kde/build/kscreen
@@ -1 +1 @@
-2
+1
diff --git a/source/kde/kde/build/libkscreen b/source/kde/kde/build/libkscreen
index 0cfbf0888..d00491fd7 100644
--- a/source/kde/kde/build/libkscreen
+++ b/source/kde/kde/build/libkscreen
@@ -1 +1 @@
-2
+1
diff --git a/source/kde/kde/build/plasma-nm b/source/kde/kde/build/plasma-nm
index 0cfbf0888..d00491fd7 100644
--- a/source/kde/kde/build/plasma-nm
+++ b/source/kde/kde/build/plasma-nm
@@ -1 +1 @@
-2
+1
diff --git a/source/kde/kde/patch/konsole.patch b/source/kde/kde/patch/konsole.patch
new file mode 100644
index 000000000..99f44a3dd
--- /dev/null
+++ b/source/kde/kde/patch/konsole.patch
@@ -0,0 +1 @@
+cat $CWD/patch/konsole/eb44240235fa61e662e9a521f72e8be9213bb536.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/kde/kde/patch/konsole/eb44240235fa61e662e9a521f72e8be9213bb536.patch b/source/kde/kde/patch/konsole/eb44240235fa61e662e9a521f72e8be9213bb536.patch
new file mode 100644
index 000000000..b34efb01f
--- /dev/null
+++ b/source/kde/kde/patch/konsole/eb44240235fa61e662e9a521f72e8be9213bb536.patch
@@ -0,0 +1,38 @@
+From eb44240235fa61e662e9a521f72e8be9213bb536 Mon Sep 17 00:00:00 2001
+From: Ahmad Samir <a.samirh78@gmail.com>
+Date: Mon, 3 Jan 2022 14:19:22 +0200
+Subject: [PATCH] Use tighter matching when finding the default profile file
+ name
+
+The code was checking if the path ended with a specific file name, which
+meant that if you have two profiles "Root Shell.profile" and
+"Shell.profile", the matching is messed up because the former ends with
+the latter. Instead since we're using the path, add a '/', this way we're
+matching the whole file name which is the last component in the path after
+the last '/'.
+
+Thanks to the bug reporter for git bisect'ing the repo to find the culprit
+commit.
+
+BUG: 447872
+FIXED_IN: 21.12.0
+---
+ src/profile/ProfileManager.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/profile/ProfileManager.cpp b/src/profile/ProfileManager.cpp
+index b19847074..18bc1dda8 100644
+--- a/src/profile/ProfileManager.cpp
++++ b/src/profile/ProfileManager.cpp
+@@ -206,7 +206,7 @@ void ProfileManager::loadAllProfiles(const QString &defaultProfileFileName)
+ const QStringList &paths = availableProfilePaths();
+ for (const QString &path : paths) {
+ Profile::Ptr profile = loadProfile(path);
+- if (profile && !defaultProfileFileName.isEmpty() && path.endsWith(defaultProfileFileName)) {
++ if (profile && !defaultProfileFileName.isEmpty() && path.endsWith(QLatin1Char('/') + defaultProfileFileName)) {
+ _defaultProfile = profile;
+ }
+ }
+--
+GitLab
+
diff --git a/source/l/imagemagick/imagemagick.SlackBuild b/source/l/imagemagick/imagemagick.SlackBuild
index ac150648e..06435d528 100755
--- a/source/l/imagemagick/imagemagick.SlackBuild
+++ b/source/l/imagemagick/imagemagick.SlackBuild
@@ -23,7 +23,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=imagemagick
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
# NOTE: This is to cope with ImageMagick version numbers such as 5.4.7-4,
# which occur fairly often (but not always). If these numbers are all the same,
@@ -114,7 +114,7 @@ CXXFLAGS="$SLKCFLAGS" \
--with-x \
--with-frozenpaths=no \
--with-modules \
- --disable-opencl \
+ --enable-opencl \
--enable-hdri \
--enable-static=no \
--enable-shared \
diff --git a/source/l/iso-codes/iso-codes.SlackBuild b/source/l/iso-codes/iso-codes.SlackBuild
index 31e7aab06..31e40ba0d 100755
--- a/source/l/iso-codes/iso-codes.SlackBuild
+++ b/source/l/iso-codes/iso-codes.SlackBuild
@@ -1,7 +1,7 @@
#!/bin/bash
# Copyright 2008, 2013 Heinz Wiesinger, Amsterdam, The Netherlands
-# Copyright 2008, 2009, 2011, 2015, 2018 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2011, 2015, 2018, 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=iso-codes
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev | tr -d v)}
ARCH=${ARCH:-noarch}
BUILD=${BUILD:-1}
@@ -43,9 +43,9 @@ NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
rm -rf $PKG
mkdir -p $TMP $PKG
cd $TMP
-rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1
-cd $PKGNAM-$VERSION || exit 1
+rm -rf $PKGNAM-v${VERSION}
+tar xvf $CWD/$PKGNAM-v${VERSION}.tar.?z || exit 1
+cd $PKGNAM-v${VERSION} || exit 1
chown -R root:root .
find . \
\( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
diff --git a/source/l/pipewire/pipewire-disable.sh b/source/l/pipewire/pipewire-disable.sh
new file mode 100644
index 000000000..8761d2619
--- /dev/null
+++ b/source/l/pipewire/pipewire-disable.sh
@@ -0,0 +1,54 @@
+#!/bin/bash
+# Copyright 2022 Patrick J. Volkerding, Sebeka, Minnesota, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# This script will attempt to disable pipewire as the default audio server,
+# changing it back to pulseaudio.
+
+# 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
+ mv ${file} ${file}.sample
+ fi
+done
+
+# Enable pulseaudio.desktop:
+if grep -q "^Hidden=true$" /etc/xdg/autostart/pulseaudio.desktop ; then
+ grep -v "^Hidden=true$" /etc/xdg/autostart/pulseaudio.desktop > /etc/xdg/autostart/pulseaudio.desktop.new
+ mv /etc/xdg/autostart/pulseaudio.desktop.new /etc/xdg/autostart/pulseaudio.desktop
+fi
+
+# Edit /etc/pulse/client.conf to enable autospawn:
+sed -i "s/autospawn = no/autospawn = yes/g" /etc/pulse/client.conf
+sed -i "s/allow-autospawn-for-root = no/allow-autospawn-for-root = yes/g" /etc/pulse/client.conf
+
+echo "Pulseaudio enabled as system audio server."
+if ps ax | grep -q pipewire ; then
+ echo
+ echo "You may need to stop running daemon/pipewire processes."
+ echo "The clean way is to run these commands as the user that owns the processes:"
+ echo "/usr/bin/daemon --pidfiles=~/.run --name=pipewire --stop"
+ echo "/usr/bin/daemon --pidfiles=~/.run --name=pipewire-media-session --stop"
+ echo "/usr/bin/daemon --pidfiles=~/.run --name=pipewire-pulse --stop"
+ echo
+ echo "The quick and dirty way if nothing else on the machine is using the daemon"
+ echo "utility is to issue this command:"
+ echo "killall daemon"
+fi
diff --git a/source/l/pipewire/pipewire-enable.sh b/source/l/pipewire/pipewire-enable.sh
new file mode 100644
index 000000000..a6a21dd7c
--- /dev/null
+++ b/source/l/pipewire/pipewire-enable.sh
@@ -0,0 +1,48 @@
+#!/bin/bash
+# Copyright 2022 Patrick J. Volkerding, Sebeka, Minnesota, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# This script will attempt to enable pipewire as the default audio server.
+
+# Disable this, as it is almost certainly left over from when pipewire
+# used to store its config file in this location:
+if [ -f /etc/pipewire/pipewire.conf ]; then
+ for file in /etc/pipewire/*.conf ; do
+ mv ${file} ${file}.obsolete
+ done
+fi
+
+# Rename the XDG autostart files:
+for file in /etc/xdg/autostart/pipewire-media-session.desktop.sample /etc/xdg/autostart/pipewire-pulse.desktop.sample /etc/xdg/autostart/pipewire.desktop.sample ; do
+ if [ -r $file ]; then
+ mv $file /etc/xdg/autostart/$(basename $file .sample)
+ fi
+done
+
+# Disable pulseaudio.desktop:
+if ! grep -q "^Hidden=true$" /etc/xdg/autostart/pulseaudio.desktop ; then
+ echo "Hidden=true" >> /etc/xdg/autostart/pulseaudio.desktop
+fi
+
+# Edit /etc/pulse/client.conf to disable autospawn:
+sed -i "s/autospawn = yes/autospawn = no/g" /etc/pulse/client.conf
+sed -i "s/allow-autospawn-for-root = yes/allow-autospawn-for-root = no/g" /etc/pulse/client.conf
+
+echo "PipeWire enabled as system multimedia server."
diff --git a/source/l/pipewire/pipewire-media-session.desktop.sample b/source/l/pipewire/pipewire-media-session.desktop.sample
new file mode 100644
index 000000000..f9eb47582
--- /dev/null
+++ b/source/l/pipewire/pipewire-media-session.desktop.sample
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Version=1.0
+Name=PipeWire Media Session
+Comment=Start the PipeWire Media Session
+Exec=/usr/bin/daemon -frB --pidfiles=~/.run --name=pipewire-media-session /usr/bin/pipewire-media-session
+Terminal=false
+Type=Application
+X-GNOME-Autostart-Phase=Initialization
+X-KDE-autostart-phase=1
diff --git a/source/l/pipewire/pipewire-pulse.desktop.sample b/source/l/pipewire/pipewire-pulse.desktop.sample
new file mode 100644
index 000000000..ff34dcbc8
--- /dev/null
+++ b/source/l/pipewire/pipewire-pulse.desktop.sample
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Version=1.0
+Name=PipeWire Pulse
+Comment=Start the PipeWire Pulse
+Exec=/usr/bin/daemon -frB --pidfiles=~/.run --name=pipewire-pulse /usr/bin/pipewire-pulse
+Terminal=false
+Type=Application
+X-GNOME-Autostart-Phase=Initialization
diff --git a/source/l/pipewire/pipewire.SlackBuild b/source/l/pipewire/pipewire.SlackBuild
index 86a6da0a0..71e686028 100755
--- a/source/l/pipewire/pipewire.SlackBuild
+++ b/source/l/pipewire/pipewire.SlackBuild
@@ -1,7 +1,7 @@
#!/bin/bash
# Copyright 2020 Eric Hameleers, Eindhoven, NL
-# Copyright 2020, 2021 Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2020, 2021, 2022 Patrick J. Volkerding, Sebeka, Minnesota, 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=pipewire
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -113,6 +113,19 @@ cd ..
# Create system config file override directory:
mkdir -p $PKG/etc/pipewire
+# Add sample configuation files:
+mkdir -p $PKG/etc/xdg/autostart
+cp -a $CWD/pipewire.desktop.sample $PKG/etc/xdg/autostart
+cp -a $CWD/pipewire-media-session.desktop.sample $PKG/etc/xdg/autostart
+cp -a $CWD/pipewire-pulse.desktop.sample $PKG/etc/xdg/autostart
+chown root:root $PKG/etc/xdg/autostart/*
+chmod 644 $PKG/etc/xdg/autostart/*
+mkdir -p $PKG/usr/sbin
+cp -a $CWD/pipewire-disable.sh $PKG/usr/sbin
+cp -a $CWD/pipewire-enable.sh $PKG/usr/sbin
+chown root:root $PKG/usr/sbin/pipewire-disable.sh $PKG/usr/sbin/pipewire-enable.sh
+chmod 755 $PKG/usr/sbin/pipewire-disable.sh $PKG/usr/sbin/pipewire-enable.sh
+
# Strip binaries:
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
@@ -129,6 +142,14 @@ cp -a \
CODE_OF_CONDUCT* COPYING* INSTALL* LICENSE* NEWS* PROTOCOL* README* \
$PKG/usr/doc/${PKGNAM}-$VERSION
+# If there's a NEWS file, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r NEWS ]; then
+ DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+ cat NEWS | head -n 1000 > $DOCSDIR/NEWS
+ touch -r NEWS $DOCSDIR/NEWS
+fi
+
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/source/l/pipewire/pipewire.desktop.sample b/source/l/pipewire/pipewire.desktop.sample
new file mode 100644
index 000000000..19a83e7a6
--- /dev/null
+++ b/source/l/pipewire/pipewire.desktop.sample
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Version=1.0
+Name=PipeWire Media System
+Comment=Start the PipeWire Media System
+Exec=/usr/bin/daemon -frB --pidfiles=~/.run --name=pipewire /usr/bin/pipewire
+Terminal=false
+Type=Application
+X-GNOME-Autostart-Phase=Initialization
+X-KDE-autostart-phase=1
diff --git a/source/l/pulseaudio/doinst.sh b/source/l/pulseaudio/doinst.sh
index 2c0737002..fe8421df4 100644
--- a/source/l/pulseaudio/doinst.sh
+++ b/source/l/pulseaudio/doinst.sh
@@ -26,6 +26,7 @@ config etc/pulse/client.conf.new
config etc/pulse/daemon.conf.new
config etc/pulse/default.pa.new
config etc/pulse/system.pa.new
+config etc/xdg/autostart/pulseaudio.desktop.new
preserve_perms etc/rc.d/rc.pulseaudio.new
# Make sure the pulse user is in the audio group:
diff --git a/source/l/pulseaudio/pulseaudio.SlackBuild b/source/l/pulseaudio/pulseaudio.SlackBuild
index c725760b6..863504a23 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:-3}
+BUILD=${BUILD:-4}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
@@ -133,6 +133,7 @@ rmdir --parents $PKG/etc/dbus-1/system.d/
# Move config files to .new:
for f in $( find $PKG/etc/pulse/ -type f ) ; do mv $f $f.new ; done
+mv $PKG/etc/xdg/autostart/pulseaudio.desktop $PKG/etc/xdg/autostart/pulseaudio.desktop.new
# Add an init script for system wide mode. You shouldn't use this, but we'll
# still let you if you really want.
diff --git a/source/n/network-scripts/network-scripts.SlackBuild b/source/n/network-scripts/network-scripts.SlackBuild
index b5bf39688..585374dae 100755
--- a/source/n/network-scripts/network-scripts.SlackBuild
+++ b/source/n/network-scripts/network-scripts.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2006, 2007, 2008, 2009, 2010, 2012, 2013, 2015, 2017, 2018, 2021 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010, 2012, 2013, 2015, 2017, 2018, 2021, 2022 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -95,14 +95,14 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
( cd $PKG
cat $CWD/0001-netconfig-turn-off-rc.networkmanager-if-networkmanager-is-not-selected.patch | patch -p1 --verbose || exit 1
rm -f sbin/netconfig.orig
-)
+) || exit 1
# Patch netconfig to add hostname-labeled loopback entries when DHCP
# is selected:
( cd $PKG
cat $CWD/0002-add-hostname-loopback-entries-in-etc-hosts-for-dhcp.patch | patch -p1 --verbose || exit 1
rm -f sbin/netconfig.orig
-)
+) || exit 1
cd $PKG
/sbin/makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.txz
diff --git a/source/n/yptools/yptools.SlackBuild b/source/n/yptools/yptools.SlackBuild
index 8b4765507..edeacd2e4 100755
--- a/source/n/yptools/yptools.SlackBuild
+++ b/source/n/yptools/yptools.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
# Package version number:
PKGNAM=yptools
VERSION=4.2.3
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-5}
YPTOOLS=$VERSION
YPBINDMT=2.7.2
@@ -108,7 +108,7 @@ mkdir -p $PKG/usr/share/locale/de/LC_MESSAGES
cat po/de.gmo > $PKG/usr/share/locale/de/LC_MESSAGES/yp-tools.mo
cd src
mkdir -p $PKG/usr/bin
-ocat ypcat > $PKG/usr/bin/ypcat
+cat ypcat > $PKG/usr/bin/ypcat
cat ypmatch > $PKG/usr/bin/ypmatch
cat yppasswd > $PKG/usr/bin/yppasswd
cat ypwhich > $PKG/usr/bin/ypwhich
diff --git a/source/x/x11/build/xf86-video-vmware b/source/x/x11/build/xf86-video-vmware
index 7ed6ff82d..1e8b31496 100644
--- a/source/x/x11/build/xf86-video-vmware
+++ b/source/x/x11/build/xf86-video-vmware
@@ -1 +1 @@
-5
+6
diff --git a/source/x/x11/patch/xf86-video-vmware.patch b/source/x/x11/patch/xf86-video-vmware.patch
new file mode 100644
index 000000000..b7be82d95
--- /dev/null
+++ b/source/x/x11/patch/xf86-video-vmware.patch
@@ -0,0 +1,2 @@
+# Fix build with recent libdrm:
+zcat $CWD/patch/xf86-video-vmware/50ab008cb965dc9e47e0a84a1950e2485bbd3c44.patch.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/x/x11/patch/xf86-video-vmware/50ab008cb965dc9e47e0a84a1950e2485bbd3c44.patch b/source/x/x11/patch/xf86-video-vmware/50ab008cb965dc9e47e0a84a1950e2485bbd3c44.patch
new file mode 100644
index 000000000..35142b5bc
--- /dev/null
+++ b/source/x/x11/patch/xf86-video-vmware/50ab008cb965dc9e47e0a84a1950e2485bbd3c44.patch
@@ -0,0 +1,60 @@
+From 50ab008cb965dc9e47e0a84a1950e2485bbd3c44 Mon Sep 17 00:00:00 2001
+From: Martin Krastev <krastevm@vmware.com>
+Date: Tue, 30 Nov 2021 11:47:39 -0800
+Subject: vmwgfx: Change header inclusion order to avoid xorg headers catching
+ stdbool.h
+
+libdrm commit e641e2a632d779f638ac2ba983b9fceb20b3fac4 added
+stdbool.h to the library headers which conflicts with xorg headers.
+
+Signed-off-by: Martin Krastev <krastevm@vmware.com>
+Reviewed-by: Zack Rusin <zackr@vmware.com>
+Signed-off-by: Zack Rusin <zackr@vmware.com>
+---
+ vmwgfx/vmwgfx_driver.h | 6 +++---
+ vmwgfx/vmwgfx_saa.c | 2 +-
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/vmwgfx/vmwgfx_driver.h b/vmwgfx/vmwgfx_driver.h
+index fa8e308..467fb21 100644
+--- a/vmwgfx/vmwgfx_driver.h
++++ b/vmwgfx/vmwgfx_driver.h
+@@ -36,15 +36,15 @@
+ #include <stddef.h>
+ #include <stdint.h>
+ #include <errno.h>
+-#include <drm.h>
+-#include <xf86drm.h>
+-#include <xf86drmMode.h>
+ #include <xorg-server.h>
+ #include <xf86.h>
+ #include <xf86Crtc.h>
+ #include <xf86xv.h>
+ #include <xa_tracker.h>
+ #include <xf86Module.h>
++#include <drm.h>
++#include <xf86drm.h>
++#include <xf86drmMode.h>
+
+ #include "../src/compat-api.h"
+ #ifdef DRI2
+diff --git a/vmwgfx/vmwgfx_saa.c b/vmwgfx/vmwgfx_saa.c
+index 0881e2f..457f397 100644
+--- a/vmwgfx/vmwgfx_saa.c
++++ b/vmwgfx/vmwgfx_saa.c
+@@ -29,11 +29,11 @@
+ #include <xorgVersion.h>
+ #include <mi.h>
+ #include <fb.h>
+-#include <xf86drmMode.h>
+ #include <xa_context.h>
+ #include "vmwgfx_saa.h"
+ #include "vmwgfx_drmi.h"
+ #include "vmwgfx_saa_priv.h"
++#include <xf86drmMode.h>
+
+ /*
+ * Damage to be added as soon as we attach storage to the pixmap.
+--
+cgit v1.2.1
+