upg qt6-base
This commit is contained in:
parent
9f4e63f0c6
commit
91d6db8b72
|
|
@ -8,7 +8,7 @@
|
|||
pkgname=qt6-base
|
||||
_qtver=6.6.0
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=02
|
||||
pkgrel=03
|
||||
url='https://www.qt.io'
|
||||
pkgdesc='A cross-platform application and UI framework w/o systemd'
|
||||
depends=(brotli dbus double-conversion fontconfig freetype2 gcc-libs
|
||||
|
|
@ -31,19 +31,20 @@ optdepends=('freetds: MS SQL driver'
|
|||
'postgresql-libs: PostgreSQL driver'
|
||||
'qt6-wayland: to run Qt6 applications in a Wayland session'
|
||||
'unixodbc: ODBC driver')
|
||||
|
||||
groups=(qt6)
|
||||
#options=(debug) # uncomment this to have qt6-base-debug produced
|
||||
_pkgfn="${pkgname/6-/}-everywhere-src-$_qtver"
|
||||
source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz
|
||||
qt6-base-cflags.patch
|
||||
qt6-base-nostrip.patch
|
||||
libxkbcommon-1.6.patch::https://code.qt.io/cgit/qt/qtbase.git/patch/?id=8af35d27)
|
||||
libxkbcommon-1.6.patch::https://code.qt.io/cgit/qt/qtbase.git/patch/?id=8af35d27
|
||||
qt6-base-fix-a11y.patch::https://code.qt.io/cgit/qt/qtbase.git/patch?id=197e5915)
|
||||
|
||||
prepare() {
|
||||
patch -d $_pkgfn -p1 < qt6-base-cflags.patch # Use system CFLAGS
|
||||
patch -d $_pkgfn -p1 < qt6-base-nostrip.patch # Don't strip binaries with qmake
|
||||
patch -d $_pkgfn -p1 < libxkbcommon-1.6.patch # Fix build with libxkbcommon 1.6
|
||||
patch -d $_pkgfn -p1 < qt6-base-fix-a11y.patch # Fix accessibility on Wayland
|
||||
}
|
||||
|
||||
build() {
|
||||
|
|
@ -97,7 +98,8 @@ license=(GPL3 LGPL3 FDL custom)
|
|||
sha256sums=(039d53312acb5897a9054bd38c9ccbdab72500b71fdccdb3f4f0844b0dd39e0e # qtbase-everywhere-src-6.6.0.tar.xz
|
||||
5411edbe215c24b30448fac69bd0ba7c882f545e8cf05027b2b6e2227abc5e78 # qt6-base-cflags.patch
|
||||
4b93f6a79039e676a56f9d6990a324a64a36f143916065973ded89adc621e094 # qt6-base-nostrip.patch
|
||||
f3e81eca8e41b93889943a20da94d683fb5b706cb0f9dc8b851d653df3a1bbf6) # libxkbcommon-1.6.patch
|
||||
f3e81eca8e41b93889943a20da94d683fb5b706cb0f9dc8b851d653df3a1bbf6 # libxkbcommon-1.6.patch
|
||||
40fda77b524f2f46a7081f68f68650edff1b02220756363fc5222b1349de9e9b) # qt6-base-fix-a11y.patch
|
||||
|
||||
## 1a5297075a40fb5c43883df176ec0105940264a55376ae63b85a91f02a762749 qt6-base-6.6.0-02-x86_64.pkg.tar.lz
|
||||
## 44764ff6c93a8bae13612826000ba4c4d0d04d5114054490ad3d07f1a9807e3b qt6-base-6.6.0-03-x86_64.pkg.tar.lz
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
pkgname=qt6-base
|
||||
_qtver=6.6.0
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=2
|
||||
pkgrel=3
|
||||
arch=(x86_64)
|
||||
url='https://www.qt.io'
|
||||
license=(GPL3 LGPL3 FDL custom)
|
||||
|
|
@ -81,16 +81,19 @@ _pkgfn=${pkgname/6-/}-everywhere-src-$_qtver
|
|||
source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz
|
||||
qt6-base-cflags.patch
|
||||
qt6-base-nostrip.patch
|
||||
libxkbcommon-1.6.patch::https://code.qt.io/cgit/qt/qtbase.git/patch/?id=8af35d27)
|
||||
libxkbcommon-1.6.patch::https://code.qt.io/cgit/qt/qtbase.git/patch/?id=8af35d27
|
||||
qt6-base-fix-a11y.patch::https://code.qt.io/cgit/qt/qtbase.git/patch?id=197e5915)
|
||||
sha256sums=('039d53312acb5897a9054bd38c9ccbdab72500b71fdccdb3f4f0844b0dd39e0e'
|
||||
'5411edbe215c24b30448fac69bd0ba7c882f545e8cf05027b2b6e2227abc5e78'
|
||||
'4b93f6a79039e676a56f9d6990a324a64a36f143916065973ded89adc621e094'
|
||||
'f3e81eca8e41b93889943a20da94d683fb5b706cb0f9dc8b851d653df3a1bbf6')
|
||||
'f3e81eca8e41b93889943a20da94d683fb5b706cb0f9dc8b851d653df3a1bbf6'
|
||||
'40fda77b524f2f46a7081f68f68650edff1b02220756363fc5222b1349de9e9b')
|
||||
|
||||
prepare() {
|
||||
patch -d $_pkgfn -p1 < qt6-base-cflags.patch # Use system CFLAGS
|
||||
patch -d $_pkgfn -p1 < qt6-base-nostrip.patch # Don't strip binaries with qmake
|
||||
patch -d $_pkgfn -p1 < libxkbcommon-1.6.patch # Fix build with libxkbcommon 1.6
|
||||
patch -d $_pkgfn -p1 < qt6-base-fix-a11y.patch # Fix accessibility on Wayland
|
||||
}
|
||||
|
||||
build() {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,42 @@
|
|||
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: 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 f59d8be18b..8a3f82e08b 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);
|
||||
});
|
||||
}
|
||||
--
|
||||
cgit v1.2.3
|
||||
|
||||
Loading…
Reference in New Issue