aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoromni <omni+alpine@hack.org>2023-11-27 12:32:00 +0000
committerBart Ribbers <bribbers@disroot.org>2023-11-27 21:49:01 +0000
commit20063b448c5b4eb4dc71f534001274428e09f8df (patch)
treed5b185e0ad9a262b959b3430e50dd300257b7f04
parent79c7ad570b9ba19db3cef27a256254c07cab1db2 (diff)
community/qt6-qtbase: upgrade to 6.6.1
-rw-r--r--community/qt6-qtbase/0002-fix-build-with-xkbcommon-160.patch39
-rw-r--r--community/qt6-qtbase/0003-qt6-qtbase-fix-race-condition-on-atspi-startup-on-wayland.patch39
-rw-r--r--community/qt6-qtbase/APKBUILD10
3 files changed, 3 insertions, 85 deletions
diff --git a/community/qt6-qtbase/0002-fix-build-with-xkbcommon-160.patch b/community/qt6-qtbase/0002-fix-build-with-xkbcommon-160.patch
deleted file mode 100644
index 7c1b0e8e985..00000000000
--- a/community/qt6-qtbase/0002-fix-build-with-xkbcommon-160.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 8af35d27e8f02bbb99aef4ac495ed406e50e3cca Mon Sep 17 00:00:00 2001
-From: Liang Qi <liang.qi@qt.io>
-Date: Tue, 10 Oct 2023 14:08:48 +0200
-Subject: [PATCH] xkb: fix build with libxkbcommon 1.6.0 and later
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-A few XKB_KEY_dead_* defines got removed from 1.6.0. See also
-https://github.com/xkbcommon/libxkbcommon/blob/6073565903488cb5b9a8d37fdc4a7c2f9d7ad04d/NEWS#L9-L14
-https://gitlab.freedesktop.org/xorg/proto/xorgproto/-/merge_requests/70/diffs?commit_id=cb44799b72f611eb4c9d7cc185bc3b09e070be08
-
-Pick-to: 6.6 6.5 6.2 5.15
-Fixes: QTBUG-117950
-Change-Id: I55861868f2bb29c553d68365fa9b9b6ed01c9aea
-Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
----
- src/gui/platform/unix/qxkbcommon.cpp | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/gui/platform/unix/qxkbcommon.cpp b/src/gui/platform/unix/qxkbcommon.cpp
-index 26d87c5ff59..7b611790c67 100644
---- a/src/gui/platform/unix/qxkbcommon.cpp
-+++ b/src/gui/platform/unix/qxkbcommon.cpp
-@@ -237,10 +237,14 @@ static constexpr const auto KeyTbl = qMakeArray(
- Xkb2Qt<XKB_KEY_dead_small_schwa, Qt::Key_Dead_Small_Schwa>,
- Xkb2Qt<XKB_KEY_dead_capital_schwa, Qt::Key_Dead_Capital_Schwa>,
- Xkb2Qt<XKB_KEY_dead_greek, Qt::Key_Dead_Greek>,
-+/* The following four XKB_KEY_dead keys got removed in libxkbcommon 1.6.0
-+ The define check is kind of version check here. */
-+#ifdef XKB_KEY_dead_lowline
- Xkb2Qt<XKB_KEY_dead_lowline, Qt::Key_Dead_Lowline>,
- Xkb2Qt<XKB_KEY_dead_aboveverticalline, Qt::Key_Dead_Aboveverticalline>,
- Xkb2Qt<XKB_KEY_dead_belowverticalline, Qt::Key_Dead_Belowverticalline>,
- Xkb2Qt<XKB_KEY_dead_longsolidusoverlay, Qt::Key_Dead_Longsolidusoverlay>,
-+#endif
-
- // Special keys from X.org - This include multimedia keys,
- // wireless/bluetooth/uwb keys, special launcher keys, etc.
diff --git a/community/qt6-qtbase/0003-qt6-qtbase-fix-race-condition-on-atspi-startup-on-wayland.patch b/community/qt6-qtbase/0003-qt6-qtbase-fix-race-condition-on-atspi-startup-on-wayland.patch
deleted file mode 100644
index d94ee5f38d2..00000000000
--- a/community/qt6-qtbase/0003-qt6-qtbase-fix-race-condition-on-atspi-startup-on-wayland.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 197e5915585e8978e8b98a861f71f2d22b0d930e Mon Sep 17 00:00:00 2001
-From: Harald Sitter <sitter@kde.org>
-Date: Tue, 1 Aug 2023 13:56:24 +0200
-Subject: [PATCH] a11y: fix race condition on atspi startup on Wayland
-
-This amends db346e711c9af50566c234cfc21199680e6cb499 .
-
-Previously we could race between dbus connecting and our "manual"
-enabled call since we didn't take into account whether dbus is
-connected or not.
-
-This lead to scenarios where opening an application (in particular under
-Wayland) would result in the application not being able to register on
-the a11y bus because registration was attempted too early.
-By simply taking connectedness into account we'll make sure to not
-run registration too early anymore.
-
-Pick-to: 6.5
-Change-Id: I46a3c0b57f8a0c83d3e5fae9e355c2061954031f
-Reviewed-by: Liang Qi <liang.qi@qt.io>
-(cherry picked from commit 918fed39156c90540a12557c7a6630ae3d7d841e)
-Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
----
- src/gui/accessible/linux/qspiaccessiblebridge.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/gui/accessible/linux/qspiaccessiblebridge.cpp b/src/gui/accessible/linux/qspiaccessiblebridge.cpp
-index f59d8be18bc..8a3f82e08b4 100644
---- a/src/gui/accessible/linux/qspiaccessiblebridge.cpp
-+++ b/src/gui/accessible/linux/qspiaccessiblebridge.cpp
-@@ -38,7 +38,7 @@ QSpiAccessibleBridge::QSpiAccessibleBridge()
- // But do that only on next loop, once dbus is really settled.
- QTimer::singleShot(
- 0, this, [this]{
-- if (dbusConnection->isEnabled())
-+ if (dbusConnection->isEnabled() && dbusConnection->connection().isConnected())
- enabledChanged(true);
- });
- }
diff --git a/community/qt6-qtbase/APKBUILD b/community/qt6-qtbase/APKBUILD
index c7b254cc6ef..cec7c1cc921 100644
--- a/community/qt6-qtbase/APKBUILD
+++ b/community/qt6-qtbase/APKBUILD
@@ -3,8 +3,8 @@
# The group tag is just to easily find this APKBUILD by some scripts for automation
# group=qt6
pkgname=qt6-qtbase
-pkgver=6.6.0
-pkgrel=2
+pkgver=6.6.1
+pkgrel=0
pkgdesc="A cross-platform application and UI framework"
url="https://qt.io/"
arch="all"
@@ -68,8 +68,6 @@ esac
source="https://download.qt.io/$_rel/qt/${pkgver%.*}/${pkgver/_/-}/submodules/qtbase-everywhere-src-${pkgver/_/-}.tar.xz
0001-lfs64.patch
- 0002-fix-build-with-xkbcommon-160.patch
- 0003-qt6-qtbase-fix-race-condition-on-atspi-startup-on-wayland.patch
"
# secfixes:
@@ -179,8 +177,6 @@ x11() {
}
sha512sums="
-4e85acefeddc0a3cd6ba615b4768f435c4e237a605172153a1777a10285dab83d9cf220c18ce6d723d051b8b432f3e92be94925b54c2eb972c2c1d9ace849e17 qtbase-everywhere-src-6.6.0.tar.xz
+93e77b9b077a3acd5607b643db282fdd7ed0bdfa07df74c3f0d2285afeb1672a6fa229a7e7a6c8a462701305fc22ffef20c212d906484e50fb5cdb706a7b72e1 qtbase-everywhere-src-6.6.1.tar.xz
390e2998483696e4af6f754be6611eb01f93b5185e81f8ad21c45cd267bab58a347902230b456b4c9fae339d6b8ecb6f7cf695e90fb086d92b9c5f7561993898 0001-lfs64.patch
-79325f50f77d6eddceb24ac84c9a7769f1906353c5c7d90c52a18ec39bf28c4c79913c5a495461f578004016cf0b1f569c3a072b09c8d2eb9d269e1001fcc8b1 0002-fix-build-with-xkbcommon-160.patch
-5b716aaec1ea4719f268a350958018934aaa21f1787b883243c253c7ebec6404591fa37c00f63a30ef489ed42620a6cba83ae0f64d3c93bdeca0e73eb65ef20f 0003-qt6-qtbase-fix-race-condition-on-atspi-startup-on-wayland.patch
"