From d99093fb4bb5652015c06274d64083daa2439e4f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 3 Mar 2021 10:28:17 +0000 Subject: gentoo resync : 03.03.2021 --- kde-apps/kaddressbook/Manifest | 5 +- .../files/kaddressbook-20.08.3-qt-5.15.2.patch | 69 ------------------- kde-apps/kaddressbook/kaddressbook-20.08.3.ebuild | 78 ---------------------- kde-apps/kaddressbook/kaddressbook-20.12.2.ebuild | 2 +- 4 files changed, 2 insertions(+), 152 deletions(-) delete mode 100644 kde-apps/kaddressbook/files/kaddressbook-20.08.3-qt-5.15.2.patch delete mode 100644 kde-apps/kaddressbook/kaddressbook-20.08.3.ebuild (limited to 'kde-apps/kaddressbook') diff --git a/kde-apps/kaddressbook/Manifest b/kde-apps/kaddressbook/Manifest index 052974a50d9a..fc0dd3f7fdc7 100644 --- a/kde-apps/kaddressbook/Manifest +++ b/kde-apps/kaddressbook/Manifest @@ -1,6 +1,3 @@ -AUX kaddressbook-20.08.3-qt-5.15.2.patch 3034 BLAKE2B 36c5c81b6e1764fe57eec1a465e1258ada25234e6f89d1d5bd247f26d57f5dedea2b07ca77822e6e7a1afe06fbe2432dbb92f4c106f01ab3d3a33d2377a32d4b SHA512 ad7c53a13f5a21d21380d53767c483d39479cf63b889596f61819d2ad0c4289fbf57f300098e4063a76eb0c43356433b52505ed9405f032cb3ed290b8af5f2d2 -DIST kaddressbook-20.08.3.tar.xz 3168192 BLAKE2B d7776c19b4cbe6eb0a1034b25c1ba4efe26d965091b749dd3691557d8202bf8ea13afcf9125454aeea986394b8e23ace4af4be7a38512a4a860639c65c90ab12 SHA512 ff63a0a0b5f8d45bfde0a41f15157bbc338aceebc9455b70626a3baab5b294b24951f72c9c110f356f04dd0f5f1ed191454e1b11a13ffe10df95d99efbf6f052 DIST kaddressbook-20.12.2.tar.xz 3257200 BLAKE2B 8c5c8a31400533d145999b9d574c44d9466854da3480746d435d4d556db603ea4baf52a5563a96972281db9453d7d0212183b018a5b4d7f4fd75def79df0374b SHA512 fd7e8213db1061807b3ad509d92627282d0782af9c528d940a493fecc50c1680b97170d38d00d4b044722a598d4c5717a2561ec25171369f672518d24c99911b -EBUILD kaddressbook-20.08.3.ebuild 2130 BLAKE2B c9501d04436666316273d5cc62f93397fcccfd98c7db14580732c277bdaead7bcd841b4def04041204e3f13299e65fd2fbcfb315904441af96901d32fcda2183 SHA512 b8ebd00d7ae3c56ff373d75c5b8c6b49a0276e19e00cffb9ee61685eb81e4d44a015086574ac6841ab4409177c560436e3243c43baa9aef003e99c8d18933aea -EBUILD kaddressbook-20.12.2.ebuild 2045 BLAKE2B db08d58d11d4c9b7dbef7d6083ac816cf10196da30f739f52d2d9472a1af07f8ccb1cf08dc4ac9a852ba011e61c258bc29ee40103ed2b30f4c018d945b498ffb SHA512 6d9aac005438eddb26097cd0e1b2e4493a1737c981a60582d636fa42d7b1bb01fab5062eb00dd67bfc79d99106a3b1bac0a6840ec840564f7c738f9bf4d21269 +EBUILD kaddressbook-20.12.2.ebuild 2042 BLAKE2B c497ea8b798007ab6df6b8e294bfaf98c9bef6bf053601886067520c871df4c797560692be55ce16b59cb6de97929372cb247a207a36d49dc7a96834788ed57f SHA512 6dcf4be47615b8f95af2c5ba9e87c8efeb6a8c26f3e933e3a4a8097f12d76b66a34a512cbd59cd9c6361941f236311ae226e9c61828fb2d4cdd69c9adefee73e MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 diff --git a/kde-apps/kaddressbook/files/kaddressbook-20.08.3-qt-5.15.2.patch b/kde-apps/kaddressbook/files/kaddressbook-20.08.3-qt-5.15.2.patch deleted file mode 100644 index 888febed0fa3..000000000000 --- a/kde-apps/kaddressbook/files/kaddressbook-20.08.3-qt-5.15.2.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 8aee8d40ae2a1c920d3520163d550d3b49720226 Mon Sep 17 00:00:00 2001 -From: Volker Krause -Date: Sun, 25 Oct 2020 18:22:58 +0100 -Subject: [PATCH] Compile with recent Qt 5.15 - -More QPrinter methods got deprecated there. DevicePixel no longer exists -as a unit, visually Point looks pretty much the same though. ---- - src/printing/compact/compactstyle.cpp | 2 +- - src/printing/grantlee/grantleeprintstyle.cpp | 2 +- - src/printing/mike/mikesstyle.cpp | 2 +- - src/printing/ringbinder/ringbinderstyle.cpp | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/printing/compact/compactstyle.cpp b/src/printing/compact/compactstyle.cpp -index d950a963..71e74c0f 100644 ---- a/src/printing/compact/compactstyle.cpp -+++ b/src/printing/compact/compactstyle.cpp -@@ -168,7 +168,7 @@ void CompactStyle::print(const KContacts::Addressee::List &contacts, PrintProgre - - // print - QPrinter *printer = wizard()->printer(); -- printer->setPageMargins(20, 20, 20, 20, QPrinter::DevicePixel); -+ printer->setPageMargins(QMarginsF(20, 20, 20, 20), QPageLayout::Point); - - progress->addMessage(i18n("Setting up document")); - -diff --git a/src/printing/grantlee/grantleeprintstyle.cpp b/src/printing/grantlee/grantleeprintstyle.cpp -index d7afe8ef..49b5e494 100644 ---- a/src/printing/grantlee/grantleeprintstyle.cpp -+++ b/src/printing/grantlee/grantleeprintstyle.cpp -@@ -38,7 +38,7 @@ GrantleePrintStyle::~GrantleePrintStyle() - void GrantleePrintStyle::print(const KContacts::Addressee::List &contacts, PrintProgress *progress) - { - QPrinter *printer = wizard()->printer(); -- printer->setPageMargins(20, 20, 20, 20, QPrinter::DevicePixel); -+ printer->setPageMargins(QMarginsF(20, 20, 20, 20), QPageLayout::Point); - - progress->addMessage(i18n("Setting up document")); - -diff --git a/src/printing/mike/mikesstyle.cpp b/src/printing/mike/mikesstyle.cpp -index 9f698c53..81a4bd6f 100644 ---- a/src/printing/mike/mikesstyle.cpp -+++ b/src/printing/mike/mikesstyle.cpp -@@ -107,7 +107,7 @@ MikesStyle::~MikesStyle() - void MikesStyle::print(const KContacts::Addressee::List &contacts, PrintProgress *progress) - { - QPrinter *printer = wizard()->printer(); -- printer->setPageMargins(20, 20, 20, 20, QPrinter::DevicePixel); -+ printer->setPageMargins(QMarginsF(20, 20, 20, 20), QPageLayout::Point); - - progress->addMessage(i18n("Setting up document")); - -diff --git a/src/printing/ringbinder/ringbinderstyle.cpp b/src/printing/ringbinder/ringbinderstyle.cpp -index 60a39c86..5f600d6a 100644 ---- a/src/printing/ringbinder/ringbinderstyle.cpp -+++ b/src/printing/ringbinder/ringbinderstyle.cpp -@@ -159,7 +159,7 @@ void RingBinderPrintStyle::print(const KContacts::Addressee::List &contacts, Pri - config.sync(); - - QPrinter *printer = wizard()->printer(); -- printer->setPageMargins(50, 20, 0, 50, QPrinter::DevicePixel); -+ printer->setPageMargins(QMarginsF(50, 20, 0, 50), QPageLayout::Point); - - progress->addMessage(i18n("Setting up document")); - --- -GitLab - diff --git a/kde-apps/kaddressbook/kaddressbook-20.08.3.ebuild b/kde-apps/kaddressbook/kaddressbook-20.08.3.ebuild deleted file mode 100644 index 4a9f7e41299e..000000000000 --- a/kde-apps/kaddressbook/kaddressbook-20.08.3.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_HANDBOOK="forceoptional" -ECM_TEST="forceoptional" -PVCUT=$(ver_cut 1-3) -KFMIN=5.74.0 -QTMIN=5.15.1 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org optfeature - -DESCRIPTION="Address book application based on KDE Frameworks" -HOMEPAGE="https://apps.kde.org/en/kaddressbook" - -LICENSE="GPL-2+ handbook? ( FDL-1.2+ )" -SLOT="5" -KEYWORDS="amd64 arm64 ~ppc64 x86" -IUSE="telemetry" - -DEPEND=" - >=app-crypt/gpgme-1.11.1[cxx,qt5] - dev-libs/grantlee:5 - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtprintsupport-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-apps/akonadi-${PVCUT}:5 - >=kde-apps/akonadi-contacts-${PVCUT}:5 - >=kde-apps/akonadi-search-${PVCUT}:5 - >=kde-apps/grantleetheme-${PVCUT}:5 - >=kde-apps/kdepim-apps-libs-${PVCUT}:5 - >=kde-apps/kontactinterface-${PVCUT}:5 - >=kde-apps/libgravatar-${PVCUT}:5 - >=kde-apps/libkdepim-${PVCUT}:5 - >=kde-apps/libkleo-${PVCUT}:5 - >=kde-apps/pimcommon-${PVCUT}:5 - >=kde-frameworks/kcmutils-${KFMIN}:5 - >=kde-frameworks/kcodecs-${KFMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcontacts-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kcrash-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kitemmodels-${KFMIN}:5 - >=kde-frameworks/kjobwidgets-${KFMIN}:5 - >=kde-frameworks/kparts-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-frameworks/prison-${KFMIN}:5 - telemetry? ( dev-libs/kuserfeedback:5 ) -" -RDEPEND="${DEPEND} - >=kde-apps/kdepim-runtime-${PVCUT}:5 -" - -PATCHES=( "${FILESDIR}/${P}-qt-5.15.2.patch" ) - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package telemetry KUserFeedback) - ) - - ecm_src_configure -} - -pkg_postinst() { - if [[ -z "${REPLACING_VERSIONS}" ]]; then - elog "Optional dependencies:" - optfeature "Postal addresses" kde-apps/kdepim-addons:${SLOT} - fi - ecm_pkg_postinst -} diff --git a/kde-apps/kaddressbook/kaddressbook-20.12.2.ebuild b/kde-apps/kaddressbook/kaddressbook-20.12.2.ebuild index 2bf21097d8c8..c0eb71bdae66 100644 --- a/kde-apps/kaddressbook/kaddressbook-20.12.2.ebuild +++ b/kde-apps/kaddressbook/kaddressbook-20.12.2.ebuild @@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/en/kaddressbook" LICENSE="GPL-2+ handbook? ( FDL-1.2+ )" SLOT="5" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 arm64 ~ppc64 x86" IUSE="telemetry" DEPEND=" -- cgit v1.2.3