diff -Nru plasma-workspace-5.27.11/debian/changelog plasma-workspace-5.27.11/debian/changelog --- plasma-workspace-5.27.11/debian/changelog 2024-03-23 12:44:49.000000000 +0000 +++ plasma-workspace-5.27.11/debian/changelog 2024-03-23 12:44:49.000000000 +0000 @@ -1,4 +1,4 @@ -plasma-workspace (4:5.27.11-0ubuntu2~ubuntu22.04~ppa3) jammy; urgency=high +plasma-workspace (4:5.27.11-0ubuntu2~ubuntu22.04~ppa4) jammy; urgency=high * Add d/patches/upstream_fix-kfontinst-wayland-crash.patch diff -Nru plasma-workspace-5.27.11/debian/patches/fix-appstreamqt5-1.0-build.patch plasma-workspace-5.27.11/debian/patches/fix-appstreamqt5-1.0-build.patch --- plasma-workspace-5.27.11/debian/patches/fix-appstreamqt5-1.0-build.patch 2024-03-23 12:44:49.000000000 +0000 +++ plasma-workspace-5.27.11/debian/patches/fix-appstreamqt5-1.0-build.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,134 +0,0 @@ -From 9a941293d12bc7ffcff2327dac71209ec4438181 Mon Sep 17 00:00:00 2001 -From: Matthias Klumpp -Date: Mon, 18 Dec 2023 05:08:44 +0100 -Subject: [PATCH] Fix build with AppStreamQt5 >= 1.0 - ---- - CMakeLists.txt | 6 +++--- - applets/kicker/plugin/actionlist.cpp | 6 +++--- - runners/CMakeLists.txt | 2 +- - runners/appstream/CMakeLists.txt | 2 +- - runners/appstream/appstreamrunner.cpp | 10 +++++----- - runners/appstream/appstreamrunner.h | 2 +- - 6 files changed, 14 insertions(+), 14 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8d26973778..f0bb78e12c 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -183,12 +183,12 @@ if(FONTCONFIG_FOUND) - find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS PrintSupport) - endif() - --find_package(AppStreamQt 0.10.6) --set_package_properties(AppStreamQt PROPERTIES DESCRIPTION "Access metadata for listing available software" -+find_package(AppStreamQt5 1.0.0) -+set_package_properties(AppStreamQt5 PROPERTIES DESCRIPTION "Access metadata for listing available software" - URL "https://www.freedesktop.org/wiki/Distributions/AppStream/" - TYPE OPTIONAL) - --if(${AppStreamQt_FOUND}) -+if(${AppStreamQt5_FOUND}) - set(HAVE_APPSTREAMQT true) - endif() - -diff --git a/applets/kicker/plugin/actionlist.cpp b/applets/kicker/plugin/actionlist.cpp -index 61fc234872..c3a1148add 100644 ---- a/applets/kicker/plugin/actionlist.cpp -+++ b/applets/kicker/plugin/actionlist.cpp -@@ -32,7 +32,7 @@ - #include "containmentinterface.h" - - #ifdef HAVE_APPSTREAMQT --#include -+#include - #endif - - namespace KAStats = KActivities::Stats; -@@ -448,10 +448,10 @@ bool handleAppstreamActions(const QString &actionId, const KService::Ptr &servic - - const auto components = - appstreamPool->componentsByLaunchable(AppStream::Launchable::KindDesktopId, service->desktopEntryName() + QLatin1String(".desktop")); -- if (components.empty()) { -+ if (components.isEmpty()) { - return false; - } -- return QDesktopServices::openUrl(QUrl(QLatin1String("appstream://") + components[0].id())); -+ return QDesktopServices::openUrl(QUrl(QLatin1String("appstream://") + components.indexSafe(0)->id())); - #else - return false; - #endif -diff --git a/runners/CMakeLists.txt b/runners/CMakeLists.txt -index ec22f27d70..4216518e96 100644 ---- a/runners/CMakeLists.txt -+++ b/runners/CMakeLists.txt -@@ -14,7 +14,7 @@ add_subdirectory(shell) - add_subdirectory(webshortcuts) - add_subdirectory(windowedwidgets) - --if(AppStreamQt_FOUND) -+if(AppStreamQt5_FOUND) - add_subdirectory(appstream) - endif() - -diff --git a/runners/appstream/CMakeLists.txt b/runners/appstream/CMakeLists.txt -index 7dc43cdad9..15c486a3ea 100644 ---- a/runners/appstream/CMakeLists.txt -+++ b/runners/appstream/CMakeLists.txt -@@ -11,4 +11,4 @@ ecm_qt_declare_logging_category(krunner_appstream_SRCS - DEFAULT_SEVERITY Warning) - - kcoreaddons_add_plugin(krunner_appstream SOURCES ${krunner_appstream_SRCS} INSTALL_NAMESPACE "kf5/krunner") --target_link_libraries(krunner_appstream PUBLIC Qt::Gui KF5::Runner KF5::I18n KF5::Service AppStreamQt) -+target_link_libraries(krunner_appstream PUBLIC Qt::Gui KF5::Runner KF5::I18n KF5::Service AppStreamQt5) -diff --git a/runners/appstream/appstreamrunner.cpp b/runners/appstream/appstreamrunner.cpp -index b0dcb381ee..b3a660c8ef 100644 ---- a/runners/appstream/appstreamrunner.cpp -+++ b/runners/appstream/appstreamrunner.cpp -@@ -6,7 +6,7 @@ - - #include "appstreamrunner.h" - --#include -+#include - - #include - #include -@@ -150,17 +150,17 @@ QList InstallerRunner::findComponentsByString(const QStrin - QMutexLocker locker(&m_appstreamMutex); - QString error; - static bool warnedOnce = false; -- static bool opened = m_db.load(&error); -+ static bool opened = m_db.load(); - if (!opened) { - if (warnedOnce) { -- qCDebug(RUNNER_APPSTREAM) << "Had errors when loading AppStream metadata pool" << error; -+ qCDebug(RUNNER_APPSTREAM) << "Had errors when loading AppStream metadata pool" << m_db.lastError(); - } else { -- qCWarning(RUNNER_APPSTREAM) << "Had errors when loading AppStream metadata pool" << error; -+ qCWarning(RUNNER_APPSTREAM) << "Had errors when loading AppStream metadata pool" << m_db.lastError(); - warnedOnce = true; - } - } - -- return m_db.search(query); -+ return m_db.search(query).toList(); - } - - #include "appstreamrunner.moc" -diff --git a/runners/appstream/appstreamrunner.h b/runners/appstream/appstreamrunner.h -index 18197ab08b..b585f55c36 100644 ---- a/runners/appstream/appstreamrunner.h -+++ b/runners/appstream/appstreamrunner.h -@@ -6,7 +6,7 @@ - - #pragma once - --#include -+#include - #include - #include - --- -2.43.0 - diff -Nru plasma-workspace-5.27.11/debian/patches/series plasma-workspace-5.27.11/debian/patches/series --- plasma-workspace-5.27.11/debian/patches/series 2024-03-23 12:44:49.000000000 +0000 +++ plasma-workspace-5.27.11/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -fix-appstreamqt5-1.0-build.patch -upstream_fix-kfontinst-wayland-crash.patch diff -Nru plasma-workspace-5.27.11/debian/patches/upstream_fix-kfontinst-wayland-crash.patch plasma-workspace-5.27.11/debian/patches/upstream_fix-kfontinst-wayland-crash.patch --- plasma-workspace-5.27.11/debian/patches/upstream_fix-kfontinst-wayland-crash.patch 2024-03-23 12:44:49.000000000 +0000 +++ plasma-workspace-5.27.11/debian/patches/upstream_fix-kfontinst-wayland-crash.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,31 +0,0 @@ -From b23945618230634ae1564af0c5bd5a60d79078c6 Mon Sep 17 00:00:00 2001 -From: Nicolas Fella -Date: Fri, 22 Mar 2024 22:47:03 +0100 -Subject: [PATCH] [kfontinst] Skip window parenting on Wayland - -It does raw X11 calls, that will explode on Wayland - -BUG: 484273 -(cherry picked from commit c212b3a4221423c59046f1c5f229eef80c594ed4) ---- - kcms/kfontinst/apps/CreateParent.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/kcms/kfontinst/apps/CreateParent.h b/kcms/kfontinst/apps/CreateParent.h -index 542669333cf..cd9814a5f06 100644 ---- a/kcms/kfontinst/apps/CreateParent.h -+++ b/kcms/kfontinst/apps/CreateParent.h -@@ -21,6 +21,10 @@ - // for xid, and all other widgets can use this as their parent... - static QWidget *createParent(int xid) - { -+ if (!QX11Info::isPlatformX11()) { -+ return nullptr; -+ } -+ - if (!xid) - return nullptr; - --- -GitLab -