aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--community/qt6-qtbase/APKBUILD11
-rw-r--r--community/qt6-qtbase/qtbug-102177.patch69
2 files changed, 4 insertions, 76 deletions
diff --git a/community/qt6-qtbase/APKBUILD b/community/qt6-qtbase/APKBUILD
index a6e33f970f..d8518261c0 100644
--- a/community/qt6-qtbase/APKBUILD
+++ b/community/qt6-qtbase/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=qt6-qtbase
-pkgver=6.3.0
-pkgrel=2
+pkgver=6.3.1
+pkgrel=0
pkgdesc="A cross-platform application and UI framework"
url="https://qt.io/"
arch="all"
@@ -62,9 +62,7 @@ case $pkgver in
*) _rel=official_releases;;
esac
-source="https://download.qt.io/$_rel/qt/${pkgver%.*}/${pkgver/_/-}/submodules/qtbase-everywhere-src-${pkgver/_/-}.tar.xz
- qtbug-102177.patch
- "
+source="https://download.qt.io/$_rel/qt/${pkgver%.*}/${pkgver/_/-}/submodules/qtbase-everywhere-src-${pkgver/_/-}.tar.xz"
case "$CTARGET_ARCH" in
arm*|aarch64) _opengl="-DQT_FEATURE_opengles2=ON" ;;
@@ -160,6 +158,5 @@ x11() {
}
sha512sums="
-aec9f7cee0c195178a282ab3efa6b3dd09dbe3317ec25c8f748c6cc0ea1ffe37dc62d3b062129d2458179620059e8bb694aacd1e331cbf49838075fa3381ee81 qtbase-everywhere-src-6.3.0.tar.xz
-885530936651a5d79920a0e0176a4b898b0a500a967a4b3dc1e5b61d9a767cbc60de3cdbf02ad0c936a9456112d08211f708d6327c04544942b8c64600c664d9 qtbug-102177.patch
+5c4304dc1f5fa80201b61c9c8dbf4c3449506a243ea1f87e336dc3641a37b9d40c2aa4a93190cc69ddde0f349c74e327c35de5f46de888ddfd49616903e8a7b5 qtbase-everywhere-src-6.3.1.tar.xz
"
diff --git a/community/qt6-qtbase/qtbug-102177.patch b/community/qt6-qtbase/qtbug-102177.patch
deleted file mode 100644
index c0840777c5..0000000000
--- a/community/qt6-qtbase/qtbug-102177.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-Patch-Source: https://code.qt.io/cgit/qt/qtbase.git/commit/?id=b49f7e064c648f7de9782f1a5bbd652429db8e5b
-From 94751cbfb54f98cf1b1be14c6e22a8b93547a177 Mon Sep 17 00:00:00 2001
-From: Jarek Kobus <jaroslaw.kobus@qt.io>
-Date: Thu, 31 Mar 2022 11:34:29 +0200
-Subject: Ensure that readAllStandardError() doesn't crash on assert
-
-Ensure that it's safe to call readAllStandardError()
-when process channel mode is set to MergedChannels.
-
-Task-number: QTBUG-102177
-Task-number: QTCREATORBUG-27196
-Change-Id: I01073255d9347dee4654d602802a12d341372b73
-Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
-(cherry picked from commit b49f7e064c648f7de9782f1a5bbd652429db8e5b)
-Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
----
- src/corelib/io/qprocess.cpp | 14 ++++++++++----
- tests/auto/corelib/io/qprocess/tst_qprocess.cpp | 10 ++++++++++
- 2 files changed, 20 insertions(+), 4 deletions(-)
-
-diff --git a/src/corelib/io/qprocess.cpp b/src/corelib/io/qprocess.cpp
-index 3378412502..6d85d1e87e 100644
---- a/src/corelib/io/qprocess.cpp
-+++ b/src/corelib/io/qprocess.cpp
-@@ -1942,10 +1942,16 @@ QByteArray QProcess::readAllStandardOutput()
- */
- QByteArray QProcess::readAllStandardError()
- {
-- ProcessChannel tmp = readChannel();
-- setReadChannel(StandardError);
-- QByteArray data = readAll();
-- setReadChannel(tmp);
-+ Q_D(QProcess);
-+ QByteArray data;
-+ if (d->processChannelMode == MergedChannels) {
-+ qWarning("QProcess::readAllStandardError: Called with MergedChannels");
-+ } else {
-+ ProcessChannel tmp = readChannel();
-+ setReadChannel(StandardError);
-+ data = readAll();
-+ setReadChannel(tmp);
-+ }
- return data;
- }
-
-diff --git a/tests/auto/corelib/io/qprocess/tst_qprocess.cpp b/tests/auto/corelib/io/qprocess/tst_qprocess.cpp
-index 80005a7284..16b7dc666f 100644
---- a/tests/auto/corelib/io/qprocess/tst_qprocess.cpp
-+++ b/tests/auto/corelib/io/qprocess/tst_qprocess.cpp
-@@ -1082,6 +1082,16 @@ void tst_QProcess::mergedChannels()
-
- QVERIFY(process.waitForStarted(5000));
-
-+ {
-+ QCOMPARE(process.write("abc"), qlonglong(3));
-+ while (process.bytesAvailable() < 6)
-+ QVERIFY(process.waitForReadyRead(5000));
-+ QCOMPARE(process.readAllStandardOutput(), QByteArray("aabbcc"));
-+ QTest::ignoreMessage(QtWarningMsg,
-+ "QProcess::readAllStandardError: Called with MergedChannels");
-+ QCOMPARE(process.readAllStandardError(), QByteArray());
-+ }
-+
- for (int i = 0; i < 100; ++i) {
- QCOMPARE(process.write("abc"), qlonglong(3));
- while (process.bytesAvailable() < 6)
---
-cgit v1.2.1
-