From b284a3168fa91a038925d2ecf5e4791011ea5e7d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 18 Nov 2019 10:15:03 +0000 Subject: gentoo resync : 18.11.2019 --- kde-apps/libksieve/Manifest | 5 +- .../files/libksieve-19.08.3-qt-5.14.patch | 36 ++++++++++++ kde-apps/libksieve/libksieve-19.08.2.ebuild | 61 -------------------- kde-apps/libksieve/libksieve-19.08.3.ebuild | 67 ++++++++++++++++++++++ 4 files changed, 106 insertions(+), 63 deletions(-) create mode 100644 kde-apps/libksieve/files/libksieve-19.08.3-qt-5.14.patch delete mode 100644 kde-apps/libksieve/libksieve-19.08.2.ebuild create mode 100644 kde-apps/libksieve/libksieve-19.08.3.ebuild (limited to 'kde-apps/libksieve') diff --git a/kde-apps/libksieve/Manifest b/kde-apps/libksieve/Manifest index 3a07b8d770b0..f5003f3787f0 100644 --- a/kde-apps/libksieve/Manifest +++ b/kde-apps/libksieve/Manifest @@ -1,5 +1,6 @@ +AUX libksieve-19.08.3-qt-5.14.patch 1332 BLAKE2B 128c2abb3814624c38e929ce028611e8bb8c9f5755e5d7396be1c9700cb83b6735d0d993beb5b1a61ebca818534243c89da04f02e9e2edc9a398c793e554c3c9 SHA512 f4d6da6434a50de22062ee64f6fd321a641459ac7a802a157aa7a7c09f570017bf276956d91bdd921404212232f416de3cb09fec73cc6d7934360d8ded4e5b5a DIST libksieve-19.04.3.tar.xz 549356 BLAKE2B 364a12f0fce7a8d24b27cf7a732d39248e53fd171cfeb6651aaa1208a5587b6c1dae081d725092103e00951f00ebb0fe705a2d337710421019121db7e02f1857 SHA512 8afa6825eb0a413a6c2e26be9680b02df8126ba1cc8ec26c14b6e4f5900f5e4f07672f0d5ea9c39e4206ec0feba8b47117375a6ebb97f0f1dfb6e922d0e8c10f -DIST libksieve-19.08.2.tar.xz 549824 BLAKE2B 143cb860c89096e31e3a9c1cbdf73ef9b78fa2cc17b5707d11640e6a3190994644c51ff8bf2c240ec20bc922a29e241bc589cad66320fbe02b56963de967dded SHA512 93efd3f400e25d9e6e4178da2a91b2d9a46b643947bc5bab6ac56a13ebd5f0d90f921958f0c95b698e8ee82866d3883256bd1f89fac55ff2b6e41f13acb8c686 +DIST libksieve-19.08.3.tar.xz 549664 BLAKE2B 53c6ce9dd0a30fc8be01003a6610b20ae624e5c481d931cd8a09fa083ba681ee3fc79cfb9d185b12315e69f972e055ae82cd9c829058822f11c6d990b544564c SHA512 f5aee4894b95d48868b08941198ec9370a3855178c2f48330b36473fa2584a43fd7943a9d91f0781a92e79de126d6e78349c8d97b28b96cd2a006126cee3131b EBUILD libksieve-19.04.3.ebuild 1459 BLAKE2B de50886b458669ab737a35bb77d710a8dc6143e4f3bdc20e49a0f612305898814ae5558747ac0779c3523a3f01741d359c0464ee7891011c69ff85d94ec4a741 SHA512 5de4c66d029b96dee81b85f78d30f33f84d968d1e3023831746357c3b93e3f2c088947318034475d3b9d537c359440f9b963bab1bfc2d3a3283d8be7fffcabcf -EBUILD libksieve-19.08.2.ebuild 1533 BLAKE2B 47d6a658a4affc536aa872ae2714af6ea29ddbbd31a293b368a76280da12a22524c1cce3bc9e3f2445bcfbcdb4405e58dec562c4959adbd80e0bbf01fdeb0501 SHA512 205b5d1a72e93024c7c91f60efb38745befc4c16aeaa3c70a350e9388e46c241e6167a16d0332a9bb05a656dd94ac2e177e64f74d61fcf625445ef11f5b28ea3 +EBUILD libksieve-19.08.3.ebuild 1765 BLAKE2B 65bfca3bda12a617d049c6db0d730be776a73e20f191580b21b6143c2a1911024816b443bdcc09267d8f1266e6412c6cd527dbcfbf4120b74b5bbe5795396b74 SHA512 37c2c857939ea50f71bd3c83eae155dfe755e2e31f85d0552a3308fa9c0721d77c793dc15c381d0a415d8b7b3e7d2c8c14bfcfdbcf05287d9174928ee7a4785f MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 diff --git a/kde-apps/libksieve/files/libksieve-19.08.3-qt-5.14.patch b/kde-apps/libksieve/files/libksieve-19.08.3-qt-5.14.patch new file mode 100644 index 000000000000..403e58dd5f8d --- /dev/null +++ b/kde-apps/libksieve/files/libksieve-19.08.3-qt-5.14.patch @@ -0,0 +1,36 @@ +From 31b0ec79d4d58077bbb391c170fe9fef08d460a6 Mon Sep 17 00:00:00 2001 +From: Laurent Montel +Date: Fri, 15 Nov 2019 12:07:37 +0100 +Subject: Make it compile against 5.14 beta3 + +--- + src/ksieveui/editor/webengine/sieveeditorwebengineview.cpp | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/src/ksieveui/editor/webengine/sieveeditorwebengineview.cpp b/src/ksieveui/editor/webengine/sieveeditorwebengineview.cpp +index d4968dc..87305e9 100644 +--- a/src/ksieveui/editor/webengine/sieveeditorwebengineview.cpp ++++ b/src/ksieveui/editor/webengine/sieveeditorwebengineview.cpp +@@ -16,6 +16,8 @@ + */ + + #include "sieveeditorwebengineview.h" ++#include ++ + #include + #include + #include +@@ -61,7 +63,11 @@ void SieveEditorWebEngineView::downloadRequested(QWebEngineDownloadItem *downloa + const QString filename = QFileDialog::getSaveFileName(this, i18n("Save Web Page")); + if (!filename.isEmpty()) { + download->setSavePageFormat(QWebEngineDownloadItem::SingleHtmlSaveFormat); ++#if QTWEBENGINEWIDGETS_VERSION >= QT_VERSION_CHECK(5, 14, 0) ++ download->setDownloadFileName(filename); ++#else + download->setPath(filename); ++#endif + download->accept(); + } else { + download->cancel(); +-- +cgit v1.1 diff --git a/kde-apps/libksieve/libksieve-19.08.2.ebuild b/kde-apps/libksieve/libksieve-19.08.2.ebuild deleted file mode 100644 index 214ae5bbaeae..000000000000 --- a/kde-apps/libksieve/libksieve-19.08.2.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -KDE_HANDBOOK="forceoptional" -KDE_TEST="true" -VIRTUALX_REQUIRED="test" -inherit kde5 - -DESCRIPTION="Common PIM libraries" -LICENSE="GPL-2+ LGPL-2.1+" -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="" - -# drop qtwidgets subslot operator when QT_MINIMAL >= 5.14.0 -COMMON_DEPEND=" - $(add_frameworks_dep karchive) - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kio) - $(add_frameworks_dep knewstuff) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kwindowsystem) - $(add_frameworks_dep sonnet) - $(add_frameworks_dep syntax-highlighting) - $(add_kdeapps_dep kidentitymanagement) - $(add_kdeapps_dep kmime) - $(add_kdeapps_dep kpimtextedit) - $(add_kdeapps_dep libkdepim) - $(add_kdeapps_dep pimcommon) - $(add_qt_dep qtdbus) - $(add_qt_dep qtgui) - $(add_qt_dep qtnetwork) - $(add_qt_dep qtprintsupport) - $(add_qt_dep qtwebengine 'widgets') - $(add_qt_dep qtwidgets '' '' '5=') - dev-libs/cyrus-sasl -" -DEPEND="${COMMON_DEPEND} - $(add_kdeapps_dep kimap) - $(add_kdeapps_dep kmailtransport) -" -RDEPEND="${COMMON_DEPEND} - !kde-apps/kdepim-l10n -" - -RESTRICT+=" test" - -src_prepare() { - kde5_src_prepare - - if ! use handbook ; then - sed -e "/add_subdirectory(doc)/I s/^/#DONOTCOMPILE /" \ - -i kioslave/CMakeLists.txt || die "failed to comment add_subdirectory(doc)" - fi -} diff --git a/kde-apps/libksieve/libksieve-19.08.3.ebuild b/kde-apps/libksieve/libksieve-19.08.3.ebuild new file mode 100644 index 000000000000..b702cee164be --- /dev/null +++ b/kde-apps/libksieve/libksieve-19.08.3.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +ECM_HANDBOOK="forceoptional" +ECM_TEST="true" +VIRTUALX_REQUIRED="test" +PVCUT=$(ver_cut 1-3) +KFMIN=5.60.0 +QTMIN=5.12.3 +inherit ecm kde.org + +DESCRIPTION="Common PIM libraries" +LICENSE="GPL-2+ LGPL-2.1+" +SLOT="5" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="" + +# drop qtwidgets subslot operator when QT_MINIMAL >= 5.14.0 +COMMON_DEPEND=" + >=kde-frameworks/karchive-${KFMIN}:5 + >=kde-frameworks/kcompletion-${KFMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kiconthemes-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 + >=kde-frameworks/knewstuff-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-frameworks/sonnet-${KFMIN}:5 + >=kde-frameworks/syntax-highlighting-${KFMIN}:5 + >=kde-apps/kidentitymanagement-${PVCUT}:5 + >=kde-apps/kmime-${PVCUT}:5 + >=kde-apps/kpimtextedit-${PVCUT}:5 + >=kde-apps/libkdepim-${PVCUT}:5 + >=kde-apps/pimcommon-${PVCUT}:5 + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtnetwork-${QTMIN}:5 + >=dev-qt/qtprintsupport-${QTMIN}:5 + >=dev-qt/qtwebengine-${QTMIN}:5[widgets] + >=dev-qt/qtwidgets-${QTMIN}:5= + dev-libs/cyrus-sasl +" +DEPEND="${COMMON_DEPEND} + >=kde-apps/kimap-${PVCUT}:5 + >=kde-apps/kmailtransport-${PVCUT}:5 +" +RDEPEND="${COMMON_DEPEND} + !kde-apps/kdepim-l10n +" + +RESTRICT+=" test" + +PATCHES=( "${FILESDIR}/${P}-qt-5.14.patch" ) + +src_prepare() { + ecm_src_prepare + + if ! use handbook ; then + sed -e "/add_subdirectory(doc)/I s/^/#DONOTCOMPILE /" \ + -i kioslave/CMakeLists.txt || die "failed to comment add_subdirectory(doc)" + fi +} -- cgit v1.2.3