gentoo resync : 13.06.2020

3 files changed, 68 insertions, 3 deletions

diff --git a/dev-qt/qtquickcontrols2/Manifest b/dev-qt/qtquickcontrols2/Manifest
index 7d7f8eca3732..b67b46209c7f 100644
--- a/dev-qt/qtquickcontrols2/Manifest
+++ b/dev-qt/qtquickcontrols2/Manifest
@@ -1,7 +1,7 @@
-DIST qtquickcontrols2-everywhere-src-5.14.1.tar.xz 8151808 BLAKE2B 79a9dfc75c3e50f08237377961801eb9971e5489a39d83387340a803d8f6c3956118129cfd26028707ba80b3b7bdc338b7292b6623f2404e30206ddfe3dbd852 SHA512 c35a450e26f9afb79c237133d407442823fb6bb664c0d2c952b92f9084db85f0e7ba02bac9aca3aef45670fed7da34c7ef183297360cb13aee4260513b4393ee
+AUX qtquickcontrols2-5.14.2-account-for-scale-before-positioning.patch 2268 BLAKE2B e321a635cc94d92245291539d862aa1cfc63bc6a558d6ddc792800be409dff11b1777349aed394d0e9df5dbfae29cd71681271eda1c68745af3ec1e1e76eabed SHA512 6d559d5c128e0046319fb8d6bdd3914a30eae41315efd267e6271c3f69759024abb79c7cb3a604c8bb58936a2daf25fd1217ee877516b65b8d5262fd76dac39f
 DIST qtquickcontrols2-everywhere-src-5.14.2.tar.xz 8153752 BLAKE2B d1803007fb016276b75db9102ebfd82a6afa279b845d3507a04b76c2ab6fc8345840f3ea76c12607ed2b7be11e2b2c26bb76ff84b65a4c8df7cf9c66dbd95003 SHA512 de8b669417c2d039c0f49e805be72e757877991bc3c7feb13417202a4964cb6391924837751c520ed6234930e90dfe00417ca1c369418b2cdf4f09da679ba722
 DIST qtquickcontrols2-everywhere-src-5.15.0.tar.xz 8164236 BLAKE2B 7e5e2b2640d6eda1864d04a397f91e69a79b5b0590097f2c8a9a06e26ec8f9a0c09028f2fec87acba91d0df568d6085eae50ccb7962c50be6a3de64088f122b6 SHA512 560014b882ef9d274cb1532025cae79987eec3569541e111e91f047261fcd7f26fcb40689d8dd6921ae26fbf9cdee60a87d3a1c7212e547529ff4adf9c5cf136
-EBUILD qtquickcontrols2-5.14.1.ebuild 606 BLAKE2B 0d3d0105694c0a2be2ea02a6a4605dc3174de9535b4997f35a7dce5bb73ec782767e871e95ab1ff16103bc214eb9753b01085d1919827ad64d31b8cb6381f8bc SHA512 37a4182eb357133277b9e40af464ddf2d8cb0fd2a4990de23e986f5e764249e61a09674493042b13da62be44097fb3d717495161d771a99500241cd1db00fe0e
+EBUILD qtquickcontrols2-5.14.2-r1.ebuild 699 BLAKE2B 96031a82422b75b0a47c2b47e69b92d2d29ec424010bf6aefa84393668d4ce05f9a7dfbfde59907738cae804a27997ea125a785ac8be2c10aa2fda94c01e9e06 SHA512 a3115a3382ffc2b4f81c692aab5c349d9ca7cce068c2af762af7c3c5041d7a8707ee0425cbcbefa53a785133016f9b42c5255b506eda16446b25ff12181a0465
 EBUILD qtquickcontrols2-5.14.2.ebuild 606 BLAKE2B 0d3d0105694c0a2be2ea02a6a4605dc3174de9535b4997f35a7dce5bb73ec782767e871e95ab1ff16103bc214eb9753b01085d1919827ad64d31b8cb6381f8bc SHA512 37a4182eb357133277b9e40af464ddf2d8cb0fd2a4990de23e986f5e764249e61a09674493042b13da62be44097fb3d717495161d771a99500241cd1db00fe0e
 EBUILD qtquickcontrols2-5.15.0.ebuild 609 BLAKE2B 1406936acf30b318039b6616e2e91f0fce406aa4ac70566c4ace70105ab71325b436af86f8c9144adf2e928fa9257d47a6e2913c5f903ed53b48135d9593d7f3 SHA512 3e005ce1c3ffcf1090cea4d536bcd00328cb657cdefc9bb311bbf14fe072d7533b05b8cd41c66f0661feec85482883a01d3e52eb97da202e6513b6002448da93
 MISC metadata.xml 551 BLAKE2B cbf6277d7f92518755cd42245a21869008fc6110a1e51d5ba6f8b0bf5c81634bd92300c0570d9f9fde58bb847a5ef47ce4f9fa9b0d88e4491589100274657495 SHA512 b3fd90ef9fffbd2bbfd8bd75ee09ff4dc7fb18a4ab7247a12c54c980993450466454a83938a2cbc7c423d9ddc03a46e8b29a92b443aa08166ab2fa2be2a3451c
diff --git a/dev-qt/qtquickcontrols2/files/qtquickcontrols2-5.14.2-account-for-scale-before-positioning.patch b/dev-qt/qtquickcontrols2/files/qtquickcontrols2-5.14.2-account-for-scale-before-positioning.patch
new file mode 100644
index 000000000000..ae54f12f3652
--- /dev/null
+++ b/dev-qt/qtquickcontrols2/files/qtquickcontrols2-5.14.2-account-for-scale-before-positioning.patch
@@ -0,0 +1,61 @@
+From 4df52eee2b40244ba1a3d115a43ed51cfd742105 Mon Sep 17 00:00:00 2001
+From: Andy Shaw <andy.shaw@qt.io>
+Date: Thu, 7 Feb 2019 17:35:51 +0100
+Subject: [PATCH] Menu: account for the scale when getting the size before
+ positioning
+
+Fixes: QTBUG-73687
+Change-Id: Id2d6a6b5c6651337ab7ae26d07011160b79654bf
+Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
+---
+ src/quicktemplates2/qquickpopup.cpp           |  1 +
+ src/quicktemplates2/qquickpopuppositioner.cpp | 14 +++++++-------
+ 3 files changed, 17 insertions(+), 15 deletions(-)
+
+diff --git a/src/quicktemplates2/qquickpopup.cpp b/src/quicktemplates2/qquickpopup.cpp
+index ecb2568ed..d108420ea 100644
+--- a/src/quicktemplates2/qquickpopup.cpp
++++ b/src/quicktemplates2/qquickpopup.cpp
+@@ -471,6 +471,7 @@ void QQuickPopupPrivate::finalizeEnterTransition()
+     if (focus)
+         popupItem->setFocus(true);
+     transitionState = NoTransition;
++    getPositioner()->reposition();
+     emit q->openedChanged();
+     emit q->opened();
+ }
+diff --git a/src/quicktemplates2/qquickpopuppositioner.cpp b/src/quicktemplates2/qquickpopuppositioner.cpp
+index ebd8ff294..dbe8ac1d5 100644
+--- a/src/quicktemplates2/qquickpopuppositioner.cpp
++++ b/src/quicktemplates2/qquickpopuppositioner.cpp
+@@ -108,10 +108,11 @@ void QQuickPopupPositioner::reposition()
+         return;
+     }
+ 
+-    const qreal w = popupItem->width();
+-    const qreal h = popupItem->height();
+-    const qreal iw = popupItem->implicitWidth();
+-    const qreal ih = popupItem->implicitHeight();
++    const qreal scale = popupItem->scale();
++    const qreal w = popupItem->width() * scale;
++    const qreal h = popupItem->height() * scale;
++    const qreal iw = popupItem->implicitWidth() * scale;
++    const qreal ih = popupItem->implicitHeight() * scale;
+ 
+     bool widthAdjusted = false;
+     bool heightAdjusted = false;
+@@ -257,10 +258,9 @@ void QQuickPopupPositioner::reposition()
+     }
+ 
+     if (!p->hasWidth && widthAdjusted && rect.width() > 0)
+-        popupItem->setWidth(rect.width());
++        popupItem->setWidth(rect.width() / scale);
+     if (!p->hasHeight && heightAdjusted && rect.height() > 0)
+-        popupItem->setHeight(rect.height());
+-
++        popupItem->setHeight(rect.height() / scale);
+     m_positioning = false;
+ }
+ 
+-- 
+2.16.3
diff --git a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.14.1.ebuild b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.14.2-r1.ebuild
index d9241d146306..f91b09dc54ce 100644
--- a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.14.1.ebuild
+++ b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.14.2-r1.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Set of next generation Qt Quick controls for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 fi
 
 IUSE="widgets"
@@ -22,6 +22,10 @@ RDEPEND="${DEPEND}
 	~dev-qt/qtgraphicaleffects-${PV}
 "
 
+PATCHES=(
+	"${FILESDIR}/${P}-account-for-scale-before-positioning.patch" # QTBUG-73687
+)
+
 src_prepare() {
 	qt_use_disable_mod widgets widgets \
 		src/imports/platform/platform.pro