From 752d6256e5204b958b0ef7905675a940b5e9172f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 12 May 2022 16:42:50 +0300 Subject: gentoo resync : 12.05.2022 --- kde-apps/pimcommon/Manifest | 8 +- .../files/pimcommon-22.03.80-unused-dep-1.patch | 131 +++++++++++++++++++++ .../files/pimcommon-22.03.80-unused-dep-2.patch | 38 ++++++ kde-apps/pimcommon/pimcommon-21.08.3.ebuild | 74 ------------ kde-apps/pimcommon/pimcommon-21.12.3.ebuild | 2 +- kde-apps/pimcommon/pimcommon-22.04.0.ebuild | 65 ++++++++++ 6 files changed, 240 insertions(+), 78 deletions(-) create mode 100644 kde-apps/pimcommon/files/pimcommon-22.03.80-unused-dep-1.patch create mode 100644 kde-apps/pimcommon/files/pimcommon-22.03.80-unused-dep-2.patch delete mode 100644 kde-apps/pimcommon/pimcommon-21.08.3.ebuild create mode 100644 kde-apps/pimcommon/pimcommon-22.04.0.ebuild (limited to 'kde-apps/pimcommon') diff --git a/kde-apps/pimcommon/Manifest b/kde-apps/pimcommon/Manifest index e30e657f98b5..5cc3c390ecab 100644 --- a/kde-apps/pimcommon/Manifest +++ b/kde-apps/pimcommon/Manifest @@ -1,5 +1,7 @@ -DIST pimcommon-21.08.3.tar.xz 368900 BLAKE2B 293d4d8ef29525bc7fdf439d7b8e356af5c8c959f0a08c1cd99b62080b605155dd1a44ca10891c8cd3d49ba9b2336d92ff766de3308f590862e9afd054f74967 SHA512 cb5c285bb92119507b09dbe9ca2fc1ec614ff23c33e04e4c821d499195aba48df00b79185877e4caf2fd6022dce7d1912bd83979049e66d0c5a812c14697fe7e +AUX pimcommon-22.03.80-unused-dep-1.patch 3874 BLAKE2B 18b976262ba5dfe56f29b7f00d443696d1080c20cafad8692e90da48b47d85bcc3f40244121ee2f54440df875019729449fe9cad9df07e4a5232d41677744cb7 SHA512 9b1480e7f97f144bcc7d739b93308e1d4a550b46cc05cd17b3239e0b27f6c688754767356fbfb67350958beba6373d00c475093d3ee2a857972faaba7ddbb9ca +AUX pimcommon-22.03.80-unused-dep-2.patch 1319 BLAKE2B 6bcf6d372787f3587ebfc13edea168333455fb4dcefe7f82767d9b35d628cc6d0b6cea4bc6c981a33b7528a63a0d3b0ca5b95ee391c02bcacc3e8287c8cd1ae5 SHA512 b220770ea4e4d1e37ca232842c026f1b68c667b0cf5843b3217b3298f4cb4ac90ffc9eb4f0adcaed5580a8ce54b2f82edd7c23389ed65c55f27be8b9409d7b46 DIST pimcommon-21.12.3.tar.xz 372476 BLAKE2B 216828abd9cdfbee5a0bc92bb2ebe4ecebc4ed9595d7528925e28723e698137953ad9c9d84cc550e082447ef64642cab858b346689af67e26baa3cf5ee4610d4 SHA512 f7b6164200eac4ced1d7e42a7ef5f7f41b89b9a981d07cd98763b3a8068c892dd30ab3c0252a62e827e0fa62a96a84ff80188c5bac71c3f42e3cfcb85c6fa2ea -EBUILD pimcommon-21.08.3.ebuild 1798 BLAKE2B 37cd8a3515522c69768fdbb2efa68a1f776a4de121445d91f1620fc5555c40c1da40224fc3cb69e95b392c87c18a2e3585febfe3987d00fb51ce73f7171ed6fe SHA512 17ffc20cf78e5477b6bde4536d27faf0de1fe0e4f0e84652e6a170da4fec76146265e857739de50f7212dc9d716ab51b642d41f3ada59d728147d6fb3622b91b -EBUILD pimcommon-21.12.3.ebuild 1633 BLAKE2B 8de4f33200ac3324e27b7405d66682d96b6b478abab9fb856d2f9e4be0e5bd88ff7e046f316e0300187fa07f5df720f15a42a5720cc8abd90354351ae78c2442 SHA512 d82229f8898d75526f5b1edf3435fb5a7612571770abb9c4f7eff0016790553f5cff88f5e03b5643dd7454156304bf0f3edf25d8367ab281656f0986a2475451 +DIST pimcommon-22.04.0.tar.xz 374972 BLAKE2B 84e395e2a9ff5e7a134661a816e7d9ba506fee902340067621fd0abba6f3ac1e4c77991991c1df5a426bf2c41e63d356e291a42c6d24c51abff25f21bd584bae SHA512 11912dfcbbb01bde6e06470fc77b531a431a91a747d564b8a89e8297a20bf74a8d55dba12b4ce939a9b948f6ef1ce1602ac4805ea4aa496bdae16b6a924519a2 +EBUILD pimcommon-21.12.3.ebuild 1632 BLAKE2B 7bd561f8d2b6b529402b64ab576ed60534f1b24aa1cd3504f52f41c7ccd23808a78ce5c346f9feed2244c5c2373fc01e1dbfe97e28962357fbe2df9c4d291b6b SHA512 76197bfac3a6fae2fd11301f4ab6e816c9240c45d7614924f764562659aa81720e7f3b2ce33f98861df059e996af9723a4d23a2126ee781eccf6651f3ad83224 +EBUILD pimcommon-22.04.0.ebuild 1664 BLAKE2B 5ee047d355e91b07cb5c0bc4b7fd3939c0c2f559c542ff45c17df5ce3ee043ff0c6f56a3c874f6cca800aeb313872d76a7f6665ac6048f42c9491607e6a78eed SHA512 6c1ff12aaaab105226720ebfcdbbb73a633cd0654b7b201ca803da3616bf20b0f6efd55571fc665918ebd7a1b36f3e01415979079fb3e2b94b77eb31297f38bc MISC metadata.xml 409 BLAKE2B efa27a2a8769a56200077d2d606e930a14fe7b8dad531386da39675c501ea7298939b6c197b668379430840b002c0a5ff34da592fcb2af18734649cb5d527f6c SHA512 0966b96a06e7315574724c75c6c3c680b6ea7da71278885ae65d214ca6a18a4b2d11b101221caa89ef5682d91f7a4cc7c2108f9741072cb12f97e95af0bcb09b diff --git a/kde-apps/pimcommon/files/pimcommon-22.03.80-unused-dep-1.patch b/kde-apps/pimcommon/files/pimcommon-22.03.80-unused-dep-1.patch new file mode 100644 index 000000000000..d2ffd9c1d3e3 --- /dev/null +++ b/kde-apps/pimcommon/files/pimcommon-22.03.80-unused-dep-1.patch @@ -0,0 +1,131 @@ +From 9acb24cc6c35a98d90da94a72c13ca5b20c88b26 Mon Sep 17 00:00:00 2001 +From: Laurent Montel +Date: Tue, 15 Mar 2022 07:00:44 +0100 +Subject: [PATCH] not used now (kpimprintpreviewdialog) + +--- + src/pimcommon/CMakeLists.txt | 3 -- + .../widgets/kpimprintpreviewdialog.cpp | 44 ------------------- + .../widgets/kpimprintpreviewdialog.h | 31 ------------- + 3 files changed, 78 deletions(-) + delete mode 100644 src/pimcommon/widgets/kpimprintpreviewdialog.cpp + delete mode 100644 src/pimcommon/widgets/kpimprintpreviewdialog.h + +diff --git a/src/pimcommon/CMakeLists.txt b/src/pimcommon/CMakeLists.txt +index 7af8744..349d2f4 100644 +--- a/src/pimcommon/CMakeLists.txt ++++ b/src/pimcommon/CMakeLists.txt +@@ -99,7 +99,6 @@ target_sources(KF5PimCommon PRIVATE + widgets/configureimmutablewidgetutils.cpp + widgets/kactionmenuchangecase.cpp + widgets/spellchecklineedit.cpp +- widgets/kpimprintpreviewdialog.cpp + widgets/lineeditwithcompleterng.cpp + widgets/customlogwidget.cpp + customtools/customtoolsplugin.cpp +@@ -143,7 +142,6 @@ target_sources(KF5PimCommon PRIVATE + translator/translatorwidget.h + translator/translatorutil.h + widgets/renamefiledialog.h +- widgets/kpimprintpreviewdialog.h + widgets/spellchecklineedit.h + widgets/customtreeview.h + widgets/lineeditwithcompleterng.h +@@ -376,7 +374,6 @@ ecm_generate_headers(PimCommon_Camelcasewidgets_HEADERS + RenameFileDialog + SimpleStringListEditor + KActionMenuChangeCase +- KPimPrintPreviewDialog + LineEditWithCompleterNg + CustomLogWidget + PurposeMenuWidget +diff --git a/src/pimcommon/widgets/kpimprintpreviewdialog.cpp b/src/pimcommon/widgets/kpimprintpreviewdialog.cpp +deleted file mode 100644 +index 8717ecf..0000000 +--- a/src/pimcommon/widgets/kpimprintpreviewdialog.cpp ++++ /dev/null +@@ -1,44 +0,0 @@ +-/* +- SPDX-FileCopyrightText: 2015-2022 Laurent Montel +- +- SPDX-License-Identifier: GPL-2.0-or-later +-*/ +- +-#include "kpimprintpreviewdialog.h" +-#include +-#include +- +-using namespace PimCommon; +- +-KPimPrintPreviewDialog::KPimPrintPreviewDialog(QWidget *parent) +- : QPrintPreviewDialog(parent) +-{ +- readConfig(); +-} +- +-KPimPrintPreviewDialog::KPimPrintPreviewDialog(QPrinter *printer, QWidget *parent) +- : QPrintPreviewDialog(printer, parent) +-{ +- readConfig(); +-} +- +-KPimPrintPreviewDialog::~KPimPrintPreviewDialog() +-{ +- writeConfig(); +-} +- +-void KPimPrintPreviewDialog::readConfig() +-{ +- KConfigGroup group(KSharedConfig::openStateConfig(), "KPimPrintPreviewDialog"); +- const QSize size = group.readEntry("Size", QSize(800, 600)); +- if (size.isValid()) { +- resize(size); +- } +-} +- +-void KPimPrintPreviewDialog::writeConfig() +-{ +- KConfigGroup group(KSharedConfig::openStateConfig(), "KPimPrintPreviewDialog"); +- group.writeEntry("Size", size()); +- group.sync(); +-} +diff --git a/src/pimcommon/widgets/kpimprintpreviewdialog.h b/src/pimcommon/widgets/kpimprintpreviewdialog.h +deleted file mode 100644 +index 978939a..0000000 +--- a/src/pimcommon/widgets/kpimprintpreviewdialog.h ++++ /dev/null +@@ -1,31 +0,0 @@ +-/* +- SPDX-FileCopyrightText: 2015-2022 Laurent Montel +- +- SPDX-License-Identifier: GPL-2.0-or-later +-*/ +- +-#pragma once +- +-#include "pimcommon_export.h" +-#include +- +-namespace PimCommon +-{ +-/** +- * @brief The KPimPrintPreviewDialog class +- * @author Laurent Montel +- */ +-class PIMCOMMON_EXPORT KPimPrintPreviewDialog : public QPrintPreviewDialog +-{ +- Q_OBJECT +-public: +- explicit KPimPrintPreviewDialog(QWidget *parent = nullptr); +- explicit KPimPrintPreviewDialog(QPrinter *printer, QWidget *parent = nullptr); +- ~KPimPrintPreviewDialog() override; +- +-private: +- void readConfig(); +- void writeConfig(); +-}; +-} +- +-- +GitLab + diff --git a/kde-apps/pimcommon/files/pimcommon-22.03.80-unused-dep-2.patch b/kde-apps/pimcommon/files/pimcommon-22.03.80-unused-dep-2.patch new file mode 100644 index 000000000000..bba55e966e95 --- /dev/null +++ b/kde-apps/pimcommon/files/pimcommon-22.03.80-unused-dep-2.patch @@ -0,0 +1,38 @@ +From 9fd75aab1bcb4a3be256cfd1a2730027d912b79b Mon Sep 17 00:00:00 2001 +From: Volker Krause +Date: Tue, 15 Mar 2022 18:26:59 +0100 +Subject: [PATCH] Remove the now unused Qt::PrintSupport dependency + +--- + CMakeLists.txt | 2 +- + src/pimcommon/CMakeLists.txt | 1 - + 2 files changed, 1 insertion(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 43e0c39..9d9cb8e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -46,7 +46,7 @@ set(KLDAP_LIB_VERSION "5.19.80") + set(AKONADICONTACT_LIB_VERSION "5.19.80") + set(AKONADI_VERSION "5.19.80") + +-find_package(Qt${QT_MAJOR_VERSION} ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets DBus Network Test Xml PrintSupport) ++find_package(Qt${QT_MAJOR_VERSION} ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets DBus Network Test Xml) + + find_package(KF5Archive ${KF5_MIN_VERSION} CONFIG REQUIRED) + find_package(KF5Codecs ${KF5_MIN_VERSION} CONFIG REQUIRED) +diff --git a/src/pimcommon/CMakeLists.txt b/src/pimcommon/CMakeLists.txt +index 349d2f4..beeef6f 100644 +--- a/src/pimcommon/CMakeLists.txt ++++ b/src/pimcommon/CMakeLists.txt +@@ -201,7 +201,6 @@ target_link_libraries(KF5PimCommon + KF5::NewStuff + KF5::XmlGui + KF5::KIOWidgets +- Qt${QT_MAJOR_VERSION}::PrintSupport + KF5::ItemViews + KF5::NewStuff + ) +-- +GitLab + diff --git a/kde-apps/pimcommon/pimcommon-21.08.3.ebuild b/kde-apps/pimcommon/pimcommon-21.08.3.ebuild deleted file mode 100644 index 2a54f2b43ee5..000000000000 --- a/kde-apps/pimcommon/pimcommon-21.08.3.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_DESIGNERPLUGIN="true" -ECM_TEST="forceoptional" -PVCUT=$(ver_cut 1-3) -KFMIN=5.84.0 -QTMIN=5.15.2 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org - -DESCRIPTION="Common PIM libraries" - -LICENSE="GPL-2+ LGPL-2.1+" -SLOT="5" -KEYWORDS="amd64 arm64 ~ppc64 x86" -IUSE="" - -COMMON_DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtprintsupport-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - >=kde-apps/akonadi-${PVCUT}:5 - >=kde-apps/akonadi-contacts-${PVCUT}:5 - >=kde-apps/akonadi-search-${PVCUT}:5 - >=kde-apps/kimap-${PVCUT}:5 - >=kde-apps/kldap-${PVCUT}:5 - >=kde-apps/kpimtextedit-${PVCUT}:5 - >=kde-apps/libkdepim-${PVCUT}:5 - >=kde-frameworks/karchive-${KFMIN}:5 - >=kde-frameworks/kcmutils-${KFMIN}:5 - >=kde-frameworks/kcodecs-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcontacts-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kitemmodels-${KFMIN}:5 - >=kde-frameworks/kjobwidgets-${KFMIN}:5 - >=kde-frameworks/knewstuff-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-frameworks/purpose-${KFMIN}:5 -" -DEPEND="${COMMON_DEPEND} - test? ( >=kde-apps/kmime-${PVCUT}:5 ) -" -RDEPEND="${COMMON_DEPEND} - !