1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
|
From 9584b0db08cf76d890cd0d759e08f4da03f7f8ad Mon Sep 17 00:00:00 2001
From: Matthias Klumpp <matthias@tenstral.net>
Date: Sun, 17 Dec 2023 19:48:10 +0100
Subject: [PATCH] Explicitly depend on the Qt5 build of AppStreamQt
---
CMakeLists.txt | 2 +-
src/kpackage-install-handlers/CMakeLists.txt | 2 +-
src/kpackage-install-handlers/appstream/CMakeLists.txt | 2 +-
src/kpackage-install-handlers/appstream/main.cpp | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8374070..c5192bf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -47,7 +47,7 @@ if (BUILD_KPACKAGE_INSTALL_HANDLERS)
find_package(KF5I18n ${KF_DEP_VERSION} REQUIRED)
find_package(packagekitqt${QT_MAJOR_VERSION})
- find_package(AppStreamQt 0.10.4)
+ find_package(AppStreamQt5 1.0.0)
endif()
ecm_set_disabled_deprecation_versions(
diff --git a/src/kpackage-install-handlers/CMakeLists.txt b/src/kpackage-install-handlers/CMakeLists.txt
index d0bf7f0..a7c126f 100644
--- a/src/kpackage-install-handlers/CMakeLists.txt
+++ b/src/kpackage-install-handlers/CMakeLists.txt
@@ -1,5 +1,5 @@
add_subdirectory(kns)
-if(AppStreamQt_FOUND AND packagekitqt5_FOUND)
+if(AppStreamQt5_FOUND AND packagekitqt5_FOUND)
add_subdirectory(appstream)
endif()
diff --git a/src/kpackage-install-handlers/appstream/CMakeLists.txt b/src/kpackage-install-handlers/appstream/CMakeLists.txt
index 8db1bdb..9552c5f 100644
--- a/src/kpackage-install-handlers/appstream/CMakeLists.txt
+++ b/src/kpackage-install-handlers/appstream/CMakeLists.txt
@@ -1,3 +1,3 @@
add_executable(appstreamhandler main.cpp)
-target_link_libraries(appstreamhandler PK::packagekitqt5 AppStreamQt)
+target_link_libraries(appstreamhandler PK::packagekitqt5 AppStreamQt5)
install(TARGETS appstreamhandler DESTINATION ${KDE_INSTALL_LIBEXECDIR_KF}/kpackagehandlers)
diff --git a/src/kpackage-install-handlers/appstream/main.cpp b/src/kpackage-install-handlers/appstream/main.cpp
index 82328f7..8bde139 100644
--- a/src/kpackage-install-handlers/appstream/main.cpp
+++ b/src/kpackage-install-handlers/appstream/main.cpp
@@ -5,7 +5,7 @@
SPDX-License-Identifier: LGPL-2.0-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
*/
-#include <AppStreamQt/pool.h>
+#include <AppStreamQt5/pool.h>
#include <PackageKit/Daemon>
#include <QCoreApplication>
#include <QDebug>
--
2.43.0
|
