gentoo auto-resync : 10:12:2022 - 15:20:44

3 files changed, 34 insertions, 180 deletions

diff --git a/dev-qt/qtquickcontrols2/Manifest b/dev-qt/qtquickcontrols2/Manifest
index bee3586efd88..77ef967d2bfc 100644
--- a/dev-qt/qtquickcontrols2/Manifest
+++ b/dev-qt/qtquickcontrols2/Manifest
@@ -1,5 +1,6 @@
-AUX qtquickcontrols2-5.15.5-QTBUG-104983.patch 6812 BLAKE2B 7c01348b1a42e60e76758f729acaefa7b5a429ef00b8979b1d34bae2858a02605b56b4baea1b796556a312393a025ca016bea12f76f96ad739cc7ca100220315 SHA512 f54255bf6d341f0c041cb7ab302e135ab6cec646f764ac023b8c86d1b898d4cbe56eb8bcf4508406e66ef3bdee8467e42afeb67e24688a2b470f5f3f8c5bdbc0
 DIST qtquickcontrols2-5.15.7-gentoo-kde-1.tar.xz 8132 BLAKE2B 90e9b608477168e919ea30d4571620592d993f04338fb4a0e00f7b8d846bc82978960cd4861dfe4c8d2e366b2e3f9b36848342ad496326f2cba09036eb0f5033 SHA512 bd35612f1afe7ae46a3aea4b2bb1c8c39592ba426c484c5e3b6108fd473df3903153efcc5846e8d909a575e7406325806efbb685662047a43f6079eba8059454
+DIST qtquickcontrols2-5.15.7-gentoo-kde-2.tar.xz 8720 BLAKE2B 16cc913e19cc1fc3c777859af2a8f5d30d26d94f94ef94d9b417c0162aeae0c73064f24ab26323f06d765484f27e30b954d2c4df69202ba42dd5da824091a55e SHA512 3b8351ef284335548ee9fb8f38ea0c8482369bafa44ec46d7b315617e144a5c9754fa0307a49623341cb664dba4bff15ebec89a7554c773b22957bf4157792ee
 DIST qtquickcontrols2-everywhere-opensource-src-5.15.7.tar.xz 8291644 BLAKE2B 031043f97b3eac00e0e979e0fa42870593f07959b735559ccd6b7732a43f19731d69c434b2c38a8fe3342cdc1e3a5d54b37924228be0628394d113d5924734e0 SHA512 f49e330593b23ab9e84874a7cee1583df9355dd68d7c25e57fba080997b860b86f9003190e5d9a5b393efcb143fd20866daf2c8088a769e3094d6cf9607febd5
+EBUILD qtquickcontrols2-5.15.7-r1.ebuild 659 BLAKE2B 3dfe42c56eba8bfa7efe7f7f941a449a756a59ae1efe1abad396702cdef24b2b1f84139c1b37c4a3b8e5dc72bf2f2d1dc67dd2560cc7f801e967640751514796 SHA512 17e3e31c2b247df80d1fa7b7f7eb98a1d5f0d0be4e87f3f4383529e4b0e42d52bdd53cd33d2b6eb1d1433af5576a15920d07ba8d1ec9d1cdcccff64af3952748
 EBUILD qtquickcontrols2-5.15.7.ebuild 656 BLAKE2B 6b365a208f290401e9bddeb9e1cd2f0e94cb01473459defc4fd7c2953036bc099ad617544c3a360feb10533139c729f2f330233a0cf111f73021cbcf11c8fb51 SHA512 573f1bdb3eb3338301ae86a176a83c85d6a18eb23b76c1f24e97d9039ac97343c0c231f6af07a8f2381280cd2f8029bf60f3c8e1885888fbc97d4632d402358f
 MISC metadata.xml 552 BLAKE2B 8294b8e326a177905eb8b0510295d6b3cc97818c836b6b5d2940b78a5ecccc743c8818436fee3f3a61b2f984560c6fe6346d44e1e6b4fa27a7cf5a9a84f20dd4 SHA512 25f93b07946f9319e9762b9ba6c9adb5ca6348a71ebd5710c0f1690a75ca7f93af8967f323a9e11e7af04fd970a92fedf3ec30d962f85516c7b44f1ea749dbbf
diff --git a/dev-qt/qtquickcontrols2/files/qtquickcontrols2-5.15.5-QTBUG-104983.patch b/dev-qt/qtquickcontrols2/files/qtquickcontrols2-5.15.5-QTBUG-104983.patch
deleted file mode 100644
index f31e04d6ff4d..000000000000
--- a/dev-qt/qtquickcontrols2/files/qtquickcontrols2-5.15.5-QTBUG-104983.patch
+++ /dev/null
@@ -1,179 +0,0 @@
-From d0642867ab629daf36a1194274a74758111140be Mon Sep 17 00:00:00 2001
-From: Mitch Curtis <mitch.curtis@qt.io>
-Date: Mon, 18 Jul 2022 15:21:49 +0800
-Subject: [PATCH] Fix scroll bars not showing up when binding to standalone
- contentItem
-
-908aa77d16e00f2bccc0ddae0f8b61955c56a6a1 hid old scroll bars, but
-didn't account for the situation where the old scroll bars would be put
-back into place, and so they never showed up.
-
-In the case of the linked bug report, since there was a binding to the
-ScrollView's contentItem, a default Flickable would be created. After
-that binding was evaluated, the contentItem was set, causing the scroll
-bars to be hidden (as part of the process of disconnecting from the old
-flickable). To fix the issue, we now do the reverse of hideOldItem when
-a new contentItem is set.
-
-Fixes: QTBUG-104983
-Pick-to: 6.2 6.3 6.4
-Change-Id: I910259cc3e8f6a6231ae6c87c7d4f0f652bd0545
-Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
-Reviewed-by: Nate Graham
-
-(cherry picked from qtdeclarative 58bae53237417f28eac6d772fa6ecab657f8a73f)
----
- src/quicktemplates2/qquickcontrol.cpp       | 30 +++++++++++++
- src/quicktemplates2/qquickcontrol_p_p.h     |  1 +
- src/quicktemplates2/qquickscrollbar.cpp     | 11 +++++
- tests/auto/controls/data/tst_scrollview.qml | 47 +++++++++++++++++++++
- 4 files changed, 89 insertions(+)
-
-diff --git a/src/quicktemplates2/qquickcontrol.cpp b/src/quicktemplates2/qquickcontrol.cpp
-index bbbd0e622..1f4b47343 100644
---- a/src/quicktemplates2/qquickcontrol.cpp
-+++ b/src/quicktemplates2/qquickcontrol.cpp
-@@ -845,6 +845,13 @@ void QQuickControlPrivate::executeBackground(bool complete)
-         quickCompleteDeferred(q, backgroundName(), background);
- }
- 
-+/*
-+    \internal
-+
-+    Hides an item that was replaced by a newer one, rather than
-+    deleting it, as the item is typically created in QML and hence
-+    we don't own it.
-+*/
- void QQuickControlPrivate::hideOldItem(QQuickItem *item)
- {
-     if (!item)
-@@ -863,6 +870,29 @@ void QQuickControlPrivate::hideOldItem(QQuickItem *item)
- #endif
- }
- 
-+/*
-+    \internal
-+
-+    Named "unhide" because it's used for cases where an item
-+    that was previously hidden by \l hideOldItem() wants to be
-+    shown by a control again, such as a ScrollBar in ScrollView.
-+*/
-+void QQuickControlPrivate::unhideOldItem(QQuickControl *control, QQuickItem *item)
-+{
-+    Q_ASSERT(item);
-+    qCDebug(lcItemManagement) << "unhiding old item" << item;
-+
-+    item->setVisible(true);
-+    item->setParentItem(control);
-+
-+#if QT_CONFIG(accessibility)
-+    // Add the item back in to the accessibility tree.
-+    QQuickAccessibleAttached *accessible = accessibleAttached(item);
-+    if (accessible)
-+        accessible->setIgnored(false);
-+#endif
-+}
-+
- void QQuickControlPrivate::updateBaselineOffset()
- {
-     Q_Q(QQuickControl);
-diff --git a/src/quicktemplates2/qquickcontrol_p_p.h b/src/quicktemplates2/qquickcontrol_p_p.h
-index 8e979079e..a6e624c91 100644
---- a/src/quicktemplates2/qquickcontrol_p_p.h
-+++ b/src/quicktemplates2/qquickcontrol_p_p.h
-@@ -173,6 +173,7 @@ public:
-     virtual void executeBackground(bool complete = false);
- 
-     static void hideOldItem(QQuickItem *item);
-+    static void unhideOldItem(QQuickControl *control, QQuickItem *item);
- 
-     void updateBaselineOffset();
- 
-diff --git a/src/quicktemplates2/qquickscrollbar.cpp b/src/quicktemplates2/qquickscrollbar.cpp
-index 4e2f509db..1c4b308cd 100644
---- a/src/quicktemplates2/qquickscrollbar.cpp
-+++ b/src/quicktemplates2/qquickscrollbar.cpp
-@@ -797,6 +797,14 @@ void QQuickScrollBarAttachedPrivate::initHorizontal()
-     if (parent && parent == flickable->parentItem())
-         horizontal->stackAfter(flickable);
- 
-+    // If a scroll bar was previously hidden (due to e.g. setting a new contentItem
-+    // on a ScrollView), we need to make sure that we un-hide it.
-+    // We don't bother checking if the item is actually the old one, because
-+    // if it's not, all of the things the function does (setting parent, visibility, etc.)
-+    // should be no-ops anyway.
-+    if (auto control = qobject_cast<QQuickControl*>(q_ptr->parent()))
-+        QQuickControlPrivate::unhideOldItem(control, horizontal);
-+
-     layoutHorizontal();
-     horizontal->setSize(area->property("widthRatio").toReal());
-     horizontal->setPosition(area->property("xPosition").toReal());
-@@ -818,6 +826,9 @@ void QQuickScrollBarAttachedPrivate::initVertical()
-     if (parent && parent == flickable->parentItem())
-         vertical->stackAfter(flickable);
- 
-+    if (auto control = qobject_cast<QQuickControl*>(q_ptr->parent()))
-+        QQuickControlPrivate::unhideOldItem(control, vertical);
-+
-     layoutVertical();
-     vertical->setSize(area->property("heightRatio").toReal());
-     vertical->setPosition(area->property("yPosition").toReal());
-diff --git a/tests/auto/controls/data/tst_scrollview.qml b/tests/auto/controls/data/tst_scrollview.qml
-index 0e8b08352..cd4931184 100644
---- a/tests/auto/controls/data/tst_scrollview.qml
-+++ b/tests/auto/controls/data/tst_scrollview.qml
-@@ -576,4 +576,51 @@ TestCase {
-         verify(newHorizontalScrollBar.visible)
-         verify(!oldHorizontalScrollBar.visible)
-     }
-+
-+    Component {
-+        id: bindingToContentItemAndStandaloneFlickable
-+
-+        Item {
-+            width: 200
-+            height: 200
-+
-+            property alias scrollView: scrollView
-+
-+            ScrollView {
-+                id: scrollView
-+                anchors.fill: parent
-+                contentItem: listView
-+
-+                property Item someBinding: contentItem
-+            }
-+            ListView {
-+                id: listView
-+                model: 10
-+                delegate: ItemDelegate {
-+                    text: modelData
-+                    width: listView.width
-+                }
-+            }
-+        }
-+    }
-+
-+    // Tests that scroll bars show up for a ScrollView where
-+    // - its contentItem is declared as a standalone, separate item
-+    // - there is a binding to contentItem (which causes a default Flickable to be created)
-+    function test_bindingToContentItemAndStandaloneFlickable() {
-+        let root = createTemporaryObject(bindingToContentItemAndStandaloneFlickable, testCase)
-+        verify(root)
-+
-+        let control = root.scrollView
-+        let verticalScrollBar = control.ScrollBar.vertical
-+        let horizontalScrollBar = control.ScrollBar.horizontal
-+        compare(verticalScrollBar.parent, control)
-+        compare(horizontalScrollBar.parent, control)
-+        verify(verticalScrollBar.visible)
-+        verify(horizontalScrollBar.visible)
-+
-+        mouseDrag(verticalScrollBar, verticalScrollBar.width / 2, verticalScrollBar.height / 2, 0, 50)
-+        verify(verticalScrollBar.active)
-+        verify(horizontalScrollBar.active)
-+    }
- }
--- 
-GitLab
-
diff --git a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.7-r1.ebuild b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.7-r1.ebuild
new file mode 100644
index 000000000000..0c4cd5241fff
--- /dev/null
+++ b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.7-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} != *9999* ]]; then
+	QT5_KDEPATCHSET_REV=2
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+fi
+
+inherit qt5-build
+
+DESCRIPTION="Set of next generation Qt Quick controls for the Qt5 framework"
+
+IUSE="widgets"
+
+DEPEND="
+	=dev-qt/qtcore-${QT5_PV}*
+	=dev-qt/qtdeclarative-${QT5_PV}*
+	=dev-qt/qtgui-${QT5_PV}*
+	widgets? ( =dev-qt/qtwidgets-${QT5_PV}* )
+"
+RDEPEND="${DEPEND}
+	=dev-qt/qtgraphicaleffects-${QT5_PV}*
+"
+
+src_prepare() {
+	qt_use_disable_mod widgets widgets \
+		src/imports/platform/platform.pro
+
+	qt5-build_src_prepare
+}