gentoo resync : 12.05.2022

4 files changed, 60 insertions, 9 deletions

diff --git a/kde-apps/knotes/Manifest b/kde-apps/knotes/Manifest
index 4176a675e216..3b749c100ce3 100644
--- a/kde-apps/knotes/Manifest
+++ b/kde-apps/knotes/Manifest
@@ -1,5 +1,6 @@
-DIST knotes-21.08.3.tar.xz 342056 BLAKE2B ecec226c71d74ce6033d86707cdee1dae5cee823d7d3417d54788fdd1fbbdcaeaab3ea6ad95ef9cc9f631ae325966c274739cde6f133450a98e7962597bb7f5a SHA512 30950ce787fe015d5da4a882f76ea16d33016c118a80fdd0a31b64e9eafd7c7c9eaf9fcbd35e272806a45e825c8aa79189e1bd2d24f89a538f6bef2bd09c7d67
+AUX knotes-22.03.80-unused-dep.patch 1661 BLAKE2B 65d7ae7edb653be96e493fb1f0137b34b0e2b5ee2334ce679b2762fd64c974920f9fb0a9407952b193872f8a4c1a75ad15b767153e9b1593df5e9a2133fd2919 SHA512 38114e27ce70134603f861cd169aac8bc5082f04ee8804ed3dce5b1b8e704a01a6a7e8eab48d13663f3ca09ca9aebd9eeb9dcd927849bd3578a9a2998b5a97f8
 DIST knotes-21.12.3.tar.xz 344372 BLAKE2B 44b57de54fc6dd1ef811d6065da9ba309e9a5185ad8821031e7e7d8b18983e925bf65efcae37b9ae8a7e845e414ccb6b08c24234914feee9076fc745c67faa18 SHA512 45f064c94d8a8968f93f1ca733d2bb6c363e1a295ffb8610ca0e01790520d454acea8e9e090fee3365f868c8af307a727f1983ef34e3ff969494841604dfdcd6
-EBUILD knotes-21.08.3.ebuild 2084 BLAKE2B 3d404bed2404efe591c53e0526b884dc98d2c2d3754ef762a20a889358e6aadbc7654a467b3d97adc2ccbe9a25596ac411bf320940d2f83713bbdd9bbed714b9 SHA512 34e5f2aca9b34ba92470195de2660d87d13ce9e00a12faf973dcfe6bdad86f3d308c1066975d5c82e4883d07f2e5c6df40238b85d3315e75e0b30385991d43cb
-EBUILD knotes-21.12.3.ebuild 2081 BLAKE2B 13d0e04263ffd1fb3dad29acb9c8018ba25ae683eaf1e7fe0f9523572f58ebf3658e3353c0e4de79a8ae391f8b5b8e1ee644c00460667264e000316694c6c3d0 SHA512 197c53210700cfe395970c899312dc50e7b6acab3a7cf5572d0dbc592a31ea0ae1c401bd3b0bdf79566ed845d390b2aad7376ad1c95fe56afdae0b3fb342d3b6
+DIST knotes-22.04.0.tar.xz 340176 BLAKE2B a18dbf8124389ca6bd26bf97d05e00780a86040a466b0ca28759e8c13d9c8a5f6c4e0a8a6086aa9c7c531e159a03ee83eaf30907ca325199f5f3447885ca0fe5 SHA512 1b616c0dfa5daf4fc5fa4230bff1ca7f074185641441606bad4516ba1cf2f1ad6d4e06e25ca198e8f45b68c7288c525975b401c0428594edd04afbee06ea4022
+EBUILD knotes-21.12.3.ebuild 2080 BLAKE2B c11651a85c6db48f7e1ed22cfc1cbb62cd0bc42f1408302f620c88be89d1c602b05d0950cfc23a719ac8becc24e73c5ec772664e962fd4a9e2476ea4f7805b6c SHA512 1d05c386aac9fb6ec08a7b771297923d2b7834f8162ecbbfe15160b0cd3ded71e2998c1b0fe787e7e22a13bf26f2c1a438fe5f1e9686584e897263506d3502fa
+EBUILD knotes-22.04.0.ebuild 2121 BLAKE2B bc05b566fc1b039ae99bdc6ac98644116fbe3ce8d2c31a70e240c65c2d63871eabf1fedf36608eed3f3c1856839c9fcb9d69bf4de3a4114ac63c9cdd2f175d9e SHA512 8b22a1a6d1ff29b3b1718d45d4d674f9d72c1b7bb61643e856186c0e3b1bb8d5e3a8453690e20cdbfd4d0c70f9551e5d5f38553a10ae04ce6f753a412fefe7b5
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/knotes/files/knotes-22.03.80-unused-dep.patch b/kde-apps/knotes/files/knotes-22.03.80-unused-dep.patch
new file mode 100644
index 000000000000..be55b53c7bf6
--- /dev/null
+++ b/kde-apps/knotes/files/knotes-22.03.80-unused-dep.patch
@@ -0,0 +1,49 @@
+From c0cdfe376ff8e785c1af34122a8ca82a22fa9a9c Mon Sep 17 00:00:00 2001
+From: Laurent Montel <montel@kde.org>
+Date: Tue, 15 Mar 2022 06:54:35 +0100
+Subject: [PATCH] Use KWindowStateSaver
+
+---
+ src/print/knoteprinter.cpp | 12 +++++++-----
+ 1 file changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/src/print/knoteprinter.cpp b/src/print/knoteprinter.cpp
+index 0b2a408d..be0b0b15 100644
+--- a/src/print/knoteprinter.cpp
++++ b/src/print/knoteprinter.cpp
+@@ -8,7 +8,6 @@
+ #include "knotegrantleeprint.h"
+ #include "print/knoteprintobject.h"
+ 
+-#include <PimCommon/KPimPrintPreviewDialog>
+ #include <QAbstractTextDocumentLayout>
+ #include <QPainter>
+ #include <QPointer>
+@@ -17,6 +16,8 @@
+ #include <QTextDocument>
+ 
+ #include <KMessageBox>
++#include <KWindowStateSaver>
++#include <QPrintPreviewDialog>
+ 
+ #include "knotes_debug.h"
+ #include <KLocalizedString>
+@@ -44,10 +45,11 @@ void KNotePrinter::doPrintPreview(const QString &htmlText)
+     QPrinter printer(QPrinter::HighResolution);
+     printer.setOutputFormat(QPrinter::PdfFormat);
+     printer.setCollateCopies(true);
+-    PimCommon::KPimPrintPreviewDialog previewdlg(&printer, nullptr);
+-
+-    connect(&previewdlg, &QPrintPreviewDialog::paintRequested, this, &KNotePrinter::slotPrinterPage);
+-    previewdlg.exec();
++    QPointer<QPrintPreviewDialog> previewdlg = new QPrintPreviewDialog(&printer);
++    new KWindowStateSaver(previewdlg.data(), "KNotePrintPreviewDialog");
++    connect(previewdlg.data(), &QPrintPreviewDialog::paintRequested, this, &KNotePrinter::slotPrinterPage);
++    previewdlg->exec();
++    delete previewdlg;
+ }
+ 
+ void KNotePrinter::slotPrinterPage(QPrinter *printer)
+-- 
+GitLab
+
diff --git a/kde-apps/knotes/knotes-21.12.3.ebuild b/kde-apps/knotes/knotes-21.12.3.ebuild
index 7624bbcf5210..0882812e2b87 100644
--- a/kde-apps/knotes/knotes-21.12.3.ebuild
+++ b/kde-apps/knotes/knotes-21.12.3.ebuild
@@ -17,7 +17,7 @@ https://kontact.kde.org/components/knotes/"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="X"
 
 DEPEND="
diff --git a/kde-apps/knotes/knotes-21.08.3.ebuild b/kde-apps/knotes/knotes-22.04.0.ebuild
index 1a14914eac67..662404df1673 100644
--- a/kde-apps/knotes/knotes-21.08.3.ebuild
+++ b/kde-apps/knotes/knotes-22.04.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -6,22 +6,21 @@ EAPI=8
 ECM_HANDBOOK="optional"
 ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.84.0
+KFMIN=5.92.0
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
 DESCRIPTION="Note taking application"
 HOMEPAGE="https://apps.kde.org/knotes/
-https://kontact.kde.org/components/knotes.html"
+https://kontact.kde.org/components/knotes/"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="X"
 
 DEPEND="
-	dev-libs/grantlee:5
 	dev-libs/libxslt
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5
@@ -67,6 +66,8 @@ RDEPEND="${DEPEND}
 	>=kde-apps/kdepim-runtime-${PVCUT}:5
 "
 
+PATCHES=( "${FILESDIR}/${PN}-22.03.80-unused-dep.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package X Qt5X11Extras)