From 536c3711867ec947c1738f2c4b96f22e4863322d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 18 Nov 2018 09:38:27 +0000 Subject: gentoo resync : 18.11.2018 --- kde-apps/kdepim-runtime/Manifest | 5 +- ...epim-runtime-18.08.3-gmail-resource-crash.patch | 25 ++++++ .../kdepim-runtime/kdepim-runtime-18.08.2.ebuild | 89 --------------------- .../kdepim-runtime-18.08.3-r1.ebuild | 91 ++++++++++++++++++++++ 4 files changed, 119 insertions(+), 91 deletions(-) create mode 100644 kde-apps/kdepim-runtime/files/kdepim-runtime-18.08.3-gmail-resource-crash.patch delete mode 100644 kde-apps/kdepim-runtime/kdepim-runtime-18.08.2.ebuild create mode 100644 kde-apps/kdepim-runtime/kdepim-runtime-18.08.3-r1.ebuild (limited to 'kde-apps/kdepim-runtime') diff --git a/kde-apps/kdepim-runtime/Manifest b/kde-apps/kdepim-runtime/Manifest index 8e78faaf4d87..7fa0afcdcff3 100644 --- a/kde-apps/kdepim-runtime/Manifest +++ b/kde-apps/kdepim-runtime/Manifest @@ -1,5 +1,6 @@ +AUX kdepim-runtime-18.08.3-gmail-resource-crash.patch 766 BLAKE2B 10d5a43d3c4a9322e8e7c864193880de226c70a1ebe25376ee133662cae0e8846d56d982c3b8255be55976cf03e1ee4c7323d99a47d189f4abb3c510227c1724 SHA512 4de43ca3b38a042b1f519616563cddefa522929f0e7ff9898d7cc5da3616bdf9aecbc981f50f7dffe47058580c7bb248ec864a27eb36ca88873005cb979c57fe DIST kdepim-runtime-18.04.3.tar.xz 1750516 BLAKE2B 09bbca0580ca2a835d61ab48a004fde691b70d04b03a9da3ccf52abfad16d341e6007ef890d0fda364f679650c6d07e78c2bddd5a4b0dcfb296f24bd0e2c046a SHA512 94770f46d9a100117adf05b03ad75aa3201ae4fc2a6b300bdc3ffc42003e1a54cf8b1275d28c78f32ac764f56e58909dfbc1448b3ab8a9625485d64e8366e68e -DIST kdepim-runtime-18.08.2.tar.xz 1752836 BLAKE2B 25212876324f308d2028f15407472e388c24cd917c56afbadb419fe795483ff07540733dbc29dd42ac5b74e4afc538b1c552bf73480e76c34f32862179ea8fa3 SHA512 1c7b7c17c3386e6a1bc8475de1a138c10c26afd1cf52d1c36144c49f30541e702af9b5aa49cd946de57e366d305ae26bb57c79d69b93d5ff221ba5caabc9bda8 +DIST kdepim-runtime-18.08.3.tar.xz 1752272 BLAKE2B b3bdac2cdd6a741d1af60881b7e923485272edd8a0edb6c1dcc51cf961e0c25e005946467d7fa467d4ee266fd08bf2e7de5878a990ef88c19a614f9c4cc28a7f SHA512 b2520e1eab7f722eeaf8c34a554db86aa5ee7bbfdf11e31c471f06c67c50426327fae1319f747ae240d8919ee12259c34ecdee0ce0a83cbee5df5c3b481b76ec EBUILD kdepim-runtime-18.04.3.ebuild 2132 BLAKE2B b61017828ea6ef25170f71647111a56828e7a6fe147ed7bbe7a1ba118df8fdaa7c442ef4a2896460294d262959d2e80333ddbe7c6c0e112e086b9fef7a4c65ee SHA512 a7bdf693083cb9a845abd1d8125aad886bd625168d59f46b5df378cc682b51f9067fa19356b244052a592425aa31595b3e4197dcebaf2e5c369a1bc75ff4c519 -EBUILD kdepim-runtime-18.08.2.ebuild 2252 BLAKE2B 09cb85b9b521edcd18d1b3bb60ed518ca2d0bc701e3557ae9701ec021e06e93aef89320d7b2adbd7d8f07dc3bd1eb0172175275ce995c2d64d5f99675940d3b6 SHA512 ad485b23c4bb71aa3500d683a43165c713efdeee9958f1106c1b9b07890481a796627d21df05ac0c7ee4780e6814026947d3c9d742a2a4900f5fbc1c81d79135 +EBUILD kdepim-runtime-18.08.3-r1.ebuild 2311 BLAKE2B fd2661cec518e87761e6ff8ac9f5a868ef0308ba4a014bee1891084dd10001b8a1efe919d022bba354694080d4499962f1540b4659c5540ac819ab4696197258 SHA512 5a7fc28e1beab48d5d7aaa4845b2ef1b9d001d9ada50b4a19e237fd8eb9df041896761f427b67cc4aeb71cc5b6ef45785ab61d417145dbef9d6c61168a032c95 MISC metadata.xml 323 BLAKE2B 2ca644434642a951be5bd9043197403222aa71e73e2eaf896b61862bd9f955ba06490f20af1c9e3a4cbc9c83a33fecae0b1c58bc10aec95a93ee518bf3d4099a SHA512 873c648b3985a05f119b13bca927dc15bce53b193d7225e1129b4327629192a1b5c23f6137406b2944b01369f2a6d0cd71442f48a14e67758b54c3fb27f07b17 diff --git a/kde-apps/kdepim-runtime/files/kdepim-runtime-18.08.3-gmail-resource-crash.patch b/kde-apps/kdepim-runtime/files/kdepim-runtime-18.08.3-gmail-resource-crash.patch new file mode 100644 index 000000000000..37b67fd180f5 --- /dev/null +++ b/kde-apps/kdepim-runtime/files/kdepim-runtime-18.08.3-gmail-resource-crash.patch @@ -0,0 +1,25 @@ +From a4316a290e243fd71a565a9b936012d27f116029 Mon Sep 17 00:00:00 2001 +From: Allan Sandfeld Jensen +Date: Sun, 28 Oct 2018 20:38:49 +0100 +Subject: Fix crash in failing GMail resource + +BUG: 400400 +--- + resources/imap/gmailpasswordrequester.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/resources/imap/gmailpasswordrequester.h b/resources/imap/gmailpasswordrequester.h +index b5b8aa8..6f013c9 100644 +--- a/resources/imap/gmailpasswordrequester.h ++++ b/resources/imap/gmailpasswordrequester.h +@@ -45,7 +45,7 @@ private Q_SLOTS: + + private: + ImapResourceBase *mResource = nullptr; +- KGAPI2::AccountPromise *mPendingPromise = nullptr; ++ QPointer mPendingPromise; + }; + + #endif +-- +cgit v0.11.2 diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-18.08.2.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-18.08.2.ebuild deleted file mode 100644 index 5c59662ac8d2..000000000000 --- a/kde-apps/kdepim-runtime/kdepim-runtime-18.08.2.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -KDE_HANDBOOK="forceoptional" -KDE_TEST="forceoptional" -VIRTUALX_REQUIRED="test" -inherit kde5 - -DESCRIPTION="Runtime plugin collection to extend the functionality of KDE PIM" -LICENSE="GPL-2+ LGPL-2.1+" -KEYWORDS="~amd64 ~x86" -IUSE="speech" - -# TODO kolab -CDEPEND=" - $(add_frameworks_dep kcodecs) - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep kholidays) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kio) - $(add_frameworks_dep kitemmodels) - $(add_frameworks_dep kjobwidgets) - $(add_frameworks_dep knotifications) - $(add_frameworks_dep knotifyconfig) - $(add_frameworks_dep kservice) - $(add_frameworks_dep ktextwidgets) - $(add_frameworks_dep kwallet) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kwindowsystem) - $(add_frameworks_dep kxmlgui) - $(add_kdeapps_dep akonadi) - $(add_kdeapps_dep akonadi-calendar) - $(add_kdeapps_dep akonadi-contacts) - $(add_kdeapps_dep akonadi-mime) - $(add_kdeapps_dep akonadi-notes) - $(add_kdeapps_dep kalarmcal) - $(add_kdeapps_dep kcalcore) - $(add_kdeapps_dep kcalutils) - $(add_kdeapps_dep kcontacts) - $(add_kdeapps_dep kdav) - $(add_kdeapps_dep kidentitymanagement) - $(add_kdeapps_dep kimap) - $(add_kdeapps_dep kmailtransport) - $(add_kdeapps_dep kmbox) - $(add_kdeapps_dep kmime) - $(add_kdeapps_dep libkgapi) - $(add_kdeapps_dep pimcommon) - $(add_qt_dep qtdbus) - $(add_qt_dep qtgui) - $(add_qt_dep qtnetwork) - $(add_qt_dep qtwebengine 'widgets') - $(add_qt_dep qtwidgets) - $(add_qt_dep qtxml) - dev-libs/cyrus-sasl:2 - dev-libs/libical:= - speech? ( $(add_qt_dep qtspeech) ) -" -DEPEND="${CDEPEND} - $(add_qt_dep qtxmlpatterns) - dev-libs/libxslt - test? ( $(add_kdeapps_dep kimap 'test') ) -" -RDEPEND="${CDEPEND} - !kde-apps/kdepim-l10n - !kde-misc/akonadi-ews - $(add_frameworks_dep oxygen-icons) -" - -RESTRICT+=" test" - -src_prepare() { - kde5_src_prepare - # We don't build kolab, so we can disable this - punt_bogus_dep KF5 KDELibs4Support -} - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_find_package speech Qt5TextToSpeech) - ) - - kde5_src_configure -} diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-18.08.3-r1.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-18.08.3-r1.ebuild new file mode 100644 index 000000000000..87481aeb56db --- /dev/null +++ b/kde-apps/kdepim-runtime/kdepim-runtime-18.08.3-r1.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +KDE_HANDBOOK="forceoptional" +KDE_TEST="forceoptional" +VIRTUALX_REQUIRED="test" +inherit kde5 + +DESCRIPTION="Runtime plugin collection to extend the functionality of KDE PIM" +LICENSE="GPL-2+ LGPL-2.1+" +KEYWORDS="~amd64 ~x86" +IUSE="speech" + +# TODO kolab +CDEPEND=" + $(add_frameworks_dep kcodecs) + $(add_frameworks_dep kcompletion) + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kdbusaddons) + $(add_frameworks_dep kholidays) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kio) + $(add_frameworks_dep kitemmodels) + $(add_frameworks_dep kjobwidgets) + $(add_frameworks_dep knotifications) + $(add_frameworks_dep knotifyconfig) + $(add_frameworks_dep kservice) + $(add_frameworks_dep ktextwidgets) + $(add_frameworks_dep kwallet) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kwindowsystem) + $(add_frameworks_dep kxmlgui) + $(add_kdeapps_dep akonadi) + $(add_kdeapps_dep akonadi-calendar) + $(add_kdeapps_dep akonadi-contacts) + $(add_kdeapps_dep akonadi-mime) + $(add_kdeapps_dep akonadi-notes) + $(add_kdeapps_dep kalarmcal) + $(add_kdeapps_dep kcalcore) + $(add_kdeapps_dep kcalutils) + $(add_kdeapps_dep kcontacts) + $(add_kdeapps_dep kdav) + $(add_kdeapps_dep kidentitymanagement) + $(add_kdeapps_dep kimap) + $(add_kdeapps_dep kmailtransport) + $(add_kdeapps_dep kmbox) + $(add_kdeapps_dep kmime) + $(add_kdeapps_dep libkgapi) + $(add_kdeapps_dep pimcommon) + $(add_qt_dep qtdbus) + $(add_qt_dep qtgui) + $(add_qt_dep qtnetwork) + $(add_qt_dep qtwebengine 'widgets') + $(add_qt_dep qtwidgets) + $(add_qt_dep qtxml) + dev-libs/cyrus-sasl:2 + dev-libs/libical:= + speech? ( $(add_qt_dep qtspeech) ) +" +DEPEND="${CDEPEND} + $(add_qt_dep qtxmlpatterns) + dev-libs/libxslt + test? ( $(add_kdeapps_dep kimap 'test') ) +" +RDEPEND="${CDEPEND} + !kde-apps/kdepim-l10n + !kde-misc/akonadi-ews + $(add_frameworks_dep oxygen-icons) +" + +RESTRICT+=" test" + +PATCHES=( "${FILESDIR}/${P}-gmail-resource-crash.patch" ) + +src_prepare() { + kde5_src_prepare + # We don't build kolab, so we can disable this + punt_bogus_dep KF5 KDELibs4Support +} + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use_find_package speech Qt5TextToSpeech) + ) + + kde5_src_configure +} -- cgit v1.2.3