From ac00706594d04f1b74af59b2437af2165087610b Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Mon, 27 Dec 2021 23:06:00 +0000 Subject: Mon Dec 27 23:06:00 UTC 2021 The --enable-systemd-logind change to xorg-server that caused resume from suspend regressions (and others) has been reverted, and in retrospect it was a bad idea to take it at that point, but it had appeared as if it wouldn't cause problems in the case where Xorg was running as root. Oh well, lesson learned. But the build script has been enhanced to make it easy to build rootless versions of the xorg-server packages. Just do this: ROOTLESSX=YES ./x11.SlackBuild xserver xorg-server Depending on your GPU, this could work for your use case with no problems. Also, I've gone ahead and taken a couple of shared library version bumps since the projects (opencv and poppler) have decent track records as far as not introducing regressions, and if there are any, we've got time to test and fix. I'm still avoiding some things that aren't as trusted in that regard, and will likely continue to do so. :-) ap/cups-filters-1.28.10-x86_64-2.txz: Rebuilt. Recompiled against poppler-21.12.0. kde/ark-21.12.0-x86_64-2.txz: Rebuilt. Applied upstream patches: [PATCH] Fix extraction "Dolphin Actions" not abiding "Open destination folder after extracting" setting. [PATCH] Do not highlight file after compression. Thanks to ctrlaltca. kde/calligra-3.2.1-x86_64-15.txz: Rebuilt. Recompiled against poppler-21.12.0. kde/cantor-21.12.0-x86_64-2.txz: Rebuilt. Recompiled against poppler-21.12.0. kde/digikam-7.4.0-x86_64-2.txz: Rebuilt. Recompiled against opencv-4.5.5. kde/kfilemetadata-5.89.0-x86_64-2.txz: Rebuilt. Recompiled against poppler-21.12.0. kde/kile-2.9.93-x86_64-15.txz: Rebuilt. Recompiled against poppler-21.12.0. kde/kitinerary-21.12.0-x86_64-2.txz: Rebuilt. Recompiled against poppler-21.12.0. kde/krita-5.0.0-x86_64-2.txz: Rebuilt. Recompiled against poppler-21.12.0. kde/okular-21.12.0-x86_64-2.txz: Rebuilt. Recompiled against poppler-21.12.0. l/gegl-0.4.34-x86_64-2.txz: Rebuilt. Recompiled against poppler-21.12.0. l/gst-plugins-bad-free-1.18.5-x86_64-3.txz: Rebuilt. Recompiled against opencv-4.5.5. l/imagemagick-7.1.0_19-x86_64-1.txz: Upgraded. l/mlt-7.4.0-x86_64-1.txz: Upgraded. l/opencv-4.5.5-x86_64-1.txz: Upgraded. Shared library .so-version bump. l/poppler-21.12.0-x86_64-1.txz: Upgraded. Shared library .so-version bump. n/fetchmail-6.4.26-x86_64-1.txz: Upgraded. n/tin-2.6.1-x86_64-1.txz: Upgraded. x/ibus-anthy-1.5.14-x86_64-1.txz: Upgraded. x/xorg-server-1.20.14-x86_64-2.txz: Rebuilt. Recompiled using these options: --enable-suid-wrapper --enable-install-setuid --disable-systemd-logind. x/xorg-server-xephyr-1.20.14-x86_64-2.txz: Rebuilt. x/xorg-server-xnest-1.20.14-x86_64-2.txz: Rebuilt. x/xorg-server-xvfb-1.20.14-x86_64-2.txz: Rebuilt. xap/geeqie-1.6-x86_64-4.txz: Rebuilt. Recompiled against poppler-21.12.0. xap/gimp-2.10.30-x86_64-2.txz: Rebuilt. Recompiled against poppler-21.12.0. xfce/tumbler-4.16.0-x86_64-4.txz: Rebuilt. Recompiled against poppler-21.12.0. extra/rust-for-mozilla/rust-1.54.0-x86_64-3.txz: Added. This is an alternate version of Rust that may be useful for compiling software from Mozilla since using the very latest Rust often won't compile, or produces an unstable build. --- source/kde/kde/build/ark | 2 +- source/kde/kde/build/calligra | 2 +- source/kde/kde/build/cantor | 2 +- source/kde/kde/build/digikam | 2 +- source/kde/kde/build/kfilemetadata | 2 +- source/kde/kde/build/kile | 2 +- source/kde/kde/build/kitinerary | 2 +- source/kde/kde/build/krita | 2 +- source/kde/kde/build/okular | 2 +- source/kde/kde/patch/ark.patch | 2 + .../015bdfd1de9135279c7662eb89acc81d1a843202.patch | 36 ++++++++++++++++++ .../75c6927883342ec533aea4663b7b5dfcf8d699a6.patch | 43 ++++++++++++++++++++++ 12 files changed, 90 insertions(+), 9 deletions(-) create mode 100644 source/kde/kde/patch/ark.patch create mode 100644 source/kde/kde/patch/ark/015bdfd1de9135279c7662eb89acc81d1a843202.patch create mode 100644 source/kde/kde/patch/ark/75c6927883342ec533aea4663b7b5dfcf8d699a6.patch (limited to 'source/kde') diff --git a/source/kde/kde/build/ark b/source/kde/kde/build/ark index d00491fd7..0cfbf0888 100644 --- a/source/kde/kde/build/ark +++ b/source/kde/kde/build/ark @@ -1 +1 @@ -1 +2 diff --git a/source/kde/kde/build/calligra b/source/kde/kde/build/calligra index 8351c1939..60d3b2f4a 100644 --- a/source/kde/kde/build/calligra +++ b/source/kde/kde/build/calligra @@ -1 +1 @@ -14 +15 diff --git a/source/kde/kde/build/cantor b/source/kde/kde/build/cantor index d00491fd7..0cfbf0888 100644 --- a/source/kde/kde/build/cantor +++ b/source/kde/kde/build/cantor @@ -1 +1 @@ -1 +2 diff --git a/source/kde/kde/build/digikam b/source/kde/kde/build/digikam index d00491fd7..0cfbf0888 100644 --- a/source/kde/kde/build/digikam +++ b/source/kde/kde/build/digikam @@ -1 +1 @@ -1 +2 diff --git a/source/kde/kde/build/kfilemetadata b/source/kde/kde/build/kfilemetadata index d00491fd7..0cfbf0888 100644 --- a/source/kde/kde/build/kfilemetadata +++ b/source/kde/kde/build/kfilemetadata @@ -1 +1 @@ -1 +2 diff --git a/source/kde/kde/build/kile b/source/kde/kde/build/kile index 8351c1939..60d3b2f4a 100644 --- a/source/kde/kde/build/kile +++ b/source/kde/kde/build/kile @@ -1 +1 @@ -14 +15 diff --git a/source/kde/kde/build/kitinerary b/source/kde/kde/build/kitinerary index d00491fd7..0cfbf0888 100644 --- a/source/kde/kde/build/kitinerary +++ b/source/kde/kde/build/kitinerary @@ -1 +1 @@ -1 +2 diff --git a/source/kde/kde/build/krita b/source/kde/kde/build/krita index d00491fd7..0cfbf0888 100644 --- a/source/kde/kde/build/krita +++ b/source/kde/kde/build/krita @@ -1 +1 @@ -1 +2 diff --git a/source/kde/kde/build/okular b/source/kde/kde/build/okular index d00491fd7..0cfbf0888 100644 --- a/source/kde/kde/build/okular +++ b/source/kde/kde/build/okular @@ -1 +1 @@ -1 +2 diff --git a/source/kde/kde/patch/ark.patch b/source/kde/kde/patch/ark.patch new file mode 100644 index 000000000..77f409c90 --- /dev/null +++ b/source/kde/kde/patch/ark.patch @@ -0,0 +1,2 @@ +cat $CWD/patch/ark/015bdfd1de9135279c7662eb89acc81d1a843202.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +cat $CWD/patch/ark/75c6927883342ec533aea4663b7b5dfcf8d699a6.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/source/kde/kde/patch/ark/015bdfd1de9135279c7662eb89acc81d1a843202.patch b/source/kde/kde/patch/ark/015bdfd1de9135279c7662eb89acc81d1a843202.patch new file mode 100644 index 000000000..3144292e7 --- /dev/null +++ b/source/kde/kde/patch/ark/015bdfd1de9135279c7662eb89acc81d1a843202.patch @@ -0,0 +1,36 @@ +From 015bdfd1de9135279c7662eb89acc81d1a843202 Mon Sep 17 00:00:00 2001 +From: 2155X 2155X +Date: Tue, 7 Dec 2021 01:12:35 +0200 +Subject: [PATCH] Fix extraction "Dolphin Actions" not abiding "Open + destination folder after extracting" setting. + +BUG: 319134 +CCBUG: 298248 + + +(cherry picked from commit 6b3b77e81a05154204ca89140afbec2021ea431b) +--- + app/extractfileitemaction.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/app/extractfileitemaction.cpp b/app/extractfileitemaction.cpp +index b714cee6..cd6b6f96 100644 +--- a/app/extractfileitemaction.cpp ++++ b/app/extractfileitemaction.cpp +@@ -14,6 +14,7 @@ + #include + #include + ++#include "settings.h" + #include "mimetypes.h" + #include "pluginmanager.h" + #include "batchextract.h" +@@ -96,7 +97,7 @@ QAction *ExtractFileItemAction::createAction(const QIcon& icon, const QString& n + connect(action, &QAction::triggered, this, [urls,name, option, parent,this]() { + auto *batchExtractJob = new BatchExtract(parent); + batchExtractJob->setDestinationFolder(QFileInfo(urls.first().toLocalFile()).path()); +- batchExtractJob->setOpenDestinationAfterExtraction(true); ++ batchExtractJob->setOpenDestinationAfterExtraction(ArkSettings::openDestinationFolderAfterExtraction()); + if (option == AutoSubfolder) { + batchExtractJob->setAutoSubfolder(true); + } else if (option == ShowDialog) { diff --git a/source/kde/kde/patch/ark/75c6927883342ec533aea4663b7b5dfcf8d699a6.patch b/source/kde/kde/patch/ark/75c6927883342ec533aea4663b7b5dfcf8d699a6.patch new file mode 100644 index 000000000..764708e2b --- /dev/null +++ b/source/kde/kde/patch/ark/75c6927883342ec533aea4663b7b5dfcf8d699a6.patch @@ -0,0 +1,43 @@ +From 75c6927883342ec533aea4663b7b5dfcf8d699a6 Mon Sep 17 00:00:00 2001 +From: Alexander Lohnau +Date: Sat, 25 Dec 2021 13:00:29 +0100 +Subject: [PATCH] Do not highlight file after compression + +Dolphin opens a new tab whenever the file is compressed and +is not smart enough to highlight it in the currently open view. +Because people are annoyed by it and the alternatives are complex to implement, +removing it is the best solution. + +BUG: 440663 + + +(cherry picked from commit 28f2ef4b22f53200cb8789dbc8fe8ecdba3a377f) +--- + app/compressfileitemaction.cpp | 7 ++----- + 1 file changed, 2 insertions(+), 5 deletions(-) + +diff --git a/app/compressfileitemaction.cpp b/app/compressfileitemaction.cpp +index 45e75a6e..692a7195 100644 +--- a/app/compressfileitemaction.cpp ++++ b/app/compressfileitemaction.cpp +@@ -16,7 +16,6 @@ + #include + + #include +-#include + + #include "pluginmanager.h" + #include "addtoarchive.h" +@@ -102,10 +101,8 @@ QAction *CompressFileItemAction::createAction(const QIcon& icon, const QString& + } + } + addToArchiveJob->start(); +- connect(addToArchiveJob, &KJob::finished, this, [this, addToArchiveJob](){ +- if (addToArchiveJob->error() == 0) { +- KIO::highlightInFileManager({QUrl::fromLocalFile(addToArchiveJob->fileName())}); +- } else if (!addToArchiveJob->errorString().isEmpty()) { ++ connect(addToArchiveJob, &KJob::finished, this, [this, addToArchiveJob]() { ++ if (addToArchiveJob->error() != 0) { + Q_EMIT error(addToArchiveJob->errorString()); + } + }); -- cgit v1.2.3-65-gdbad