[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/, dev-qt/qtcore/files/

[Andreas Sturmlechner]

commit:     8d4714fcd0c97dfa8c420ef2596923d9b3a5379f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 22 12:58:24 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Sep 22 19:47:17 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d4714fc

dev-qt/qtcore: Switch to KDE 64a00680 snapshot

Incorporates upstream commit d2bd04d9fe03912097d3246b7d03ef14f425256b,
so we can drop a patch from FILESDIR. Does not otherwise change anything
for dev-qt/qtcore.

Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-qt/qtcore/Manifest                             |  2 +-
 .../files/qtcore-5.15.2-revert-3a273ac4.patch      | 56 ----------------------
 dev-qt/qtcore/qtcore-5.15.2-r10.ebuild             |  5 +-
 3 files changed, 2 insertions(+), 61 deletions(-)

diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index 6ec5cdd58fd..6dd68edabe8 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -1,3 +1,3 @@
-DIST qtbase-5.15.2-c2ea67ec.tar.gz 67964503 BLAKE2B 2f55d1913d840a9150912074e81b7ebc38d86dbe259a51f65924868d97ed0cd5852fd6387e85933e956b0bd80404284b9e0f01506080f154751c0e1cf27ba398 SHA512 40eeaca1698613ab0c756053b58737cbef9fceed7cf7007aec5b558f992675a25d304ec83afdc7eab34bb854149d4e0ce61f2cc03003b553b4fc8a786f258e17
+DIST qtbase-5.15.2-64a00680.tar.gz 67963186 BLAKE2B ad8cdd4f18e44791467f607585eed0ef00d16316cf31f246eb4fb7db650af4a9831792a84df8c0a59c34a538eb43de85a3815558425e5cc6d5c77695e954d5d2 SHA512 c5959125cffbfc817024a039ae6c9c5b0a5b3fef0d45e178e008ba3e4fbd79ff35f2a97ebd986897b700aca50e14183891dcd517c18674ccec410c7b4bf45a12
 DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4
 DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9

diff --git a/dev-qt/qtcore/files/qtcore-5.15.2-revert-3a273ac4.patch b/dev-qt/qtcore/files/qtcore-5.15.2-revert-3a273ac4.patch
deleted file mode 100644
index a29e1b5256d..00000000000
--- a/dev-qt/qtcore/files/qtcore-5.15.2-revert-3a273ac4.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From d9a85af5f24d0608c79b2d87b01213833bee01e5 Mon Sep 17 00:00:00 2001
-From: David Faure <david.faure@××××.com>
-Date: Thu, 19 Aug 2021 15:07:13 +0200
-Subject: [PATCH] Revert "QString::lastIndexOf: fix off-by-one for zero length
- matches"
-
-This reverts commit 3a273ac47f20e82a1f2f63411b210025ca0f4495.
-
-See QTBUG-94215
-
-6cee204d56205e250b0675c9c6d4dd8a2367f3c4 for qtbase/dev changes the
-behaviour even further, I'm pretty sure we don't want that in Qt 5.15.x,
-see discussion in https://codereview.qt-project.org/c/qt/qtbase/+/365179.
-
-Change-Id: I663d74e0d44ebf46291fe0e8a7dc609be82eedc6
----
- src/corelib/text/qstring.cpp                    | 4 ++--
- tests/auto/corelib/text/qstring/tst_qstring.cpp | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/corelib/text/qstring.cpp b/src/corelib/text/qstring.cpp
-index 02a9fe3a30..e6e7cbaad4 100644
---- a/src/corelib/text/qstring.cpp
-+++ b/src/corelib/text/qstring.cpp
-@@ -4558,13 +4558,13 @@ int QString::lastIndexOf(const QRegularExpression &re, int from, QRegularExpress
-         return -1;
-     }
- 
--    int endpos = (from < 0) ? (size() + from + 1) : (from);
-+    int endpos = (from < 0) ? (size() + from + 1) : (from + 1);
-     QRegularExpressionMatchIterator iterator = re.globalMatch(*this);
-     int lastIndex = -1;
-     while (iterator.hasNext()) {
-         QRegularExpressionMatch match = iterator.next();
-         int start = match.capturedStart();
--        if (start <= endpos) {
-+        if (start < endpos) {
-             lastIndex = start;
-             if (rmatch)
-                 *rmatch = std::move(match);
-diff --git a/tests/auto/corelib/text/qstring/tst_qstring.cpp b/tests/auto/corelib/text/qstring/tst_qstring.cpp
-index 8f53824050..4c4a8f0416 100644
---- a/tests/auto/corelib/text/qstring/tst_qstring.cpp
-+++ b/tests/auto/corelib/text/qstring/tst_qstring.cpp
-@@ -1674,7 +1674,7 @@ void tst_QString::lastIndexOf()
-     QCOMPARE(haystack.lastIndexOf(needle.toLatin1(), from, cs), expected);
-     QCOMPARE(haystack.lastIndexOf(needle.toLatin1().data(), from, cs), expected);
- 
--    if (from >= -1 && from < haystack.size() && needle.size() > 0) {
-+    if (from >= -1 && from < haystack.size()) {
-         // unfortunately, QString and QRegExp don't have the same out of bound semantics
-         // I think QString is wrong -- See file log for contact information.
-         {
--- 
-GitLab
-

diff --git a/dev-qt/qtcore/qtcore-5.15.2-r10.ebuild b/dev-qt/qtcore/qtcore-5.15.2-r10.ebuild
index d8791013a67..7cdf654113b 100644
--- a/dev-qt/qtcore/qtcore-5.15.2-r10.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.2-r10.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-KDE_ORG_COMMIT=c2ea67ecefe049f6e9bb8f910d7f9c60319d8619
+KDE_ORG_COMMIT=64a0068011e12f178fb7ff65fafe7cfaa4620719
 QT5_MODULE="qtbase"
 inherit linux-info qt5-build
 
@@ -48,9 +48,6 @@ QT5_GENTOO_PRIVATE_CONFIG=(
 PATCHES=(
 	"${FILESDIR}"/${PN}-5.14.1-cmake-macro-backward-compat.patch # bug 703306
 	"${FILESDIR}"/${PN}-5.15.1-timezone-{1,2}.patch # bug 737914
-	# Revert to 5.15.2 (upstream Qt release) behavior, QTBUG-94215
-	# See also: https://invent.kde.org/qt/qt/qtbase/-/merge_requests/46
-	"${FILESDIR}"/${P}-revert-3a273ac4.patch
 )
 
 pkg_pretend() {