[neon/kde/plasma-workspace/Neon/release] debian/patches: patch to support appstream 1.0.0

[Carlos De Maine]

Git commit 85f37f018cc873c1265e85fd87948e0087f94990 by Carlos De Maine.
Committed on 15/09/2023 at 13:53.
Pushed by carlosdem into branch 'Neon/release'.

patch to support appstream 1.0.0

A  +133  -0    debian/patches/0001_kf5_appstream_1
A  +1    -0    debian/patches/series

https://invent.kde.org/neon/kde/plasma-workspace/-/commit/85f37f018cc873c1265e85fd87948e0087f94990

diff --git a/debian/patches/0001_kf5_appstream_1 b/debian/patches/0001_kf5_appstream_1
new file mode 100644
index 0000000..c11fea1
--- /dev/null
+++ b/debian/patches/0001_kf5_appstream_1
@@ -0,0 +1,133 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 21a7632165b6b0708323ef0fe8fb323942b4ef83..a80cd3cc47a11a02b58b2ea073fec09ced9c7761 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -183,13 +183,13 @@ 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)
++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})
+-    set(HAVE_APPSTREAMQT true)
++if(${AppStreamQt5_FOUND})
++    set(HAVE_APPSTREAMQT5 true)
+ endif()
+ 
+ 
+diff --git a/applets/kicker/CMakeLists.txt b/applets/kicker/CMakeLists.txt
+index 6fd212d21d1a3603e72d664283d72fe26ae7cb31..f80fa30cf7c94999401460aac39dd7db1899136e 100644
+--- a/applets/kicker/CMakeLists.txt
++++ b/applets/kicker/CMakeLists.txt
+@@ -83,8 +83,8 @@ target_link_libraries(kickerplugin
+                       KF5::WindowSystem
+                       PW::KWorkspace)
+ 
+-if (${HAVE_APPSTREAMQT})
+-target_link_libraries(kickerplugin AppStreamQt)
++if (${HAVE_APPSTREAMQT5})
++target_link_libraries(kickerplugin AppStreamQt5)
+ endif()
+ 
+ if (${HAVE_ICU})
+diff --git a/applets/kicker/plugin/actionlist.cpp b/applets/kicker/plugin/actionlist.cpp
+index 61fc2348723c58e06dd622644054e09d46905eb8..7683a8cc5085fd0d9e7bdb48fdda1ef7c8d71056 100644
+--- a/applets/kicker/plugin/actionlist.cpp
++++ b/applets/kicker/plugin/actionlist.cpp
+@@ -31,8 +31,8 @@
+ 
+ #include "containmentinterface.h"
+ 
+-#ifdef HAVE_APPSTREAMQT
+-#include <AppStreamQt/pool.h>
++#ifdef HAVE_APPSTREAMQT5
++#include <AppStreamQt5/pool.h>
+ #endif
+ 
+ namespace KAStats = KActivities::Stats;
+@@ -410,13 +410,13 @@ bool handleEditApplicationAction(const QString &actionId, const KService::Ptr &s
+     return false;
+ }
+ 
+-#ifdef HAVE_APPSTREAMQT
++#ifdef HAVE_APPSTREAMQT5
+ Q_GLOBAL_STATIC(AppStream::Pool, appstreamPool)
+ #endif
+ 
+ QVariantList appstreamActions(const KService::Ptr &service)
+ {
+-#ifdef HAVE_APPSTREAMQT
++#ifdef HAVE_APPSTREAMQT5
+     const KService::Ptr appStreamHandler = KApplicationTrader::preferredService(QStringLiteral("x-scheme-handler/appstream"));
+ 
+     // Don't show action if we can't find any app to handle appstream:// URLs.
+@@ -441,7 +441,7 @@ bool handleAppstreamActions(const QString &actionId, const KService::Ptr &servic
+     if (actionId != QLatin1String("manageApplication")) {
+         return false;
+     }
+-#ifdef HAVE_APPSTREAMQT
++#ifdef HAVE_APPSTREAMQT5
+     if (!appstreamPool.exists()) {
+         appstreamPool->load();
+     }
+diff --git a/config-appstream.h.cmake b/config-appstream.h.cmake
+index f0e89921a0fa3f9495275a2957592307fdc475fb..8d79e61bf8efa2d83157011ce58523c9b0452df9 100644
+--- a/config-appstream.h.cmake
++++ b/config-appstream.h.cmake
+@@ -1 +1 @@
+-#cmakedefine HAVE_APPSTREAMQT 1
++#cmakedefine HAVE_APPSTREAMQT5 1
+diff --git a/runners/CMakeLists.txt b/runners/CMakeLists.txt
+index ec22f27d701f2cf815578dd70207d4fc611f67f5..4216518e9682b7ea5bbffccb28bc98eff2c37007 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 7dc43cdad93a40ba8bb636b38f2a0aaeaf9e76b4..15c486a3ea3b8d3dbb25a07d347c617b8415aa40 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 b0dcb381ee48c671b0a3d15069b59e3a8e427dce..7d0c646c18c909041adb0e7324dc70c073640da2 100644
+--- a/runners/appstream/appstreamrunner.cpp
++++ b/runners/appstream/appstreamrunner.cpp
+@@ -6,7 +6,7 @@
+ 
+ #include "appstreamrunner.h"
+ 
+-#include <AppStreamQt/icon.h>
++#include <AppStreamQt5/icon.h>
+ 
+ #include <QDebug>
+ #include <QDesktopServices>
+diff --git a/runners/appstream/appstreamrunner.h b/runners/appstream/appstreamrunner.h
+index 18197ab08b05c4b202b946c4450bf83de44e9c51..b585f55c36f680d5b83202892a35effd7a31f21a 100644
+--- a/runners/appstream/appstreamrunner.h
++++ b/runners/appstream/appstreamrunner.h
+@@ -6,7 +6,7 @@
+ 
+ #pragma once
+ 
+-#include <AppStreamQt/pool.h>
++#include <AppStreamQt5/pool.h>
+ #include <KRunner/AbstractRunner>
+ #include <QMutex>
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..2cdcb2b
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001_kf5_appstream_1