gentoo resync : 15.01.2020

5 files changed, 106 insertions, 47 deletions

diff --git a/kde-plasma/plasma-integration/Manifest b/kde-plasma/plasma-integration/Manifest
index 1bc113883b75..75f618d705b7 100644
--- a/kde-plasma/plasma-integration/Manifest
+++ b/kde-plasma/plasma-integration/Manifest
@@ -1,5 +1,6 @@
-DIST plasma-integration-5.16.5.tar.xz 55672 BLAKE2B a953d06cb13cb6c248124fbdeb8ed7e52d82bb8411e53a7c86b95c8e3fe90464f9e9fdc0a271a697bd95df0865ee7939f8a71d973b82bf5016b64c369a95ba70 SHA512 f974db9c85fb22e7dfeb8154d5c51c7106f2b95aeb783843701234a4b7186fd6b4be6298809d73b1a776399420a0e451908e5466aca622fd69800f0cfa2e3a91
+AUX plasma-integration-5.17.4-fix-filedialog-size.patch 1791 BLAKE2B 12e510a9cded2df70c3380a6162e3db874468613acb37249501060402628b4a42755d684fcdf542bdb1a9d5f72db049ed05b5038e827c65eb7f5fec51c715098 SHA512 ff17e527bafa72f6165136d4d588af7861296fcc12c60f70163a6f76eaacfec8b34b803fb3c8f3c1540f9deb57a6512a77fdec875c9b8cb77feb67a94b16cadd
 DIST plasma-integration-5.17.4.tar.xz 56724 BLAKE2B 74a86033ac9f00effdac120f237e06cd96789711c06007f716c5eb33bccae0b38125731ff4f5735faa13d1969c884a54f7d5358f82c714c3c786e62a210989e5 SHA512 301fb2faa42cf2c579070a2136c3e39db495b35e715abcd336a5fc1044a5134b5006e022ad9d69b530e7f308e2ad2486ee44317f3436d9c42412bf61a3047ebd
-EBUILD plasma-integration-5.16.5.ebuild 1058 BLAKE2B d1d62b1350c810f7aac2f1d4666656b566f3e752e771a37f8edfafdc507dcd6249a2fe21fa90fe89fe61aa4b3506afd6a99ac5ec0fea843cf3c0859ae21b1322 SHA512 6762712e8391d4eb0d9812b14caa2009d5d9976820e417150ad363be69f04a19cca3cfe5fca4922b2c4763ed26f48635fac0f746f1cb25d5a4dafa864fec78ad
-EBUILD plasma-integration-5.17.4.ebuild 1230 BLAKE2B 8b6e84e66d6bd77cde773056c266ec0c447690f3410f1c5512dabe562f6626f5693bf534dc22096fe5f1267a520e4f01ed69ed5a7d5e27ef679eda75314581d3 SHA512 ac992ff9ba749aa0bd08c6ac031c2c9b79211223f10371c4adc79be1cb3efdb23121b24ab91048a4787c6fa9dd6398e245483532e59c7f93838b59b993076f31
+DIST plasma-integration-5.17.5.tar.xz 56836 BLAKE2B aa22d2f362f07e33ca75ada88b05a93ee9bc6f2bb6e136d9a08526e54a1e68a5c7947e617085f068363f40d5748b9fdcb7a93ad57016dd6844718d843c01897f SHA512 9341ca525e1c02b0ee00d01221a68f683717f89c19408f5b94004fa13fb63fa7983609756ce64fd0b21301fb2a51a3e531c0b2bc1c46ca656dc41b08076baca2
+EBUILD plasma-integration-5.17.4-r1.ebuild 1285 BLAKE2B 8c991bc0e598fb5c2900950cbb9e7fb521010158e1f857ec21d7e5ebcdf180b75d7fe154903c98df05ca3befbf159662ebefa7da9a779968bdeec01c6861f8bf SHA512 51f0c7f3690d1f2819d19e6084ba1e03d1ce889b7cce5ab51f2516cee717a5bac610e1b8348016805719944e6469eb96c33dd792dcbc0622491a66cee6ec5a02
+EBUILD plasma-integration-5.17.5.ebuild 1230 BLAKE2B a926e850ae09b91be0f8b6e24f254427331cad0514a87e2702bef36154c6bdcada9675b187d9cdacb60590e28bd0edec95d52dc64fe98a8136b95b6e86de0f74 SHA512 1a5606f3831c429164362d8bd0119a8b649708d97d460ef2468bbd5bd1391729d0cf811be18f98e35719617b95cb435bac091821b32608075237940c13287d60
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-integration/files/plasma-integration-5.17.4-fix-filedialog-size.patch b/kde-plasma/plasma-integration/files/plasma-integration-5.17.4-fix-filedialog-size.patch
new file mode 100644
index 000000000000..b49006bcde99
--- /dev/null
+++ b/kde-plasma/plasma-integration/files/plasma-integration-5.17.4-fix-filedialog-size.patch
@@ -0,0 +1,52 @@
+From 2e9f96847432c707a9dfbfe0748f0524a128abb7 Mon Sep 17 00:00:00 2001
+From: David Edmundson <kde@davidedmundson.co.uk>
+Date: Sat, 14 Dec 2019 14:03:30 +0100
+Subject: Resize file dialog window before size restore
+
+Summary:
+KDEPlatformDialogHelper explicitly resizes the window contents to the
+window as part of a bug fix. This means we lose the common path where
+the window resizes to the content's size hints that happens later.
+
+If we resize the window to the size hint in advance we keep our size
+hint.
+
+(alternatively it seems to be me we can remove that old hack...but it
+needs testing by people with Qt5.12)
+
+Test Plan:
+KWrite -> open
+
+Size is 900x600, the size hint
+not 640x480 the QPA default
+
+Reviewers: #plasma, ngraham
+
+Reviewed By: ngraham
+
+Subscribers: ngraham, plasma-devel
+
+Tags: #plasma
+
+Differential Revision: https://phabricator.kde.org/D25986
+---
+ src/platformtheme/kdeplatformfiledialoghelper.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/platformtheme/kdeplatformfiledialoghelper.cpp b/src/platformtheme/kdeplatformfiledialoghelper.cpp
+index efb7b60..4c67547 100644
+--- a/src/platformtheme/kdeplatformfiledialoghelper.cpp
++++ b/src/platformtheme/kdeplatformfiledialoghelper.cpp
+@@ -370,6 +370,10 @@ void KDEPlatformFileDialogHelper::restoreSize()
+ {
+     m_dialog->winId(); // ensure there's a window created
+     KSharedConfig::Ptr conf = KSharedConfig::openConfig();
++
++    // see the note below
++    m_dialog->windowHandle()->resize(m_dialog->sizeHint());
++
+     KWindowConfig::restoreWindowSize(m_dialog->windowHandle(), conf->group("FileDialogSize"));
+     // NOTICE: QWindow::setGeometry() does NOT impact the backing QWidget geometry even if the platform
+     // window was created -> QTBUG-40584. We therefore copy the size here.
+-- 
+cgit v1.1
diff --git a/kde-plasma/plasma-integration/plasma-integration-5.16.5.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.16.5.ebuild
deleted file mode 100644
index 4e17077befa6..000000000000
--- a/kde-plasma/plasma-integration/plasma-integration-5.16.5.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Qt Platform Theme integration plugins for the Plasma workspaces"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(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 kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwayland)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_plasma_dep breeze)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui 'dbus' '' '5=')
-	$(add_qt_dep qtquickcontrols2)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	x11-libs/libXcursor
-	x11-libs/libxcb
-"
-RDEPEND="${DEPEND}
-	media-fonts/hack
-	media-fonts/noto
-"
-
-# requires running kde environment
-RESTRICT+=" test"
diff --git a/kde-plasma/plasma-integration/plasma-integration-5.17.4-r1.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.17.4-r1.ebuild
new file mode 100644
index 000000000000..0cb03091d71d
--- /dev/null
+++ b/kde-plasma/plasma-integration/plasma-integration-5.17.4-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VIRTUALX_REQUIRED="test"
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Qt Platform Theme integration plugins for the Plasma workspaces"
+LICENSE="LGPL-2+"
+SLOT="5"
+KEYWORDS="amd64 ~arm arm64 x86"
+IUSE=""
+
+DEPEND="
+	>=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/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kwayland-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-plasma/breeze-${PVCUT}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5=[dbus]
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	x11-libs/libXcursor
+	x11-libs/libxcb
+"
+RDEPEND="${DEPEND}
+	media-fonts/hack
+	media-fonts/noto
+"
+
+# requires running kde environment
+RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}"/${P}-fix-filedialog-size.patch )
diff --git a/kde-plasma/plasma-integration/plasma-integration-5.17.4.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.17.5.ebuild
index 157d1a7e3035..d5bc880005f1 100644
--- a/kde-plasma/plasma-integration/plasma-integration-5.17.4.ebuild
+++ b/kde-plasma/plasma-integration/plasma-integration-5.17.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7