gentoo resync : 12.05.2022

2 files changed, 36 insertions, 61 deletions

diff --git a/kde-apps/kaddressbook/files/kaddressbook-21.08.3-unused-deps.patch b/kde-apps/kaddressbook/files/kaddressbook-21.08.3-unused-deps.patch
deleted file mode 100644
index 0f13513546b7..000000000000
--- a/kde-apps/kaddressbook/files/kaddressbook-21.08.3-unused-deps.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From eb9dad153f199c925ac60c0a33eca6ff0c1f9f44 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Sandro=20Knau=C3=9F?= <sknauss@kde.org>
-Date: Fri, 8 Oct 2021 17:56:50 +0000
-Subject: [PATCH] Remove unneeded dependencies
-
----
- CMakeLists.txt     | 8 --------
- src/CMakeLists.txt | 4 ----
- 3 files changed, 13 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c5e3e336..aef0ccd9 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -53,7 +53,6 @@ find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test DBus PrintS
- set(LIBKDEPIM_LIB_VERSION "5.18.3")
- set(LIBGRANTLEETHEME_LIB_VERSION "5.18.3")
- set(PIMCOMMON_LIB_VERSION "5.18.3")
--set(LIBKLEO_LIB_VERSION "5.18.3")
- set(AKONADI_SEARCH_VERSION "5.18.3")
- set(AKONADI_CONTACT_VERSION "5.18.3")
- 
-@@ -62,7 +61,6 @@ find_package(KF5DBusAddons ${KF5_MIN_VERSION} CONFIG REQUIRED)
- find_package(KF5CoreAddons ${KF5_MIN_VERSION} CONFIG REQUIRED)
- find_package(KF5KCMUtils ${KF5_MIN_VERSION} CONFIG REQUIRED)
- find_package(KF5Crash ${KF5_MIN_VERSION} REQUIRED)
--find_package(KF5Libkleo ${LIBKLEO_LIB_VERSION} CONFIG REQUIRED)
- 
- find_package(KF5DocTools ${KF5_MIN_VERSION})
- set_package_properties(KF5DocTools PROPERTIES DESCRIPTION
-@@ -79,12 +77,6 @@ find_package(KF5AkonadiSearch ${AKONADI_SEARCH_VERSION} CONFIG REQUIRED)
- find_package(KF5AkonadiContact ${AKONADI_CONTACT_VERSION} CONFIG REQUIRED)
- find_package(KF5GrantleeTheme ${LIBGRANTLEETHEME_LIB_VERSION} CONFIG REQUIRED)
- 
--set(GPGMEPP_LIB_VERSION "1.11.1")
--find_package(Gpgmepp ${GPGMEPP_LIB_VERSION} CONFIG REQUIRED)
--
--set(QGPGME_LIB_VERSION "1.11.1")
--find_package(QGpgme ${QGPGME_LIB_VERSION} CONFIG REQUIRED)
--
- include_directories(${kaddressbook_SOURCE_DIR} ${kaddressbook_BINARY_DIR})
- 
- find_package(KF5Prison ${KF5_MIN_VERSION} CONFIG REQUIRED)
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 3e756aab..ac2f5774 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -98,10 +98,6 @@ if (TARGET KUserFeedbackWidgets)
-     target_link_libraries(kaddressbookprivate PRIVATE  KUserFeedbackWidgets)
- endif()
- 
--if(QGpgme_FOUND)
--    target_link_libraries(kaddressbookprivate PRIVATE QGpgme)
--endif()
--
- target_include_directories(kaddressbookprivate PUBLIC "$<BUILD_INTERFACE:${kaddressbook_SOURCE_DIR};${kaddressbook_BINARY_DIR}>")
- 
- set_target_properties(kaddressbookprivate PROPERTIES VERSION ${KDEPIM_LIB_VERSION} SOVERSION ${KDEPIM_LIB_SOVERSION})
--- 
-GitLab
-
diff --git a/kde-apps/kaddressbook/files/kaddressbook-22.03.80-unused-dep.patch b/kde-apps/kaddressbook/files/kaddressbook-22.03.80-unused-dep.patch
new file mode 100644
index 000000000000..1a988e0c2d76
--- /dev/null
+++ b/kde-apps/kaddressbook/files/kaddressbook-22.03.80-unused-dep.patch
@@ -0,0 +1,36 @@
+From 0b5823a77372924025fb24bf245839393dbe3f70 Mon Sep 17 00:00:00 2001
+From: Laurent Montel <montel@kde.org>
+Date: Tue, 15 Mar 2022 06:57:48 +0100
+Subject: [PATCH] Use KWindowStateSaver directly
+
+---
+ src/mainwidget.cpp | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/mainwidget.cpp b/src/mainwidget.cpp
+index 440f0ff1..1372efa1 100644
+--- a/src/mainwidget.cpp
++++ b/src/mainwidget.cpp
+@@ -76,7 +76,7 @@
+ #include <QTextBrowser>
+ 
+ #include <Akonadi/ItemModifyJob>
+-#include <PimCommon/KPimPrintPreviewDialog>
++#include <KWindowStateSaver>
+ #include <QActionGroup>
+ #include <QDBusConnection>
+ #include <QHBoxLayout>
+@@ -694,7 +694,9 @@ void MainWidget::printPreview()
+     printer.setOutputFormat(QPrinter::PdfFormat);
+     printer.setCollateCopies(true);
+ 
+-    QPointer<PimCommon::KPimPrintPreviewDialog> previewdlg = new PimCommon::KPimPrintPreviewDialog(&printer, this);
++    QPointer<QPrintPreviewDialog> previewdlg = new QPrintPreviewDialog(&printer, this);
++    new KWindowStateSaver(previewdlg.data(), "KAddressBookPrintPreviewDialog");
++
+     KABPrinting::PrintingWizard wizard(&printer, mItemView->selectionModel(), this);
+     wizard.setDefaultAddressBook(currentAddressBook());
+     connect(previewdlg.data(), &QPrintPreviewDialog::paintRequested, this, [&wizard]() {
+-- 
+GitLab
+