gentoo resync : 30.05.2020

4 files changed, 57 insertions, 71 deletions

diff --git a/kde-plasma/drkonqi/Manifest b/kde-plasma/drkonqi/Manifest
index dc195cb086d8..e9d9063b1337 100644
--- a/kde-plasma/drkonqi/Manifest
+++ b/kde-plasma/drkonqi/Manifest
@@ -1,5 +1,4 @@
-DIST drkonqi-5.17.5.tar.xz 740416 BLAKE2B 01b22252e5d9c3d88fb960387f681f38480dddaa79ec319074aefdb95867fd9a71efb1ef2bf9278de15e876265db4aca5f530de1968ea849be60c64e68a4346d SHA512 73ba55c8f5223580c2638c3ad5d12be86703a02639ed5a34b077205f1cbc927efb13cb88ee84ea23e58b8d5bc87b368bbcfb702fb0e8f76722dca39981b30ff0
+AUX drkonqi-5.18.5-init-bools-w-false.patch 1702 BLAKE2B fb60d49278011acdd8ffc4eacc5cfa07afc34f3dbe240945bf87c2ed23f4f94bd4284fe3df25e53e28467a2d4ced54b47461a440cd70be41e17412ed9c2d9c52 SHA512 87d3ec1db263b1cb1eb27684da40815eafcfc8bf512ec771eebd3481bc032a6653686aa22f71313b46dfda7e1dcbdfd5b2bde9930d69f0939ed2ddf7b25529c9
 DIST drkonqi-5.18.5.tar.xz 747984 BLAKE2B b94f808c7edf8e02628badd63ecb5edc9dd80d3e157f46c72fb884d5c35a2a5c70e9080235a7be84150dc973765f42572fcd6e907bcf6a58c100d80b7188bbc6 SHA512 b4862297e969f501f526880560acbd02026b64a0bec2f6e3b2b30f4bfe5ff2abd1798e3bda920bd61adbb6c9a3455e0c4f304f3f37bcafed3f3d8e6de1bc67a9
-EBUILD drkonqi-5.17.5.ebuild 1592 BLAKE2B 0697f8b592626fea0700f82513050b638e8b1abe0981593edbf7b4980ee1fb1247e1c36adaf07122949b136a7ca6522b5f21aa6585e761c6086a8f13bb3df987 SHA512 6293d6af9a0650a589ec4eaa07c5e496df2b446a5c998110462b669a5412376a66a52295ffabef90455a378ee0e8e0e3ac497050ae4b64fb2d3452bc4efc3e9b
-EBUILD drkonqi-5.18.5.ebuild 1638 BLAKE2B 3b1d4d1414311e618817fe90c74c5fce8d6798033973c53babd9c2d175aab21e6b86147e9cf2db04eb2bb913b262a77c87cb8e1e8309f05d010ead9c3b474137 SHA512 0bba9d72ba0760341a7e75a0aeda3f2bee1692a8f41efd705d12a9b0327504d0a8ead7cc97bcfa1edd25084c6f2793993258f92807bba7e96fd6351fc81bb562
+EBUILD drkonqi-5.18.5-r2.ebuild 1683 BLAKE2B f0edb1519a89f54fcae1960d4bdb68beb1a02a708a3f1608204179711e33644a656ab353b1e8901b9947c8124852fa5a1bc9d70fdd510cc87daef86c489c6807 SHA512 4027d7640d8706c79acb24245425dfb9542ca0814bf5462edfee89f9ed91586fe99c5dd6d58fafbd490d17851c4bf9b824e1442cdcad60a2188810dccc41147d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/drkonqi/drkonqi-5.17.5.ebuild b/kde-plasma/drkonqi/drkonqi-5.17.5.ebuild
deleted file mode 100644
index ba398dcf3616..000000000000
--- a/kde-plasma/drkonqi/drkonqi-5.17.5.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.64.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Plasma crash handler, gives the user feedback if a program crashed"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="X"
-
-RDEPEND="
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kidletime-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwayland-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlrpcclient-${KFMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
-"
-DEPEND="${RDEPEND}
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package X Qt5X11Extras)
-	)
-	ecm_src_configure
-}
-
-src_test() {
-	# needs network access, bug #698510
-	local myctestargs=(
-		-E "(connectiontest)"
-	)
-
-	ecm_src_test
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-	if ! has_version "sys-devel/gdb"; then
-		elog "For more usability consider installing the following package:"
-		elog "    sys-devel/gdb - Easier debugging support"
-	fi
-}
diff --git a/kde-plasma/drkonqi/drkonqi-5.18.5.ebuild b/kde-plasma/drkonqi/drkonqi-5.18.5-r2.ebuild
index c808e156a986..03342eff8d10 100644
--- a/kde-plasma/drkonqi/drkonqi-5.18.5.ebuild
+++ b/kde-plasma/drkonqi/drkonqi-5.18.5-r2.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Plasma crash handler, gives the user feedback if a program crashed"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="X"
 
 RDEPEND="
@@ -35,13 +35,16 @@ RDEPEND="
 	>=kde-frameworks/kwayland-${KFMIN}:5
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlrpcclient-${KFMIN}:5
 	X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
 "
 DEPEND="${RDEPEND}
 	>=dev-qt/qtconcurrent-${QTMIN}:5
 "
 
+PATCHES=(
+	"${FILESDIR}/${P}-init-bools-w-false.patch" # in Plasma/5.18, KDE-bug 421187
+)
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package X Qt5X11Extras)
diff --git a/kde-plasma/drkonqi/files/drkonqi-5.18.5-init-bools-w-false.patch b/kde-plasma/drkonqi/files/drkonqi-5.18.5-init-bools-w-false.patch
new file mode 100644
index 000000000000..6ce33a7198ab
--- /dev/null
+++ b/kde-plasma/drkonqi/files/drkonqi-5.18.5-init-bools-w-false.patch
@@ -0,0 +1,50 @@
+From c517b795936fdab641849ca83ec8c3e253e32de8 Mon Sep 17 00:00:00 2001
+From: Harald Sitter <sitter@kde.org>
+Date: Tue, 12 May 2020 12:25:52 +0200
+Subject: initialize bools to false by default
+
+Summary:
+This should fix random 113 errors (user_not_insider) coming out of the api
+
+I can't really reproduce the problem other than by setting the bools
+explicitly to true. Seeing as they were previously not set explicitly
+they could very well end up true accidentally.
+To fix this let's set them explicitly false.
+
+BUG: 421187
+FIXED-IN: 5.18.6
+
+Test Plan:
+hoping for the best!
+tests still pass tho
+
+Reviewers: davidedmundson, apol
+
+Reviewed By: apol
+
+Subscribers: plasma-devel
+
+Tags: #plasma
+
+Differential Revision: https://phabricator.kde.org/D29675
+---
+ src/bugzillaintegration/libbugzilla/clients/commands/newattachment.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/bugzillaintegration/libbugzilla/clients/commands/newattachment.h b/src/bugzillaintegration/libbugzilla/clients/commands/newattachment.h
+index d30f379..8b4e4bb 100644
+--- a/src/bugzillaintegration/libbugzilla/clients/commands/newattachment.h
++++ b/src/bugzillaintegration/libbugzilla/clients/commands/newattachment.h
+@@ -34,8 +34,8 @@ class NewAttachment : public JsonCommand
+     BUGZILLA_MEMBER_PROPERTY(QString, summary);
+     BUGZILLA_MEMBER_PROPERTY(QString, content_type);
+     BUGZILLA_MEMBER_PROPERTY(QString, comment);
+-    BUGZILLA_MEMBER_PROPERTY(bool, is_patch);
+-    BUGZILLA_MEMBER_PROPERTY(bool, is_private);
++    BUGZILLA_MEMBER_PROPERTY(bool, is_patch) = false;
++    BUGZILLA_MEMBER_PROPERTY(bool, is_private) = false;
+ 
+     // flags property is not supported at this time
+ 
+-- 
+cgit v1.1