diff --git a/extra/qt6-base/PKGBUILD b/extra/qt6-base/PKGBUILD index def67ef61..1feb75392 100644 --- a/extra/qt6-base/PKGBUILD +++ b/extra/qt6-base/PKGBUILD @@ -6,7 +6,7 @@ # - disable ibase for now, FTBFS pkgname=qt6-base -_qtver=6.2.4 +_qtver=6.3.0 pkgver=${_qtver/-/} pkgrel=1 arch=(x86_64) @@ -28,17 +28,17 @@ optdepends=('qt6-wayland: to run Qt6 applications in a Wayland session' 'perl: for syncqt') groups=(qt6) options=(debug) -_pkgfn="${pkgname/6-/}-everywhere-src-$_qtver" +_pkgfn=${pkgname/6-/}-everywhere-src-$_qtver source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz - qmake-cflags.patch - qmake-config.patch) -sha256sums=('d9924d6fd4fa5f8e24458c87f73ef3dfc1e7c9b877a5407c040d89e6736e2634' + qt6-base-cflags.patch + qt6-base-nostrip.patch) +sha256sums=('b865aae43357f792b3b0a162899d9bf6a1393a55c4e5e4ede5316b157b1a0f99' '5411edbe215c24b30448fac69bd0ba7c882f545e8cf05027b2b6e2227abc5e78' - '4abc22150fa3e06b2fdcec32146abc9be4e316692aa4d5bd5aa53b4b726783fa') + '4b93f6a79039e676a56f9d6990a324a64a36f143916065973ded89adc621e094') prepare() { - patch -d $_pkgfn -p1 < qmake-cflags.patch # Use system CFLAGS - patch -d $_pkgfn -p1 < qmake-config.patch # Don't strip binaries with qmake and use -ltcg, cf. QTBUG-73834 + 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 } build() { @@ -57,6 +57,7 @@ build() { -DQT_FEATURE_journald=ON \ -DQT_FEATURE_openssl_linked=ON \ -DQT_FEATURE_system_sqlite=ON \ + -DQT_FEATURE_system_xcb_xinput=ON \ -DQT_FEATURE_sql_ibase=OFF \ -DCMAKE_CXX_FLAGS="${CXXFLAGS} -DUSE_X11" # https://bugreports.qt.io/browse/QTBUG-96392 cmake --build build diff --git a/extra/qt6-base/qmake-cflags.patch b/extra/qt6-base/qt6-base-cflags.patch similarity index 100% rename from extra/qt6-base/qmake-cflags.patch rename to extra/qt6-base/qt6-base-cflags.patch diff --git a/extra/qt6-base/qmake-config.patch b/extra/qt6-base/qt6-base-nostrip.patch similarity index 93% rename from extra/qt6-base/qmake-config.patch rename to extra/qt6-base/qt6-base-nostrip.patch index 77d9694b3..17d24b4b6 100644 --- a/extra/qt6-base/qmake-config.patch +++ b/extra/qt6-base/qt6-base-nostrip.patch @@ -6,7 +6,7 @@ index 99d77156fd..fc840fe9f6 100644 # you can use the manual test in tests/manual/mkspecs. # -+CONFIG += nostrip ltcg ++CONFIG += nostrip + QMAKE_CFLAGS_OPTIMIZE = -O2 QMAKE_CFLAGS_OPTIMIZE_FULL = -O3