diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2022-05-18 19:41:22 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2022-05-19 06:59:45 +0200 |
commit | 781dadc7c48445babee46ea66de0cbcfa031424e (patch) | |
tree | b30daeb10ed9ba236fdf55fdb7b5be060d833444 /source | |
parent | 4a337c4eaa20f87da8efa21735437e6cee5a2b3e (diff) | |
download | current-781dadc7c48445babee46ea66de0cbcfa031424e.tar.gz |
Wed May 18 19:41:22 UTC 202220220518194122
a/f2fs-tools-1.15.0-x86_64-1.txz: Upgraded.
a/kernel-firmware-20220516_251d290-noarch-1.txz: Upgraded.
a/kernel-generic-5.17.9-x86_64-1.txz: Upgraded.
a/kernel-huge-5.17.9-x86_64-1.txz: Upgraded.
a/kernel-modules-5.17.9-x86_64-1.txz: Upgraded.
d/kernel-headers-5.17.9-x86-1.txz: Upgraded.
d/ninja-1.11.0-x86_64-1.txz: Upgraded.
k/kernel-source-5.17.9-noarch-1.txz: Upgraded.
kde/calligra-3.2.1-x86_64-19.txz: Rebuilt.
Recompiled against gsl-2.7.1.
kde/krita-5.0.6-x86_64-5.txz: Rebuilt.
Recompiled against gsl-2.7.1.
kde/plasma-workspace-5.24.5-x86_64-2.txz: Rebuilt.
[PATCH] kcms/desktoptheme: find metadata.json when loading ThemesModel.
Thanks to Heinz Wiesinger for the link to the patch.
kde/step-22.04.1-x86_64-2.txz: Rebuilt.
Recompiled against gsl-2.7.1.
l/gsl-2.7.1-x86_64-1.txz: Upgraded.
Shared library .so-version bump.
n/mutt-2.2.5-x86_64-1.txz: Upgraded.
x/igt-gpu-tools-1.26-x86_64-2.txz: Rebuilt.
Recompiled against gsl-2.7.1.
xap/xsnow-3.5.0-x86_64-2.txz: Rebuilt.
Recompiled against gsl-2.7.1.
isolinux/initrd.img: Rebuilt.
kernels/*: Upgraded.
usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'source')
16 files changed, 56 insertions, 14 deletions
diff --git a/source/a/f2fs-tools/f2fs-tools.SlackBuild b/source/a/f2fs-tools/f2fs-tools.SlackBuild index 7a7bea4c..eb3b7ccc 100755 --- a/source/a/f2fs-tools/f2fs-tools.SlackBuild +++ b/source/a/f2fs-tools/f2fs-tools.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=f2fs-tools 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/d/ninja/ninja.SlackBuild b/source/d/ninja/ninja.SlackBuild index 9f37bf7f..f0b6c6af 100755 --- a/source/d/ninja/ninja.SlackBuild +++ b/source/d/ninja/ninja.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=ninja VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/source/k/kernel-configs/config-generic-5.17.8 b/source/k/kernel-configs/config-generic-5.17.9 index dcdd42a7..5c4b5d88 100644 --- a/source/k/kernel-configs/config-generic-5.17.8 +++ b/source/k/kernel-configs/config-generic-5.17.9 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.17.8 Kernel Configuration +# Linux/x86 5.17.9 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.3.0" CONFIG_CC_IS_GCC=y diff --git a/source/k/kernel-configs/config-generic-5.17.8.x64 b/source/k/kernel-configs/config-generic-5.17.9.x64 index e9b8159c..77071cd4 100644 --- a/source/k/kernel-configs/config-generic-5.17.8.x64 +++ b/source/k/kernel-configs/config-generic-5.17.9.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.17.8 Kernel Configuration +# Linux/x86 5.17.9 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.3.0" CONFIG_CC_IS_GCC=y diff --git a/source/k/kernel-configs/config-generic-smp-5.17.8-smp b/source/k/kernel-configs/config-generic-smp-5.17.9-smp index 867c625b..296736a0 100644 --- a/source/k/kernel-configs/config-generic-smp-5.17.8-smp +++ b/source/k/kernel-configs/config-generic-smp-5.17.9-smp @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.17.8 Kernel Configuration +# Linux/x86 5.17.9 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.3.0" CONFIG_CC_IS_GCC=y diff --git a/source/k/kernel-configs/config-huge-5.17.8 b/source/k/kernel-configs/config-huge-5.17.9 index a2fd64ce..b0bc98c6 100644 --- a/source/k/kernel-configs/config-huge-5.17.8 +++ b/source/k/kernel-configs/config-huge-5.17.9 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.17.8 Kernel Configuration +# Linux/x86 5.17.9 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.3.0" CONFIG_CC_IS_GCC=y diff --git a/source/k/kernel-configs/config-huge-5.17.8.x64 b/source/k/kernel-configs/config-huge-5.17.9.x64 index 443b2dd3..ad6efc1f 100644 --- a/source/k/kernel-configs/config-huge-5.17.8.x64 +++ b/source/k/kernel-configs/config-huge-5.17.9.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.17.8 Kernel Configuration +# Linux/x86 5.17.9 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.3.0" CONFIG_CC_IS_GCC=y diff --git a/source/k/kernel-configs/config-huge-smp-5.17.8-smp b/source/k/kernel-configs/config-huge-smp-5.17.9-smp index 39512baa..5eb53440 100644 --- a/source/k/kernel-configs/config-huge-smp-5.17.8-smp +++ b/source/k/kernel-configs/config-huge-smp-5.17.9-smp @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.17.8 Kernel Configuration +# Linux/x86 5.17.9 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.3.0" CONFIG_CC_IS_GCC=y diff --git a/source/kde/kde/build/calligra b/source/kde/kde/build/calligra index 3c032078..d6b24041 100644 --- a/source/kde/kde/build/calligra +++ b/source/kde/kde/build/calligra @@ -1 +1 @@ -18 +19 diff --git a/source/kde/kde/build/krita b/source/kde/kde/build/krita index b8626c4c..7ed6ff82 100644 --- a/source/kde/kde/build/krita +++ b/source/kde/kde/build/krita @@ -1 +1 @@ -4 +5 diff --git a/source/kde/kde/build/plasma-workspace b/source/kde/kde/build/plasma-workspace index d00491fd..0cfbf088 100644 --- a/source/kde/kde/build/plasma-workspace +++ b/source/kde/kde/build/plasma-workspace @@ -1 +1 @@ -1 +2 diff --git a/source/kde/kde/build/step b/source/kde/kde/build/step index d00491fd..0cfbf088 100644 --- a/source/kde/kde/build/step +++ b/source/kde/kde/build/step @@ -1 +1 @@ -1 +2 diff --git a/source/kde/kde/patch/plasma-workspace.patch b/source/kde/kde/patch/plasma-workspace.patch index 77645b0c..1c69240c 100644 --- a/source/kde/kde/patch/plasma-workspace.patch +++ b/source/kde/kde/patch/plasma-workspace.patch @@ -1 +1,2 @@ cat $CWD/patch/plasma-workspace/0001-Revert-No-icons-on-the-desktop-by-default.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +cat $CWD/patch/plasma-workspace/f77b7284e39b14b0e9a8b4d2b77c0b93b2c9ea59.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/source/kde/kde/patch/plasma-workspace/f77b7284e39b14b0e9a8b4d2b77c0b93b2c9ea59.patch b/source/kde/kde/patch/plasma-workspace/f77b7284e39b14b0e9a8b4d2b77c0b93b2c9ea59.patch new file mode 100644 index 00000000..352bed91 --- /dev/null +++ b/source/kde/kde/patch/plasma-workspace/f77b7284e39b14b0e9a8b4d2b77c0b93b2c9ea59.patch @@ -0,0 +1,41 @@ +From f77b7284e39b14b0e9a8b4d2b77c0b93b2c9ea59 Mon Sep 17 00:00:00 2001 +From: Fushan Wen <qydwhotmail@gmail.com> +Date: Mon, 16 May 2022 16:18:00 +0800 +Subject: [PATCH] kcms/desktoptheme: find metadata.json when loading + ThemesModel + +Before this commit ThemesModel only finds metadata.desktop, but after +KF5.94, the default theme metadata files have been ported to json format. + +BUG: 453830 + + +(cherry picked from commit 10aa9bb8dca91e92e3009ed57613d43d610da63e) +--- + kcms/desktoptheme/themesmodel.cpp | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/kcms/desktoptheme/themesmodel.cpp b/kcms/desktoptheme/themesmodel.cpp +index 6f0ecf4e3..296951742 100644 +--- a/kcms/desktoptheme/themesmodel.cpp ++++ b/kcms/desktoptheme/themesmodel.cpp +@@ -155,7 +155,15 @@ void ThemesModel::load() + const QDir cd(ppath); + const QStringList &entries = cd.entryList(QDir::Dirs | QDir::Hidden | QDir::NoDotAndDotDot); + for (const QString &pack : entries) { +- const QString _metadata = ppath + QLatin1Char('/') + pack + QStringLiteral("/metadata.desktop"); ++ const QString prefix = QStringLiteral("%1%2%3%4metadata.").arg(ppath, QDir::separator(), pack, QDir::separator()); ++ ++ QString _metadata = QStringLiteral("%1json").arg(prefix); ++ if (QFile::exists(_metadata)) { ++ themes << _metadata; ++ continue; ++ } ++ ++ _metadata = QStringLiteral("%1desktop").arg(prefix); + if (QFile::exists(_metadata)) { + themes << _metadata; + } +-- +GitLab + diff --git a/source/x/x11/build/igt-gpu-tools b/source/x/x11/build/igt-gpu-tools index d00491fd..0cfbf088 100644 --- a/source/x/x11/build/igt-gpu-tools +++ b/source/x/x11/build/igt-gpu-tools @@ -1 +1 @@ -1 +2 diff --git a/source/xap/xsnow/xsnow.SlackBuild b/source/xap/xsnow/xsnow.SlackBuild index 59e6639e..f5a09cfa 100755 --- a/source/xap/xsnow/xsnow.SlackBuild +++ b/source/xap/xsnow/xsnow.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=xsnow 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 |