1 |
commit: 05378df80892dea6bd44dfe58e64fb9ce840e3d3 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat May 1 18:44:15 2021 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat May 1 21:21:55 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05378df8 |
7 |
|
8 |
kde-plasma/discover: Fix build with dev-libs/glib-2.68 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/787155 |
11 |
Package-Manager: Portage-3.0.18, Repoman-3.0.3 |
12 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
13 |
|
14 |
kde-plasma/discover/discover-5.21.4.ebuild | 5 +- |
15 |
.../discover/files/discover-5.21.4-glib-2.68.patch | 240 +++++++++++++++++++++ |
16 |
2 files changed, 244 insertions(+), 1 deletion(-) |
17 |
|
18 |
diff --git a/kde-plasma/discover/discover-5.21.4.ebuild b/kde-plasma/discover/discover-5.21.4.ebuild |
19 |
index 2c50bd9597f..e32fb61e4cd 100644 |
20 |
--- a/kde-plasma/discover/discover-5.21.4.ebuild |
21 |
+++ b/kde-plasma/discover/discover-5.21.4.ebuild |
22 |
@@ -56,7 +56,10 @@ RDEPEND="${DEPEND} |
23 |
>=kde-frameworks/kirigami-${KFMIN}:5 |
24 |
" |
25 |
|
26 |
-PATCHES=( "${FILESDIR}/${P}-missing-link.patch" ) # bug 785457 |
27 |
+PATCHES=( |
28 |
+ "${FILESDIR}/${P}-missing-link.patch" # bug 785457 |
29 |
+ "${FILESDIR}/${P}-glib-2.68.patch" # bug 787155 |
30 |
+) |
31 |
|
32 |
src_prepare() { |
33 |
ecm_src_prepare |
34 |
|
35 |
diff --git a/kde-plasma/discover/files/discover-5.21.4-glib-2.68.patch b/kde-plasma/discover/files/discover-5.21.4-glib-2.68.patch |
36 |
new file mode 100644 |
37 |
index 00000000000..903b4b8ff30 |
38 |
--- /dev/null |
39 |
+++ b/kde-plasma/discover/files/discover-5.21.4-glib-2.68.patch |
40 |
@@ -0,0 +1,240 @@ |
41 |
+From 12f83062b01d5ba946e6f98503b72d4e58721aa4 Mon Sep 17 00:00:00 2001 |
42 |
+From: Aleix Pol Gonzalez <aleixpol@×××.org> |
43 |
+Date: Tue, 6 Apr 2021 23:54:52 +0000 |
44 |
+Subject: [PATCH] Only wrap flatpak.h includes in extern "C" with older |
45 |
+ versions |
46 |
+ |
47 |
+Seems to be the only way to be compatible backwards and forwards. |
48 |
+--- |
49 |
+ CMakeLists.txt | 1 - |
50 |
+ .../backends/FlatpakBackend/CMakeLists.txt | 6 ++++++ |
51 |
+ .../backends/FlatpakBackend/FlatpakBackend.h | 4 +--- |
52 |
+ .../FlatpakBackend/FlatpakFetchDataJob.h | 4 +--- |
53 |
+ .../FlatpakBackend/FlatpakJobTransaction.cpp | 3 --- |
54 |
+ .../FlatpakBackend/FlatpakJobTransaction.h | 4 +--- |
55 |
+ .../backends/FlatpakBackend/FlatpakNotifier.h | 4 +--- |
56 |
+ .../backends/FlatpakBackend/FlatpakResource.h | 4 +--- |
57 |
+ .../FlatpakBackend/FlatpakSourcesBackend.h | 4 +--- |
58 |
+ .../FlatpakBackend/FlatpakTransactionThread.h | 4 +--- |
59 |
+ .../backends/FlatpakBackend/flatpak-helper.h | 18 ++++++++++++++++++ |
60 |
+ .../backends/FwupdBackend/CMakeLists.txt | 3 +++ |
61 |
+ .../backends/FwupdBackend/FwupdBackend.h | 5 +++++ |
62 |
+ 13 files changed, 39 insertions(+), 25 deletions(-) |
63 |
+ create mode 100644 libdiscover/backends/FlatpakBackend/flatpak-helper.h |
64 |
+ |
65 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
66 |
+index 889ded6c..a531d4de 100644 |
67 |
+--- a/CMakeLists.txt |
68 |
++++ b/CMakeLists.txt |
69 |
+@@ -37,7 +37,6 @@ pkg_check_modules(Fwupd IMPORTED_TARGET fwupd>=1.5.0) |
70 |
+ pkg_check_modules(Markdown IMPORTED_TARGET libmarkdown) |
71 |
+ find_package(KUserFeedback) |
72 |
+ |
73 |
+- |
74 |
+ if(NOT CMAKE_VERSION VERSION_LESS "3.10.0") |
75 |
+ # CMake 3.9+ warns about automoc on files without Q_OBJECT, and doesn't know about other macros. |
76 |
+ # 3.10+ lets us provide more macro names that require automoc. |
77 |
+diff --git a/libdiscover/backends/FlatpakBackend/CMakeLists.txt b/libdiscover/backends/FlatpakBackend/CMakeLists.txt |
78 |
+index 49ac1085..65ba622a 100644 |
79 |
+--- a/libdiscover/backends/FlatpakBackend/CMakeLists.txt |
80 |
++++ b/libdiscover/backends/FlatpakBackend/CMakeLists.txt |
81 |
+@@ -23,8 +23,14 @@ add_library(FlatpakNotifier MODULE FlatpakNotifier.cpp) |
82 |
+ target_link_libraries(FlatpakNotifier Discover::Notifiers Qt5::Concurrent PkgConfig::Flatpak) |
83 |
+ set_target_properties(FlatpakNotifier PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR}/plasma-discover) |
84 |
+ |
85 |
++if (Flatpak_VERSION VERSION_LESS 1.10.2) |
86 |
++ target_compile_definitions(flatpak-backend PRIVATE -DFLATPAK_EXTERNC_REQUIRED) |
87 |
++ target_compile_definitions(FlatpakNotifier PRIVATE -DFLATPAK_EXTERNC_REQUIRED) |
88 |
++endif() |
89 |
++ |
90 |
+ install(TARGETS FlatpakNotifier DESTINATION ${PLUGIN_INSTALL_DIR}/discover-notifier) |
91 |
+ install(PROGRAMS org.kde.discover-flatpak.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) |
92 |
++ |
93 |
+ install(FILES org.kde.discover.flatpak.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR} ) |
94 |
+ |
95 |
+ ecm_install_icons( |
96 |
+diff --git a/libdiscover/backends/FlatpakBackend/FlatpakBackend.h b/libdiscover/backends/FlatpakBackend/FlatpakBackend.h |
97 |
+index 3b71344f..f0234cc7 100644 |
98 |
+--- a/libdiscover/backends/FlatpakBackend/FlatpakBackend.h |
99 |
++++ b/libdiscover/backends/FlatpakBackend/FlatpakBackend.h |
100 |
+@@ -18,9 +18,7 @@ |
101 |
+ |
102 |
+ #include <AppStreamQt/component.h> |
103 |
+ |
104 |
+-extern "C" { |
105 |
+-#include <flatpak.h> |
106 |
+-} |
107 |
++#include "flatpak-helper.h" |
108 |
+ |
109 |
+ class FlatpakSourcesBackend; |
110 |
+ class StandardBackendUpdater; |
111 |
+diff --git a/libdiscover/backends/FlatpakBackend/FlatpakFetchDataJob.h b/libdiscover/backends/FlatpakBackend/FlatpakFetchDataJob.h |
112 |
+index b9aaf80e..d63fd1bc 100644 |
113 |
+--- a/libdiscover/backends/FlatpakBackend/FlatpakFetchDataJob.h |
114 |
++++ b/libdiscover/backends/FlatpakBackend/FlatpakFetchDataJob.h |
115 |
+@@ -8,10 +8,8 @@ |
116 |
+ #define FLATPAKFETCHDATAJOB_H |
117 |
+ |
118 |
+ #include <QByteArray> |
119 |
+-extern "C" { |
120 |
+-#include <flatpak.h> |
121 |
++#include "flatpak-helper.h" |
122 |
+ #include <glib.h> |
123 |
+-} |
124 |
+ |
125 |
+ class FlatpakResource; |
126 |
+ |
127 |
+diff --git a/libdiscover/backends/FlatpakBackend/FlatpakJobTransaction.cpp b/libdiscover/backends/FlatpakBackend/FlatpakJobTransaction.cpp |
128 |
+index 9499c566..37adb046 100644 |
129 |
+--- a/libdiscover/backends/FlatpakBackend/FlatpakJobTransaction.cpp |
130 |
++++ b/libdiscover/backends/FlatpakBackend/FlatpakJobTransaction.cpp |
131 |
+@@ -13,9 +13,6 @@ |
132 |
+ #include <QDebug> |
133 |
+ #include <QTimer> |
134 |
+ |
135 |
+-extern "C" { |
136 |
+-} |
137 |
+- |
138 |
+ FlatpakJobTransaction::FlatpakJobTransaction(FlatpakResource *app, Role role, bool delayStart) |
139 |
+ : Transaction(app->backend(), app, role, {}) |
140 |
+ , m_app(app) |
141 |
+diff --git a/libdiscover/backends/FlatpakBackend/FlatpakJobTransaction.h b/libdiscover/backends/FlatpakBackend/FlatpakJobTransaction.h |
142 |
+index ea2aafaa..0e4423ef 100644 |
143 |
+--- a/libdiscover/backends/FlatpakBackend/FlatpakJobTransaction.h |
144 |
++++ b/libdiscover/backends/FlatpakBackend/FlatpakJobTransaction.h |
145 |
+@@ -10,12 +10,10 @@ |
146 |
+ |
147 |
+ #include <Transaction/Transaction.h> |
148 |
+ #include <QPointer> |
149 |
++#include "flatpak-helper.h" |
150 |
+ |
151 |
+-extern "C" { |
152 |
+-#include <flatpak.h> |
153 |
+ #include <gio/gio.h> |
154 |
+ #include <glib.h> |
155 |
+-} |
156 |
+ |
157 |
+ class FlatpakResource; |
158 |
+ class FlatpakTransactionThread; |
159 |
+diff --git a/libdiscover/backends/FlatpakBackend/FlatpakNotifier.h b/libdiscover/backends/FlatpakBackend/FlatpakNotifier.h |
160 |
+index fa358802..a0deb83a 100644 |
161 |
+--- a/libdiscover/backends/FlatpakBackend/FlatpakNotifier.h |
162 |
++++ b/libdiscover/backends/FlatpakBackend/FlatpakNotifier.h |
163 |
+@@ -10,9 +10,7 @@ |
164 |
+ #include <BackendNotifierModule.h> |
165 |
+ #include <functional> |
166 |
+ |
167 |
+-extern "C" { |
168 |
+-#include <flatpak.h> |
169 |
+-} |
170 |
++#include "flatpak-helper.h" |
171 |
+ |
172 |
+ class FlatpakNotifier : public BackendNotifierModule |
173 |
+ { |
174 |
+diff --git a/libdiscover/backends/FlatpakBackend/FlatpakResource.h b/libdiscover/backends/FlatpakBackend/FlatpakResource.h |
175 |
+index 880b494b..253062db 100644 |
176 |
+--- a/libdiscover/backends/FlatpakBackend/FlatpakResource.h |
177 |
++++ b/libdiscover/backends/FlatpakBackend/FlatpakResource.h |
178 |
+@@ -11,9 +11,7 @@ |
179 |
+ |
180 |
+ #include <resources/AbstractResource.h> |
181 |
+ |
182 |
+-extern "C" { |
183 |
+-#include <flatpak.h> |
184 |
+-} |
185 |
++#include "flatpak-helper.h" |
186 |
+ |
187 |
+ #include <AppStreamQt/component.h> |
188 |
+ |
189 |
+diff --git a/libdiscover/backends/FlatpakBackend/FlatpakSourcesBackend.h b/libdiscover/backends/FlatpakBackend/FlatpakSourcesBackend.h |
190 |
+index b2a6c7c2..df356337 100644 |
191 |
+--- a/libdiscover/backends/FlatpakBackend/FlatpakSourcesBackend.h |
192 |
++++ b/libdiscover/backends/FlatpakBackend/FlatpakSourcesBackend.h |
193 |
+@@ -13,9 +13,7 @@ |
194 |
+ #include <QStack> |
195 |
+ #include <functional> |
196 |
+ |
197 |
+-extern "C" { |
198 |
+-#include <flatpak.h> |
199 |
+-} |
200 |
++#include "flatpak-helper.h" |
201 |
+ |
202 |
+ class FlatpakResource; |
203 |
+ class FlatpakSourcesBackend : public AbstractSourcesBackend |
204 |
+diff --git a/libdiscover/backends/FlatpakBackend/FlatpakTransactionThread.h b/libdiscover/backends/FlatpakBackend/FlatpakTransactionThread.h |
205 |
+index b8eef827..24718f9a 100644 |
206 |
+--- a/libdiscover/backends/FlatpakBackend/FlatpakTransactionThread.h |
207 |
++++ b/libdiscover/backends/FlatpakBackend/FlatpakTransactionThread.h |
208 |
+@@ -7,11 +7,9 @@ |
209 |
+ #ifndef FLATPAKTRANSACTIONTHREAD_H |
210 |
+ #define FLATPAKTRANSACTIONTHREAD_H |
211 |
+ |
212 |
+-extern "C" { |
213 |
+-#include <flatpak.h> |
214 |
++#include "flatpak-helper.h" |
215 |
+ #include <gio/gio.h> |
216 |
+ #include <glib.h> |
217 |
+-} |
218 |
+ |
219 |
+ #include <Transaction/Transaction.h> |
220 |
+ #include <QThread> |
221 |
+diff --git a/libdiscover/backends/FlatpakBackend/flatpak-helper.h b/libdiscover/backends/FlatpakBackend/flatpak-helper.h |
222 |
+new file mode 100644 |
223 |
+index 00000000..f42eee46 |
224 |
+--- /dev/null |
225 |
++++ b/libdiscover/backends/FlatpakBackend/flatpak-helper.h |
226 |
+@@ -0,0 +1,18 @@ |
227 |
++/* |
228 |
++ * SPDX-FileCopyrightText: 2021 Aleix Pol Gonzalez <aleixpol@×××.org> |
229 |
++ * |
230 |
++ * SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL |
231 |
++ */ |
232 |
++ |
233 |
++#ifndef FLATPAK_HELPER |
234 |
++#define FLATPAK_HELPER |
235 |
++ |
236 |
++#ifdef FLATPAK_EXTERNC_REQUIRED |
237 |
++extern "C" { |
238 |
++#endif |
239 |
++#include <flatpak.h> |
240 |
++#ifdef FLATPAK_EXTERNC_REQUIRED |
241 |
++} |
242 |
++#endif |
243 |
++ |
244 |
++#endif |
245 |
+diff --git a/libdiscover/backends/FwupdBackend/CMakeLists.txt b/libdiscover/backends/FwupdBackend/CMakeLists.txt |
246 |
+index a018f175..59c36a8d 100644 |
247 |
+--- a/libdiscover/backends/FwupdBackend/CMakeLists.txt |
248 |
++++ b/libdiscover/backends/FwupdBackend/CMakeLists.txt |
249 |
+@@ -9,6 +9,9 @@ set(fwupd-backend_SRCS |
250 |
+ |
251 |
+ add_library(fwupd-backend MODULE ${fwupd-backend_SRCS}) |
252 |
+ target_link_libraries(fwupd-backend Qt5::Core KF5::CoreAddons KF5::ConfigCore Discover::Common PkgConfig::Fwupd) |
253 |
++if (Fwupd_VERSION VERSION_LESS 1.5.8) |
254 |
++ target_compile_definitions(fwupd-backend PRIVATE -DFWUPD_EXTERNC_REQUIRED) |
255 |
++endif() |
256 |
+ |
257 |
+ install(TARGETS fwupd-backend DESTINATION ${PLUGIN_INSTALL_DIR}/discover) |
258 |
+ |
259 |
+diff --git a/libdiscover/backends/FwupdBackend/FwupdBackend.h b/libdiscover/backends/FwupdBackend/FwupdBackend.h |
260 |
+index c886384e..7b1ff180 100644 |
261 |
+--- a/libdiscover/backends/FwupdBackend/FwupdBackend.h |
262 |
++++ b/libdiscover/backends/FwupdBackend/FwupdBackend.h |
263 |
+@@ -25,9 +25,14 @@ |
264 |
+ #include <QCryptographicHash> |
265 |
+ #include <QMap> |
266 |
+ |
267 |
++#ifdef FWUPD_EXTERNC_REQUIRED |
268 |
+ extern "C" { |
269 |
++#endif |
270 |
++ |
271 |
+ #include <fwupd.h> |
272 |
++#ifdef FWUPD_EXTERNC_REQUIRED |
273 |
+ } |
274 |
++#endif |
275 |
+ #include <glib-2.0/glib-object.h> |
276 |
+ |
277 |
+ class QAction; |
278 |
+-- |
279 |
+GitLab |
280 |
+ |