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 (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A27D115807A for ; Wed, 9 Oct 2024 04:25:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9A420E29A6; Wed, 9 Oct 2024 04:25:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 11BC9E29A6 for ; Wed, 9 Oct 2024 04:25:20 +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 3D8E1340C8A for ; Wed, 9 Oct 2024 04:25:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4D731B36 for ; Wed, 9 Oct 2024 04:25:17 +0000 (UTC) From: "orbea" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "orbea" Message-ID: <1728443878.dc781b4f0a4f13f27667fc0e3d051f2bee349437.orbea@gentoo> Subject: [gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtbase/files/, dev-qt/qtbase/ X-VCS-Repository: repo/proj/libressl X-VCS-Files: dev-qt/qtbase/files/qtbase-6.7.3-QTBUG-125053.patch dev-qt/qtbase/qtbase-6.7.3-r1.ebuild dev-qt/qtbase/qtbase-6.7.3-r2.ebuild X-VCS-Directories: dev-qt/qtbase/files/ dev-qt/qtbase/ X-VCS-Committer: orbea X-VCS-Committer-Name: orbea X-VCS-Revision: dc781b4f0a4f13f27667fc0e3d051f2bee349437 X-VCS-Branch: master Date: Wed, 9 Oct 2024 04:25: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: eb494372-39f9-408a-8071-90b7a65f0aa9 X-Archives-Hash: 7e1ef0ba7d897fe38d063a7798b5c93e commit: dc781b4f0a4f13f27667fc0e3d051f2bee349437 Author: orbea riseup net> AuthorDate: Wed Oct 9 03:17:58 2024 +0000 Commit: orbea riseup net> CommitDate: Wed Oct 9 03:17:58 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=dc781b4f dev-qt/qtbase: add 6.7.3-r2, drop 6.7.3-r1 Signed-off-by: orbea riseup.net> .../qtbase/files/qtbase-6.7.3-QTBUG-125053.patch | 46 ++++++++++++++++++++++ ...base-6.7.3-r1.ebuild => qtbase-6.7.3-r2.ebuild} | 1 + 2 files changed, 47 insertions(+) diff --git a/dev-qt/qtbase/files/qtbase-6.7.3-QTBUG-125053.patch b/dev-qt/qtbase/files/qtbase-6.7.3-QTBUG-125053.patch new file mode 100644 index 0000000..fc60e30 --- /dev/null +++ b/dev-qt/qtbase/files/qtbase-6.7.3-QTBUG-125053.patch @@ -0,0 +1,46 @@ +https://bugreports.qt.io/browse/QTBUG-125053 +https://bugreports.qt.io/browse/QTBUG-127340 +https://codereview.qt-project.org/c/qt/qtbase/+/593123 +--- a/src/corelib/itemmodels/qabstractitemmodel.cpp ++++ b/src/corelib/itemmodels/qabstractitemmodel.cpp +@@ -3396,4 +3396,11 @@ + void QAbstractItemModel::beginResetModel() + { ++ Q_D(QAbstractItemModel); ++ if (d->resetting) { ++ qWarning() << "beginResetModel called on" << this << "without calling endResetModel first"; ++ // Warn, but don't return early in case user code relies on the incorrect behavior. ++ } ++ ++ d->resetting = true; + emit modelAboutToBeReset(QPrivateSignal()); + } +@@ -3413,6 +3420,12 @@ + { + Q_D(QAbstractItemModel); ++ if (!d->resetting) { ++ qWarning() << "endResetModel called on" << this << "without calling beginResetModel first"; ++ // Warn, but don't return early in case user code relies on the incorrect behavior. ++ } ++ + d->invalidatePersistentIndexes(); + resetInternalData(); ++ d->resetting = false; + emit modelReset(QPrivateSignal()); + } +--- a/src/corelib/itemmodels/qabstractitemmodel_p.h ++++ b/src/corelib/itemmodels/qabstractitemmodel_p.h +@@ -46,4 +46,6 @@ + ~QAbstractItemModelPrivate(); + ++ static const QAbstractItemModelPrivate *get(const QAbstractItemModel *model) { return model->d_func(); } ++ + void removePersistentIndexData(QPersistentModelIndexData *data); + void movePersistentIndexes(const QList &indexes, int change, const QModelIndex &parent, +@@ -116,4 +118,6 @@ + } persistent; + ++ bool resetting = false; ++ + static const QHash &defaultRoleNames(); + static bool isVariantLessThan(const QVariant &left, const QVariant &right, diff --git a/dev-qt/qtbase/qtbase-6.7.3-r1.ebuild b/dev-qt/qtbase/qtbase-6.7.3-r2.ebuild similarity index 99% rename from dev-qt/qtbase/qtbase-6.7.3-r1.ebuild rename to dev-qt/qtbase/qtbase-6.7.3-r2.ebuild index 660c9cf..1c3de53 100644 --- a/dev-qt/qtbase/qtbase-6.7.3-r1.ebuild +++ b/dev-qt/qtbase/qtbase-6.7.3-r2.ebuild @@ -149,6 +149,7 @@ PATCHES=( "${FILESDIR}"/${PN}-6.7.2-qcontiguouscache.patch "${FILESDIR}"/${PN}-6.7.2-haswell-no-rdrnd.patch "${FILESDIR}"/${PN}-6.7.3-erratic-mouse-input.patch + "${FILESDIR}"/${PN}-6.7.3-QTBUG-125053.patch ) src_prepare() {