gentoo resync : 11.05.2021

2 files changed, 0 insertions, 289 deletions

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
deleted file mode 100644
index 903b4b8ff30c..000000000000
--- a/kde-plasma/discover/files/discover-5.21.4-glib-2.68.patch
+++ /dev/null
@@ -1,240 +0,0 @@
-From 12f83062b01d5ba946e6f98503b72d4e58721aa4 Mon Sep 17 00:00:00 2001
-From: Aleix Pol Gonzalez <aleixpol@kde.org>
-Date: Tue, 6 Apr 2021 23:54:52 +0000
-Subject: [PATCH] Only wrap flatpak.h includes in extern "C" with older
- versions
-
-Seems to be the only way to be compatible backwards and forwards.
----
- CMakeLists.txt                                 |  1 -
- .../backends/FlatpakBackend/CMakeLists.txt     |  6 ++++++
- .../backends/FlatpakBackend/FlatpakBackend.h   |  4 +---
- .../FlatpakBackend/FlatpakFetchDataJob.h       |  4 +---
- .../FlatpakBackend/FlatpakJobTransaction.cpp   |  3 ---
- .../FlatpakBackend/FlatpakJobTransaction.h     |  4 +---
- .../backends/FlatpakBackend/FlatpakNotifier.h  |  4 +---
- .../backends/FlatpakBackend/FlatpakResource.h  |  4 +---
- .../FlatpakBackend/FlatpakSourcesBackend.h     |  4 +---
- .../FlatpakBackend/FlatpakTransactionThread.h  |  4 +---
- .../backends/FlatpakBackend/flatpak-helper.h   | 18 ++++++++++++++++++
- .../backends/FwupdBackend/CMakeLists.txt       |  3 +++
- .../backends/FwupdBackend/FwupdBackend.h       |  5 +++++
- 13 files changed, 39 insertions(+), 25 deletions(-)
- create mode 100644 libdiscover/backends/FlatpakBackend/flatpak-helper.h
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 889ded6c..a531d4de 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -37,7 +37,6 @@ pkg_check_modules(Fwupd IMPORTED_TARGET fwupd>=1.5.0)
- pkg_check_modules(Markdown IMPORTED_TARGET libmarkdown)
- find_package(KUserFeedback)
- 
--
- if(NOT CMAKE_VERSION VERSION_LESS "3.10.0")
-   # CMake 3.9+ warns about automoc on files without Q_OBJECT, and doesn't know about other macros.
-   # 3.10+ lets us provide more macro names that require automoc.
-diff --git a/libdiscover/backends/FlatpakBackend/CMakeLists.txt b/libdiscover/backends/FlatpakBackend/CMakeLists.txt
-index 49ac1085..65ba622a 100644
---- a/libdiscover/backends/FlatpakBackend/CMakeLists.txt
-+++ b/libdiscover/backends/FlatpakBackend/CMakeLists.txt
-@@ -23,8 +23,14 @@ add_library(FlatpakNotifier MODULE FlatpakNotifier.cpp)
- target_link_libraries(FlatpakNotifier Discover::Notifiers Qt5::Concurrent PkgConfig::Flatpak)
- set_target_properties(FlatpakNotifier PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR}/plasma-discover)
- 
-+if (Flatpak_VERSION VERSION_LESS 1.10.2)
-+    target_compile_definitions(flatpak-backend PRIVATE -DFLATPAK_EXTERNC_REQUIRED)
-+    target_compile_definitions(FlatpakNotifier PRIVATE -DFLATPAK_EXTERNC_REQUIRED)
-+endif()
-+
- install(TARGETS FlatpakNotifier DESTINATION ${PLUGIN_INSTALL_DIR}/discover-notifier)
- install(PROGRAMS org.kde.discover-flatpak.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
-+
- install(FILES org.kde.discover.flatpak.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR} )
- 
- ecm_install_icons(
-diff --git a/libdiscover/backends/FlatpakBackend/FlatpakBackend.h b/libdiscover/backends/FlatpakBackend/FlatpakBackend.h
-index 3b71344f..f0234cc7 100644
---- a/libdiscover/backends/FlatpakBackend/FlatpakBackend.h
-+++ b/libdiscover/backends/FlatpakBackend/FlatpakBackend.h
-@@ -18,9 +18,7 @@
- 
- #include <AppStreamQt/component.h>
- 
--extern "C" {
--#include <flatpak.h>
--}
-+#include "flatpak-helper.h"
- 
- class FlatpakSourcesBackend;
- class StandardBackendUpdater;
-diff --git a/libdiscover/backends/FlatpakBackend/FlatpakFetchDataJob.h b/libdiscover/backends/FlatpakBackend/FlatpakFetchDataJob.h
-index b9aaf80e..d63fd1bc 100644
---- a/libdiscover/backends/FlatpakBackend/FlatpakFetchDataJob.h
-+++ b/libdiscover/backends/FlatpakBackend/FlatpakFetchDataJob.h
-@@ -8,10 +8,8 @@
- #define FLATPAKFETCHDATAJOB_H
- 
- #include <QByteArray>
--extern "C" {
--#include <flatpak.h>
-+#include "flatpak-helper.h"
- #include <glib.h>
--}
- 
- class FlatpakResource;
- 
-diff --git a/libdiscover/backends/FlatpakBackend/FlatpakJobTransaction.cpp b/libdiscover/backends/FlatpakBackend/FlatpakJobTransaction.cpp
-index 9499c566..37adb046 100644
---- a/libdiscover/backends/FlatpakBackend/FlatpakJobTransaction.cpp
-+++ b/libdiscover/backends/FlatpakBackend/FlatpakJobTransaction.cpp
-@@ -13,9 +13,6 @@
- #include <QDebug>
- #include <QTimer>
- 
--extern "C" {
--}
--
- FlatpakJobTransaction::FlatpakJobTransaction(FlatpakResource *app, Role role, bool delayStart)
-     : Transaction(app->backend(), app, role, {})
-     , m_app(app)
-diff --git a/libdiscover/backends/FlatpakBackend/FlatpakJobTransaction.h b/libdiscover/backends/FlatpakBackend/FlatpakJobTransaction.h
-index ea2aafaa..0e4423ef 100644
---- a/libdiscover/backends/FlatpakBackend/FlatpakJobTransaction.h
-+++ b/libdiscover/backends/FlatpakBackend/FlatpakJobTransaction.h
-@@ -10,12 +10,10 @@
- 
- #include <Transaction/Transaction.h>
- #include <QPointer>
-+#include "flatpak-helper.h"
- 
--extern "C" {
--#include <flatpak.h>
- #include <gio/gio.h>
- #include <glib.h>
--}
- 
- class FlatpakResource;
- class FlatpakTransactionThread;
-diff --git a/libdiscover/backends/FlatpakBackend/FlatpakNotifier.h b/libdiscover/backends/FlatpakBackend/FlatpakNotifier.h
-index fa358802..a0deb83a 100644
---- a/libdiscover/backends/FlatpakBackend/FlatpakNotifier.h
-+++ b/libdiscover/backends/FlatpakBackend/FlatpakNotifier.h
-@@ -10,9 +10,7 @@
- #include <BackendNotifierModule.h>
- #include <functional>
- 
--extern "C" {
--#include <flatpak.h>
--}
-+#include "flatpak-helper.h"
- 
- class FlatpakNotifier : public BackendNotifierModule
- {
-diff --git a/libdiscover/backends/FlatpakBackend/FlatpakResource.h b/libdiscover/backends/FlatpakBackend/FlatpakResource.h
-index 880b494b..253062db 100644
---- a/libdiscover/backends/FlatpakBackend/FlatpakResource.h
-+++ b/libdiscover/backends/FlatpakBackend/FlatpakResource.h
-@@ -11,9 +11,7 @@
- 
- #include <resources/AbstractResource.h>
- 
--extern "C" {
--#include <flatpak.h>
--}
-+#include "flatpak-helper.h"
- 
- #include <AppStreamQt/component.h>
- 
-diff --git a/libdiscover/backends/FlatpakBackend/FlatpakSourcesBackend.h b/libdiscover/backends/FlatpakBackend/FlatpakSourcesBackend.h
-index b2a6c7c2..df356337 100644
---- a/libdiscover/backends/FlatpakBackend/FlatpakSourcesBackend.h
-+++ b/libdiscover/backends/FlatpakBackend/FlatpakSourcesBackend.h
-@@ -13,9 +13,7 @@
- #include <QStack>
- #include <functional>
- 
--extern "C" {
--#include <flatpak.h>
--}
-+#include "flatpak-helper.h"
- 
- class FlatpakResource;
- class FlatpakSourcesBackend : public AbstractSourcesBackend
-diff --git a/libdiscover/backends/FlatpakBackend/FlatpakTransactionThread.h b/libdiscover/backends/FlatpakBackend/FlatpakTransactionThread.h
-index b8eef827..24718f9a 100644
---- a/libdiscover/backends/FlatpakBackend/FlatpakTransactionThread.h
-+++ b/libdiscover/backends/FlatpakBackend/FlatpakTransactionThread.h
-@@ -7,11 +7,9 @@
- #ifndef FLATPAKTRANSACTIONTHREAD_H
- #define FLATPAKTRANSACTIONTHREAD_H
- 
--extern "C" {
--#include <flatpak.h>
-+#include "flatpak-helper.h"
- #include <gio/gio.h>
- #include <glib.h>
--}
- 
- #include <Transaction/Transaction.h>
- #include <QThread>
-diff --git a/libdiscover/backends/FlatpakBackend/flatpak-helper.h b/libdiscover/backends/FlatpakBackend/flatpak-helper.h
-new file mode 100644
-index 00000000..f42eee46
---- /dev/null
-+++ b/libdiscover/backends/FlatpakBackend/flatpak-helper.h
-@@ -0,0 +1,18 @@
-+/*
-+ *   SPDX-FileCopyrightText: 2021 Aleix Pol Gonzalez <aleixpol@kde.org>
-+ *
-+ *   SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
-+ */
-+
-+#ifndef FLATPAK_HELPER
-+#define FLATPAK_HELPER
-+
-+#ifdef FLATPAK_EXTERNC_REQUIRED
-+extern "C" {
-+#endif
-+#include <flatpak.h>
-+#ifdef FLATPAK_EXTERNC_REQUIRED
-+}
-+#endif
-+
-+#endif
-diff --git a/libdiscover/backends/FwupdBackend/CMakeLists.txt b/libdiscover/backends/FwupdBackend/CMakeLists.txt
-index a018f175..59c36a8d 100644
---- a/libdiscover/backends/FwupdBackend/CMakeLists.txt
-+++ b/libdiscover/backends/FwupdBackend/CMakeLists.txt
-@@ -9,6 +9,9 @@ set(fwupd-backend_SRCS
- 
- add_library(fwupd-backend MODULE ${fwupd-backend_SRCS})
- target_link_libraries(fwupd-backend Qt5::Core KF5::CoreAddons KF5::ConfigCore Discover::Common PkgConfig::Fwupd)
-+if (Fwupd_VERSION VERSION_LESS 1.5.8)
-+    target_compile_definitions(fwupd-backend PRIVATE -DFWUPD_EXTERNC_REQUIRED)
-+endif()
- 
- install(TARGETS fwupd-backend DESTINATION ${PLUGIN_INSTALL_DIR}/discover)
- 
-diff --git a/libdiscover/backends/FwupdBackend/FwupdBackend.h b/libdiscover/backends/FwupdBackend/FwupdBackend.h
-index c886384e..7b1ff180 100644
---- a/libdiscover/backends/FwupdBackend/FwupdBackend.h
-+++ b/libdiscover/backends/FwupdBackend/FwupdBackend.h
-@@ -25,9 +25,14 @@
- #include <QCryptographicHash>
- #include <QMap>
- 
-+#ifdef FWUPD_EXTERNC_REQUIRED
- extern "C" {
-+#endif
-+
- #include <fwupd.h>
-+#ifdef FWUPD_EXTERNC_REQUIRED
- }
-+#endif
- #include <glib-2.0/glib-object.h>
- 
- class QAction;
--- 
-GitLab
-
diff --git a/kde-plasma/discover/files/discover-5.21.4-missing-link.patch b/kde-plasma/discover/files/discover-5.21.4-missing-link.patch
deleted file mode 100644
index c8c8b152ea7c..000000000000
--- a/kde-plasma/discover/files/discover-5.21.4-missing-link.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 3c578beeb5d3748d9fdacae4ace42fe6098d9184 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sun, 25 Apr 2021 00:26:12 +0200
-Subject: [PATCH] Add missing Qt5Concurrent to target_link_libraries
-
-This was working as long as it was implicitly provided by KIO.
-Other backends are fine.
-
-Fixes:
-- DiscoverCommon w/ AppStreamQt
-- packagekit-backend
-
-See also: https://invent.kde.org/frameworks/kio/-/merge_requests/426
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- libdiscover/CMakeLists.txt                            | 2 +-
- libdiscover/backends/PackageKitBackend/CMakeLists.txt | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/libdiscover/CMakeLists.txt b/libdiscover/CMakeLists.txt
-index 1097ea84..3e2a6c9c 100644
---- a/libdiscover/CMakeLists.txt
-+++ b/libdiscover/CMakeLists.txt
-@@ -48,7 +48,7 @@ if(TARGET AppStreamQt)
-         appstream/AppStreamIntegration.cpp
-         appstream/AppStreamUtils.cpp
-     )
--    target_link_libraries(DiscoverCommon PRIVATE AppStreamQt)
-+    target_link_libraries(DiscoverCommon PRIVATE Qt5::Concurrent AppStreamQt)
- 
-     if(AppStreamQt_VERSION VERSION_GREATER 0.12.4)
-         target_compile_definitions(DiscoverCommon PRIVATE -DAPPSTREAM_HAS_SPDX=1)
-diff --git a/libdiscover/backends/PackageKitBackend/CMakeLists.txt b/libdiscover/backends/PackageKitBackend/CMakeLists.txt
-index cfeb38f1..466dbc49 100644
---- a/libdiscover/backends/PackageKitBackend/CMakeLists.txt
-+++ b/libdiscover/backends/PackageKitBackend/CMakeLists.txt
-@@ -19,7 +19,7 @@ ecm_qt_declare_logging_category(packagekit-backend_SRCS HEADER libdiscover_backe
- 
- add_library(packagekit-backend MODULE ${packagekit-backend_SRCS})
- 
--target_link_libraries(packagekit-backend PRIVATE Discover::Common Qt5::Core PK::packagekitqt5 KF5::ConfigGui KF5::KIOCore KF5::Archive AppStreamQt)
-+target_link_libraries(packagekit-backend PRIVATE Discover::Common Qt5::Core Qt5::Concurrent PK::packagekitqt5 KF5::ConfigGui KF5::KIOCore KF5::Archive AppStreamQt)
- install(TARGETS packagekit-backend DESTINATION ${PLUGIN_INSTALL_DIR}/discover)
- 
- if(TARGET PkgConfig::Markdown)
--- 
-2.31.1
-