diff options
Diffstat (limited to 'source')
18 files changed, 60 insertions, 25 deletions
diff --git a/source/a/aaa_libraries/aaa_libraries.SlackBuild b/source/a/aaa_libraries/aaa_libraries.SlackBuild index 8b421da61..c6c35f03b 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:-13} +BUILD=${BUILD:-14} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/ap/cups-filters/cups-filters.SlackBuild b/source/ap/cups-filters/cups-filters.SlackBuild index 9ca96c91b..ffbe020a5 100755 --- a/source/ap/cups-filters/cups-filters.SlackBuild +++ b/source/ap/cups-filters/cups-filters.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=cups-filters 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 diff --git a/source/d/gdb/gdb.SlackBuild b/source/d/gdb/gdb.SlackBuild index 1274122c8..5e5ea831a 100755 --- a/source/d/gdb/gdb.SlackBuild +++ b/source/d/gdb/gdb.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=gdb VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-4} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/source/installer/ChangeLog.txt b/source/installer/ChangeLog.txt index b2251ed9a..d2e7a8730 100644 --- a/source/installer/ChangeLog.txt +++ b/source/installer/ChangeLog.txt @@ -1,3 +1,7 @@ +Sun Jan 16 20:51:35 UTC 2022 + Fix installation of the exfat kernel module(s). + Thanks to Nille_kungen. ++--------------------------+ Wed Jan 12 19:45:11 UTC 2022 Added "nvme" command-line utility. Thanks to peake. +--------------------------+ diff --git a/source/installer/build_installer.sh b/source/installer/build_installer.sh index 82b0f776f..c46d0bb1d 100755 --- a/source/installer/build_installer.sh +++ b/source/installer/build_installer.sh @@ -1533,7 +1533,7 @@ for ind in $(seq 0 $((${#KERNELS[*]} -1)) ); do cp -a fs.orig/{udf*,isofs*,cifs*,ext*,fat*,fscache,jfs*,lockd,nfs,nfs_common,jbd*,nls,reiserfs,xfs,binfmt*,mbcache*,exportfs*} fs/ ;; *86*) - cp -a fs.orig/{cifs*,fscache,lockd,nfs,nfs_common,ntfs3} fs/ + cp -a fs.orig/{cifs*,exfat,fscache,lockd,nfs,nfs_common,ntfs3} fs/ ;; *) cp -a fs.orig/cifs* fs/ @@ -1593,9 +1593,10 @@ for ind in $(seq 0 $((${#KERNELS[*]} -1)) ); do # Done with block directory # Grab a few modules from staging: mv staging staging.orig - mv staging.orig/hv staging - mv staging.orig/exfat staging - mv staging.orig/speakup staging + # These all seem to have been merged... + #mv staging.orig/hv staging + #mv staging.orig/exfat staging + #mv staging.orig/speakup staging rm -rf${VERBOSE1} staging.orig # Save the Hyper-V keyboard module: mkdir -p input.orig/serio diff --git a/source/k/kernel-configs/config-generic-5.15.14 b/source/k/kernel-configs/config-generic-5.15.15 index bac8579ae..140cbcd1b 100644 --- a/source/k/kernel-configs/config-generic-5.15.14 +++ b/source/k/kernel-configs/config-generic-5.15.15 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.15.14 Kernel Configuration +# Linux/x86 5.15.15 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.14.x64 b/source/k/kernel-configs/config-generic-5.15.15.x64 index a32961573..f13abce12 100644 --- a/source/k/kernel-configs/config-generic-5.15.14.x64 +++ b/source/k/kernel-configs/config-generic-5.15.15.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.15.14 Kernel Configuration +# Linux/x86 5.15.15 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.14-smp b/source/k/kernel-configs/config-generic-smp-5.15.15-smp index 198612e30..cd821d336 100644 --- a/source/k/kernel-configs/config-generic-smp-5.15.14-smp +++ b/source/k/kernel-configs/config-generic-smp-5.15.15-smp @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.15.14 Kernel Configuration +# Linux/x86 5.15.15 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.14 b/source/k/kernel-configs/config-huge-5.15.15 index 4f9581a4f..1ace1967a 100644 --- a/source/k/kernel-configs/config-huge-5.15.14 +++ b/source/k/kernel-configs/config-huge-5.15.15 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.15.14 Kernel Configuration +# Linux/x86 5.15.15 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.14.x64 b/source/k/kernel-configs/config-huge-5.15.15.x64 index a92d07c80..159e7ceb1 100644 --- a/source/k/kernel-configs/config-huge-5.15.14.x64 +++ b/source/k/kernel-configs/config-huge-5.15.15.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.15.14 Kernel Configuration +# Linux/x86 5.15.15 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.14-smp b/source/k/kernel-configs/config-huge-smp-5.15.15-smp index f502ed3d7..b3e4346f6 100644 --- a/source/k/kernel-configs/config-huge-smp-5.15.14-smp +++ b/source/k/kernel-configs/config-huge-smp-5.15.15-smp @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.15.14 Kernel Configuration +# Linux/x86 5.15.15 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0" CONFIG_CC_IS_GCC=y diff --git a/source/kde/kde/build/kwayland-server b/source/kde/kde/build/kwayland-server index d00491fd7..0cfbf0888 100644 --- a/source/kde/kde/build/kwayland-server +++ b/source/kde/kde/build/kwayland-server @@ -1 +1 @@ -1 +2 diff --git a/source/kde/kde/patch/kwayland-server.patch b/source/kde/kde/patch/kwayland-server.patch new file mode 100644 index 000000000..f1b4e7273 --- /dev/null +++ b/source/kde/kde/patch/kwayland-server.patch @@ -0,0 +1 @@ +cat $CWD/patch/kwayland-server/5f5bea1648590f24f11ce232eb78112953a4d20e.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/source/kde/kde/patch/kwayland-server/5f5bea1648590f24f11ce232eb78112953a4d20e.patch b/source/kde/kde/patch/kwayland-server/5f5bea1648590f24f11ce232eb78112953a4d20e.patch new file mode 100644 index 000000000..50d1314cf --- /dev/null +++ b/source/kde/kde/patch/kwayland-server/5f5bea1648590f24f11ce232eb78112953a4d20e.patch @@ -0,0 +1,29 @@ +From 5f5bea1648590f24f11ce232eb78112953a4d20e Mon Sep 17 00:00:00 2001 +From: Vlad Zahorodnii <vlad.zahorodnii@kde.org> +Date: Mon, 10 Jan 2022 13:17:32 +0200 +Subject: [PATCH] Store surface object in tablet cursor using QPointer + +The SurfaceInterface can get destroyed and TabletCursorV2 may return a +dangling pointer. + +BUG: 446255 +--- + src/server/tablet_v2_interface.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/server/tablet_v2_interface.cpp b/src/server/tablet_v2_interface.cpp +index 59a4b2fb..8af80603 100644 +--- a/src/server/tablet_v2_interface.cpp ++++ b/src/server/tablet_v2_interface.cpp +@@ -91,7 +91,7 @@ public: + TabletCursorV2 *const q; + + quint32 m_serial = 0; +- SurfaceInterface *m_surface = nullptr; ++ QPointer<SurfaceInterface> m_surface; + QPoint m_hotspot; + }; + +-- +GitLab + diff --git a/source/l/libunwind/libunwind.SlackBuild b/source/l/libunwind/libunwind.SlackBuild index 8194e9153..ffc08e826 100755 --- a/source/l/libunwind/libunwind.SlackBuild +++ b/source/l/libunwind/libunwind.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libunwind VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | 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 diff --git a/source/x/xterm/linux-console-xterm.ad b/source/x/xterm/linux-console-xterm.ad index bd0095f6d..12c4fdfed 100644 --- a/source/x/xterm/linux-console-xterm.ad +++ b/source/x/xterm/linux-console-xterm.ad @@ -1,7 +1,7 @@ !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ! These resources will, as much as possible, configure xterm to look ! like a linux console. -! +! To use this file, copy it to: /etc/X11/app-defaults/XTerm !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ! Choose one below: diff --git a/source/x/xterm/xterm.SlackBuild b/source/x/xterm/xterm.SlackBuild index 47d15fb31..ff1aff97e 100755 --- a/source/x/xterm/xterm.SlackBuild +++ b/source/x/xterm/xterm.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=xterm VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -111,13 +111,12 @@ make install DESTDIR=$PKG || exit 1 mkdir -p $PKG/usr/share/applications cp xterm.desktop uxterm.desktop $PKG/usr/share/applications -# Commented out. For now we will use upstream defaults. -## Install a default XTerm app-defaults that looks like the Linux console. -## Thanks to GazL. -#cp -a $PKG/etc/X11/app-defaults/XTerm $PKG/etc/X11/app-defaults/XTerm.upstream.default -#echo >> $PKG/etc/X11/app-defaults/XTerm -#cat $CWD/linux-console-xterm.ad >> $PKG/etc/X11/app-defaults/XTerm -#touch -r $PKG/etc/X11/app-defaults/XTerm.upstream.default $PKG/etc/X11/app-defaults/XTerm +# Install a sample XTerm app-defaults that looks like the Linux console. +# Thanks to GazL. +cp -a $PKG/etc/X11/app-defaults/XTerm $PKG/etc/X11/app-defaults/XTerm.upstream.default +cp -a $CWD/linux-console-xterm.ad $PKG/etc/X11/app-defaults/XTerm.linux.console +chown root:root $PKG/etc/X11/app-defaults/XTerm.linux.console +chmod 644 $PKG/etc/X11/app-defaults/XTerm.linux.console # Install app-defaults as .new: mv $PKG/etc/X11/app-defaults/XTerm $PKG/etc/X11/app-defaults/XTerm.new diff --git a/source/xap/xsnow/xsnow.url b/source/xap/xsnow/xsnow.url index 2f6285fcc..42b7ac558 100644 --- a/source/xap/xsnow/xsnow.url +++ b/source/xap/xsnow/xsnow.url @@ -1 +1,2 @@ -https://sourceforge.net/projects/xsnow/files/ +https://www.ratrabbit.nl/ratrabbit/xsnow/downloads/index.html +#https://sourceforge.net/projects/xsnow/files/ |