commit: 845f2fbc7aba7ba875ddea1c67539856b0025701 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Thu Apr 21 19:30:17 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Apr 21 19:30:26 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=845f2fbc
kde-apps/calendarsupport: add missing patch Closes: https://bugs.gentoo.org/839960 Signed-off-by: Sam James <sam <AT> gentoo.org> .../calendarsupport-22.03.80-unused-dep.patch | 78 ++++++++++++++++++++++ 1 file changed, 78 insertions(+) diff --git a/kde-apps/calendarsupport/files/calendarsupport-22.03.80-unused-dep.patch b/kde-apps/calendarsupport/files/calendarsupport-22.03.80-unused-dep.patch new file mode 100644 index 000000000000..3402e0855939 --- /dev/null +++ b/kde-apps/calendarsupport/files/calendarsupport-22.03.80-unused-dep.patch @@ -0,0 +1,78 @@ +From 3287867734062c60dd6d5ccc66aa03fb73795f9e Mon Sep 17 00:00:00 2001 +From: Volker Krause <[email protected]> +Date: Mon, 14 Mar 2022 17:22:48 +0100 +Subject: [PATCH] Use KWindowStateSaver for the print preview dialog + +This obsoletes KPimPrintPreviewDialog, and even allows us to remove the +dependency to pimcommon here. +--- + CMakeLists.txt | 2 -- + src/CMakeLists.txt | 1 - + src/printing/calprinter.cpp | 10 +++++----- + 3 files changed, 5 insertions(+), 8 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f684ab9..5225c82 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -59,7 +58,6 @@ find_package(KF5CalendarCore ${KF5_MIN_VERSION} CONFIG REQUIRED) + find_package(KF5IdentityManagement ${IDENTITYMANAGEMENT_LIB_VERSION} CONFIG REQUIRED) + find_package(KF5Holidays ${KF5_MIN_VERSION} CONFIG REQUIRED) + find_package(KF5AkonadiCalendar ${AKONADICALENDAR_LIB_VERSION} CONFIG REQUIRED) +-find_package(KF5PimCommon ${PIMCOMMON_LIB_VERSION} CONFIG REQUIRED) + find_package(KF5AkonadiNotes ${AKONADI_NOTES_VERSION} CONFIG REQUIRED) + + ecm_setup_version(PROJECT VARIABLE_PREFIX CALENDARSUPPORT +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index f8c2e3b..2846328 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -116,7 +116,6 @@ PRIVATE + KF5::AkonadiCore + KF5::CalendarCore + KF5::CalendarUtils +- KF5::PimCommon + ) + + set_target_properties(KF5CalendarSupport PROPERTIES +diff --git a/src/printing/calprinter.cpp b/src/printing/calprinter.cpp +index 0ef3da7..0eb7f8f 100644 +--- a/src/printing/calprinter.cpp ++++ b/src/printing/calprinter.cpp +@@ -10,11 +10,11 @@ + #include "journalprint.h" + #include "yearprint.h" + ++#include <KConfigGroup> + #include <KMessageBox> + #include <KStandardGuiItem> +-#include <QVBoxLayout> ++#include <KWindowStateSaver> + +-#include <KConfigGroup> + #include <QButtonGroup> + #include <QDialogButtonBox> + #include <QGridLayout> +@@ -23,8 +23,7 @@ + #include <QPrintPreviewDialog> + #include <QSplitter> + #include <QStackedWidget> +- +-#include <PimCommon/KPimPrintPreviewDialog> ++#include <QVBoxLayout> + + using namespace CalendarSupport; + +@@ -132,7 +131,8 @@ void CalPrinter::doPrint(PrintPlugin *selectedStyle, CalPrinter::ePrintOrientati + } + + if (preview) { +- QPointer<PimCommon::KPimPrintPreviewDialog> printPreview = new PimCommon::KPimPrintPreviewDialog(&printer); ++ QPointer<QPrintPreviewDialog> printPreview = new QPrintPreviewDialog(&printer); ++ new KWindowStateSaver(printPreview.data(), "CalendarPrintPreviewDialog"); + connect(printPreview.data(), &QPrintPreviewDialog::paintRequested, this, [selectedStyle, &printer]() { + selectedStyle->doPrint(&printer); + }); +-- +GitLab +
