From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DA3B1158042 for ; Sat, 19 Oct 2024 22:20:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 01810E07F1; Sat, 19 Oct 2024 22:20:20 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D4DAEE07F1 for ; Sat, 19 Oct 2024 22:20:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D55D034309C for ; Sat, 19 Oct 2024 22:20:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4238E1315 for ; Sat, 19 Oct 2024 22:20:17 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1729376395.419035b78d22c5d4ef2fe8f0240c70c771d2a4fe.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtdeclarative/files/, dev-qt/qtdeclarative/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-qt/qtdeclarative/files/qtdeclarative-6.7.3-QTBUG-129165.patch dev-qt/qtdeclarative/qtdeclarative-6.7.3-r2.ebuild dev-qt/qtdeclarative/qtdeclarative-6.7.3-r3.ebuild X-VCS-Directories: dev-qt/qtdeclarative/ dev-qt/qtdeclarative/files/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 419035b78d22c5d4ef2fe8f0240c70c771d2a4fe X-VCS-Branch: master Date: Sat, 19 Oct 2024 22:20:17 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8563f7a7-c6da-4045-a9cf-b06a3b623997 X-Archives-Hash: c57cc48512eb78c23e9f26323d854aad commit: 419035b78d22c5d4ef2fe8f0240c70c771d2a4fe Author: Ionen Wolkens gentoo org> AuthorDate: Sat Oct 19 22:06:54 2024 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Sat Oct 19 22:19:55 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=419035b7 dev-qt/qtdeclarative: backport QTBUG-129165 fix for kcm_pulseaudio Signed-off-by: Ionen Wolkens gentoo.org> .../files/qtdeclarative-6.7.3-QTBUG-129165.patch | 162 +++++++++++++++++++++ ...7.3-r2.ebuild => qtdeclarative-6.7.3-r3.ebuild} | 1 + 2 files changed, 163 insertions(+) diff --git a/dev-qt/qtdeclarative/files/qtdeclarative-6.7.3-QTBUG-129165.patch b/dev-qt/qtdeclarative/files/qtdeclarative-6.7.3-QTBUG-129165.patch new file mode 100644 index 000000000000..78ea5f72a341 --- /dev/null +++ b/dev-qt/qtdeclarative/files/qtdeclarative-6.7.3-QTBUG-129165.patch @@ -0,0 +1,162 @@ +Recommended backport from 6.8.0 to prevent a crash with kcm_pulseaudio. +https://bugreports.qt.io/browse/QTBUG-129165 +https://bugs.kde.org/show_bug.cgi?id=493266 +(kde bug mentions is for 6.8.0, but was seemingly the -rc without the fix) +--- a/src/quick/items/qquickitemview.cpp ++++ b/src/quick/items/qquickitemview.cpp +@@ -11,4 +11,5 @@ + + Q_LOGGING_CATEGORY(lcItemViewDelegateLifecycle, "qt.quick.itemview.lifecycle") ++Q_LOGGING_CATEGORY(lcCount, "qt.quick.itemview.count") + + // Default cacheBuffer for all views. +@@ -224,5 +225,5 @@ + if (QQmlDelegateModel *dataModel = qobject_cast(d->model)) + QObjectPrivate::connect(dataModel, &QQmlDelegateModel::delegateChanged, d, &QQuickItemViewPrivate::applyDelegateChange); +- emit countChanged(); ++ d->emitCountChanged(); + } + emit modelChanged(); +@@ -256,5 +257,5 @@ + dataModel->setDelegate(delegate); + if (oldCount != dataModel->count()) +- emit countChanged(); ++ d->emitCountChanged(); + } + emit delegateChanged(); +@@ -1126,4 +1127,12 @@ + } + ++// Simplifies debugging of count. ++void QQuickItemViewPrivate::emitCountChanged() ++{ ++ Q_Q(QQuickItemView); ++ qCDebug(lcCount).nospace() << "about to emit countChanged for " << q << "; count changed to " << q->count(); ++ emit q->countChanged(); ++} ++ + void QQuickItemViewPrivate::itemGeometryChanged(QQuickItem *item, QQuickGeometryChange change, + const QRectF &oldGeometry) +@@ -1225,5 +1234,5 @@ + } + d->moveReason = QQuickItemViewPrivate::Other; +- emit countChanged(); ++ d->emitCountChanged(); + #if QT_CONFIG(quick_viewtransitions) + if (d->transitioner && d->transitioner->populateTransition) +@@ -1488,5 +1497,5 @@ + } + if (d->model && d->model->count()) +- emit countChanged(); ++ d->emitCountChanged(); + } + +@@ -1814,5 +1823,5 @@ + + if (prevCount != itemCount) +- emit q->countChanged(); ++ emitCountChanged(); + } while (currentChanges.hasPendingChanges() || bufferedChanges.hasPendingChanges()); + storeFirstVisibleItemPosition(); +@@ -1865,4 +1874,14 @@ + // views (see tst_QQuickListView::resizeView). + if ((!isValid() && !visibleItems.size()) || q->size().isNull()) { ++ if (q->size().isNull() && hasPendingChanges()) { ++ // count() refers to the number of items in the model, not in the view ++ // (which is why we don't emit for the !visibleItems.size() case). ++ // If there are pending model changes, emit countChanged in order to ++ // support the use case of QTBUG-129165, where visible is bound to count > 0 ++ // and the ListView is in a layout with Layout.preferredHeight bound to ++ // contentHeight. This ensures that a hidden ListView will become visible. ++ emitCountChanged(); ++ } ++ + clear(); + setPosition(contentStartOffset()); +@@ -2139,5 +2158,5 @@ + updateSections(); + if (prevItemCount != itemCount) +- emit q->countChanged(); ++ emitCountChanged(); + if (!visibleAffected && viewportChanged) + updateViewport(); +--- a/src/quick/items/qquickitemview_p_p.h ++++ b/src/quick/items/qquickitemview_p_p.h +@@ -230,4 +230,6 @@ + } + ++ void emitCountChanged(); ++ + virtual QQuickItemViewAttached *getAttachedObject(const QObject *) const { return nullptr; } + +--- a/tests/auto/quick/qquicklistview2/data/visibleBoundToCountGreaterThanZero.qml ++++ b/tests/auto/quick/qquicklistview2/data/visibleBoundToCountGreaterThanZero.qml +@@ -0,0 +1,31 @@ ++import QtQuick ++import QtQuick.Layouts ++ ++ColumnLayout { ++ property alias listView: listView ++ ++ ListView { ++ id: listView ++ ++ visible: count > 0 // actual defect. countChanged never fires so this never turns true ++ ++ Layout.fillWidth: true ++ Layout.preferredHeight: contentHeight // grow with content, initially 0 ++ ++ model: ListModel { ++ id: idModel ++ } ++ ++ delegate: Text { ++ required property string name ++ text: name ++ } ++ ++ Timer { ++ running: true ++ interval: 10 ++ repeat: true ++ onTriggered: idModel.append({name:"Hello"}) ++ } ++ } ++} +--- a/tests/auto/quick/qquicklistview2/tst_qquicklistview2.cpp ++++ b/tests/auto/quick/qquicklistview2/tst_qquicklistview2.cpp +@@ -19,4 +19,6 @@ + using namespace QQuickVisualTestUtils; + ++static const int oneSecondInMs = 1000; ++ + class tst_QQuickListView2 : public QQmlDataTest + { +@@ -69,4 +71,5 @@ + + void clearObjectListModel(); ++ void visibleBoundToCountGreaterThanZero(); + + private: +@@ -1313,4 +1316,21 @@ + } + ++void tst_QQuickListView2::visibleBoundToCountGreaterThanZero() ++{ ++ QQuickView window; ++ QVERIFY(QQuickTest::showView(window, testFileUrl("visibleBoundToCountGreaterThanZero.qml"))); ++ ++ auto *listView = window.rootObject()->property("listView").value(); ++ QVERIFY(listView); ++ ++ QSignalSpy countChangedSpy(listView, SIGNAL(countChanged())); ++ QVERIFY(countChangedSpy.isValid()); ++ ++ QTRY_COMPARE_GT_WITH_TIMEOUT(listView->count(), 1, oneSecondInMs); ++ // Using the TRY variant here as well is necessary. ++ QTRY_COMPARE_GT_WITH_TIMEOUT(countChangedSpy.count(), 1, oneSecondInMs); ++ QVERIFY(listView->isVisible()); ++} ++ + QTEST_MAIN(tst_QQuickListView2) + diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.7.3-r2.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.7.3-r3.ebuild similarity index 97% rename from dev-qt/qtdeclarative/qtdeclarative-6.7.3-r2.ebuild rename to dev-qt/qtdeclarative/qtdeclarative-6.7.3-r3.ebuild index 749123d1c04f..83e4113532cf 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-6.7.3-r2.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-6.7.3-r3.ebuild @@ -35,6 +35,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-6.7.3-QTBUG-125053.patch + "${FILESDIR}"/${PN}-6.7.3-QTBUG-129165.patch ) src_configure() {