diff options
Diffstat (limited to 'source')
17 files changed, 46 insertions, 82 deletions
diff --git a/source/k/kernel-configs/config-generic-5.19.7 b/source/k/kernel-configs/config-generic-5.19.8 index 054f3b6e6..1c0d3ccde 100644 --- a/source/k/kernel-configs/config-generic-5.19.7 +++ b/source/k/kernel-configs/config-generic-5.19.8 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.19.7 Kernel Configuration +# Linux/x86 5.19.8 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0" CONFIG_CC_IS_GCC=y diff --git a/source/k/kernel-configs/config-generic-5.19.7.x64 b/source/k/kernel-configs/config-generic-5.19.8.x64 index 26ed13cd9..0dd413b5f 100644 --- a/source/k/kernel-configs/config-generic-5.19.7.x64 +++ b/source/k/kernel-configs/config-generic-5.19.8.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.19.7 Kernel Configuration +# Linux/x86 5.19.8 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0" CONFIG_CC_IS_GCC=y diff --git a/source/k/kernel-configs/config-generic-smp-5.19.7-smp b/source/k/kernel-configs/config-generic-smp-5.19.8-smp index a1fee609b..220432de5 100644 --- a/source/k/kernel-configs/config-generic-smp-5.19.7-smp +++ b/source/k/kernel-configs/config-generic-smp-5.19.8-smp @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.19.7 Kernel Configuration +# Linux/x86 5.19.8 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0" CONFIG_CC_IS_GCC=y diff --git a/source/k/kernel-configs/config-huge-5.19.7 b/source/k/kernel-configs/config-huge-5.19.8 index 15eaf702a..013e559d6 100644 --- a/source/k/kernel-configs/config-huge-5.19.7 +++ b/source/k/kernel-configs/config-huge-5.19.8 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.19.7 Kernel Configuration +# Linux/x86 5.19.8 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0" CONFIG_CC_IS_GCC=y diff --git a/source/k/kernel-configs/config-huge-5.19.7.x64 b/source/k/kernel-configs/config-huge-5.19.8.x64 index f017b912d..f198d3041 100644 --- a/source/k/kernel-configs/config-huge-5.19.7.x64 +++ b/source/k/kernel-configs/config-huge-5.19.8.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.19.7 Kernel Configuration +# Linux/x86 5.19.8 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0" CONFIG_CC_IS_GCC=y diff --git a/source/k/kernel-configs/config-huge-smp-5.19.7-smp b/source/k/kernel-configs/config-huge-smp-5.19.8-smp index 7a45d7792..d470e69ad 100644 --- a/source/k/kernel-configs/config-huge-smp-5.19.7-smp +++ b/source/k/kernel-configs/config-huge-smp-5.19.8-smp @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.19.7 Kernel Configuration +# Linux/x86 5.19.8 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0" CONFIG_CC_IS_GCC=y diff --git a/source/kde/kde/build/cantor b/source/kde/kde/build/cantor index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/cantor +++ b/source/kde/kde/build/cantor @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/kitinerary b/source/kde/kde/build/kitinerary index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/kitinerary +++ b/source/kde/kde/build/kitinerary @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/kleopatra b/source/kde/kde/build/kleopatra index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/kleopatra +++ b/source/kde/kde/build/kleopatra @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/okular b/source/kde/kde/build/okular index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/okular +++ b/source/kde/kde/build/okular @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/plasma-workspace b/source/kde/kde/build/plasma-workspace index d00491fd7..0cfbf0888 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/umbrello b/source/kde/kde/build/umbrello index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/umbrello +++ b/source/kde/kde/build/umbrello @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/patch/kleopatra.patch b/source/kde/kde/patch/kleopatra.patch deleted file mode 100644 index df864bb66..000000000 --- a/source/kde/kde/patch/kleopatra.patch +++ /dev/null @@ -1,2 +0,0 @@ -# Fix build with gpgme-1.18.0: -cat $CWD/patch/kleopatra/a3684049dd4f0d2d47dcc6605ff31ce753254ef9.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/source/kde/kde/patch/kleopatra/a3684049dd4f0d2d47dcc6605ff31ce753254ef9.patch b/source/kde/kde/patch/kleopatra/a3684049dd4f0d2d47dcc6605ff31ce753254ef9.patch deleted file mode 100644 index eb5f52460..000000000 --- a/source/kde/kde/patch/kleopatra/a3684049dd4f0d2d47dcc6605ff31ce753254ef9.patch +++ /dev/null @@ -1,67 +0,0 @@ -From a3684049dd4f0d2d47dcc6605ff31ce753254ef9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ingo=20Kl=C3=B6cker?= <dev@ingo-kloecker.de> -Date: Fri, 19 Aug 2022 13:43:41 +0200 -Subject: [PATCH] Use ReceiveKeysJob for refreshing OpenPGP keys - -This refreshes the OpenPGP key from the configured key server. - -GnuPG-bug-id: 5903 - -CHANGELOG: Fix building against QGpgME 1.18.0 -BUG: 458044 -FIXED-IN: 22.08.1 - -(cherry picked from commit 87d8b00d4b2286489d5fadc9cfa07f1d721cdfe3) ---- - src/commands/refreshcertificatecommand.cpp | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/src/commands/refreshcertificatecommand.cpp b/src/commands/refreshcertificatecommand.cpp -index 226d791f..6a88bbf4 100644 ---- a/src/commands/refreshcertificatecommand.cpp -+++ b/src/commands/refreshcertificatecommand.cpp -@@ -19,7 +19,7 @@ - #include <QGpgME/Protocol> - #ifdef QGPGME_SUPPORTS_KEY_REFRESH - #include <QGpgME/RefreshKeysJob> --#include <QGpgME/RefreshOpenPGPKeysJob> -+#include <QGpgME/ReceiveKeysJob> - #endif - - #include <gpgme++/importresult.h> -@@ -44,7 +44,7 @@ public: - void cancel(); - - #ifdef QGPGME_SUPPORTS_KEY_REFRESH -- std::unique_ptr<QGpgME::RefreshOpenPGPKeysJob> startOpenPGPJob(); -+ std::unique_ptr<QGpgME::ReceiveKeysJob> startOpenPGPJob(); - std::unique_ptr<QGpgME::RefreshKeysJob> startSMIMEJob(); - #endif - void onOpenPGPJobResult(const ImportResult &result); -@@ -136,19 +136,19 @@ void RefreshCertificateCommand::Private::cancel() - } - - #ifdef QGPGME_SUPPORTS_KEY_REFRESH --std::unique_ptr<QGpgME::RefreshOpenPGPKeysJob> RefreshCertificateCommand::Private::startOpenPGPJob() -+std::unique_ptr<QGpgME::ReceiveKeysJob> RefreshCertificateCommand::Private::startOpenPGPJob() - { -- std::unique_ptr<QGpgME::RefreshOpenPGPKeysJob> refreshJob{QGpgME::openpgp()->refreshOpenPGPKeysJob()}; -+ std::unique_ptr<QGpgME::ReceiveKeysJob> refreshJob{QGpgME::openpgp()->receiveKeysJob()}; - Q_ASSERT(refreshJob); - -- connect(refreshJob.get(), &QGpgME::RefreshOpenPGPKeysJob::result, -+ connect(refreshJob.get(), &QGpgME::ReceiveKeysJob::result, - q, [this](const GpgME::ImportResult &result) { - onOpenPGPJobResult(result); - }); - connect(refreshJob.get(), &QGpgME::Job::progress, - q, &Command::progress); - -- const GpgME::Error err = refreshJob->start({key}); -+ const GpgME::Error err = refreshJob->start({QString::fromLatin1(key.primaryFingerprint())}); - if (err) { - showError(err); - return {}; --- -GitLab - diff --git a/source/kde/kde/patch/plasma-workspace.patch b/source/kde/kde/patch/plasma-workspace.patch index 77645b0cb..a4ea1dc22 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/c7ba560ccaac5e469cb2d6bf66c39e1acf967454.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/source/kde/kde/patch/plasma-workspace/c7ba560ccaac5e469cb2d6bf66c39e1acf967454.patch b/source/kde/kde/patch/plasma-workspace/c7ba560ccaac5e469cb2d6bf66c39e1acf967454.patch new file mode 100644 index 000000000..ff5a1e663 --- /dev/null +++ b/source/kde/kde/patch/plasma-workspace/c7ba560ccaac5e469cb2d6bf66c39e1acf967454.patch @@ -0,0 +1,32 @@ +From c7ba560ccaac5e469cb2d6bf66c39e1acf967454 Mon Sep 17 00:00:00 2001 +From: Nicolas Fella <nicolas.fella@gmx.de> +Date: Sun, 21 Aug 2022 16:33:50 +0200 +Subject: [PATCH] [widgetexplorer] Don't recurse into applet's containments + +The intention of this code appears to be finding system tray applets, since the systemtray is a containment within another applet/containment + +However the code causes an infinit recursion since we are calling addContainment on the same containment again + +The recursion also is unnecessary since corona->containments() already lists the system tray containment, so we don't need to find it by recursing through the panel's children +--- + components/shellprivate/widgetexplorer/widgetexplorer.cpp | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/components/shellprivate/widgetexplorer/widgetexplorer.cpp b/components/shellprivate/widgetexplorer/widgetexplorer.cpp +index c20bd59066..6de3890d5f 100644 +--- a/components/shellprivate/widgetexplorer/widgetexplorer.cpp ++++ b/components/shellprivate/widgetexplorer/widgetexplorer.cpp +@@ -280,10 +280,6 @@ void WidgetExplorerPrivate::addContainment(Containment *containment) + + foreach (Applet *applet, containment->applets()) { + if (applet->pluginMetaData().isValid()) { +- Containment *childContainment = applet->property("containment").value<Containment *>(); +- if (childContainment) { +- addContainment(childContainment); +- } + runningApplets[applet->pluginMetaData().pluginId()]++; + } else { + qDebug() << "Invalid plugin metadata. :("; +-- +GitLab + diff --git a/source/l/qt5/fetch_sources.sh b/source/l/qt5/fetch_sources.sh index 53555b881..fccc6f017 100755 --- a/source/l/qt5/fetch_sources.sh +++ b/source/l/qt5/fetch_sources.sh @@ -20,7 +20,7 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -BRANCH="5.15.5" +BRANCH="5.15.6" rm -f qt-everywhere-src-*.tar* |