qt6-base-fourier: rebase 6.11.0 -> 6.11.1 to track upstream extra
Triggered by 'pacman -Syu' on fresnel showing local 1:6.11.0-2 newer than (then-)extra 6.11.0-4. By the time of this commit Arch has moved on to 6.11.1-1; rebase straight to that. Diff against Arch's qt6-base 6.11.1 PKGBUILD reduced: - _pkgver 6.11.0 -> 6.11.1 - pkgrel 3 -> 1 (reset on pkgver bump) - sha256 of git tag updated to 2eafe504... (matches Arch's 6.11.1 PKGBUILD) - Drop cherry-pick of 8b54513cdcf6 (qdbus crash fix landed upstream in 6.11.1; Arch dropped it from theirs as well) - depends: gcc-libs replaced by libgcc + libstdc++ (Arch split these into separate packages between 6.11.0 and 6.11.1) - Build flag: -DFEATURE_sql_ibase=OFF removed, -DFEATURE_mimetype_database=OFF added (Arch toggled in 6.11.1) Kept (the reason this fork exists): - 0001/0002/0003 GL_R8-on-ES3 patches (Mali GLES3 KWin compositor stall fix) - qt6-base-cflags.patch + qt6-base-nostrip.patch (system CFLAGS + skip strip) - qt6-xcb-private-headers-fourier sub-package (depended on by other fork pkgs) - epoch=1 (precedence guarantee until upstream lands GL_R8/ES3 fix) Patches NOT dry-run-verified against 6.11.1 source (qt clone is multi-GB and impractical to fetch for a quick check). They touch glyph cache and RHI gles2 paths that have been stable since Qt 6.10; expected to apply cleanly. Will revert pkgrel and re-pin if first build hits hunk failures.
This commit is contained in:
@@ -21,14 +21,14 @@
|
|||||||
# pkgbase stays as qt6-base so $_pkgfn (= ${pkgbase/6-/} = "qtbase")
|
# pkgbase stays as qt6-base so $_pkgfn (= ${pkgbase/6-/} = "qtbase")
|
||||||
# resolves correctly. The "-fourier" suffix lives only in the
|
# resolves correctly. The "-fourier" suffix lives only in the
|
||||||
# directory name and the commit history; epoch=1 gives our local
|
# directory name and the commit history; epoch=1 gives our local
|
||||||
# build strict precedence over upstream pkgrel=2 until upstream lands
|
# build strict precedence over upstream pkgrel=N until upstream lands
|
||||||
# the GL_R8/ES3 fix and we can drop the epoch.
|
# the GL_R8/ES3 fix and we can drop the epoch.
|
||||||
pkgbase=qt6-base
|
pkgbase=qt6-base
|
||||||
pkgname=(qt6-base-fourier
|
pkgname=(qt6-base-fourier
|
||||||
qt6-xcb-private-headers-fourier)
|
qt6-xcb-private-headers-fourier)
|
||||||
_pkgver=6.11.0
|
_pkgver=6.11.1
|
||||||
pkgver=${_pkgver/-/}
|
pkgver=${_pkgver/-/}
|
||||||
pkgrel=3
|
pkgrel=1
|
||||||
epoch=1
|
epoch=1
|
||||||
arch=(aarch64 x86_64)
|
arch=(aarch64 x86_64)
|
||||||
url='https://www.qt.io'
|
url='https://www.qt.io'
|
||||||
@@ -42,7 +42,6 @@ depends=(brotli
|
|||||||
double-conversion
|
double-conversion
|
||||||
fontconfig
|
fontconfig
|
||||||
freetype2
|
freetype2
|
||||||
gcc-libs
|
|
||||||
glib2
|
glib2
|
||||||
glibc
|
glibc
|
||||||
harfbuzz
|
harfbuzz
|
||||||
@@ -51,6 +50,7 @@ depends=(brotli
|
|||||||
libb2
|
libb2
|
||||||
libcups
|
libcups
|
||||||
libdrm
|
libdrm
|
||||||
|
libgcc
|
||||||
libgl
|
libgl
|
||||||
libice
|
libice
|
||||||
libinput
|
libinput
|
||||||
@@ -58,6 +58,7 @@ depends=(brotli
|
|||||||
libpng
|
libpng
|
||||||
libproxy
|
libproxy
|
||||||
libsm
|
libsm
|
||||||
|
libstdc++
|
||||||
liburing
|
liburing
|
||||||
libx11
|
libx11
|
||||||
libxcb
|
libxcb
|
||||||
@@ -115,7 +116,7 @@ source=(git+https://code.qt.io/qt/$_pkgfn#tag=v$_pkgver
|
|||||||
0001-qopengltextureglyphcache-pick-GL_R8-on-ES3.patch
|
0001-qopengltextureglyphcache-pick-GL_R8-on-ES3.patch
|
||||||
0002-qrhigles2-RED_OR_ALPHA8-pick-GL_R8-on-ES3.patch
|
0002-qrhigles2-RED_OR_ALPHA8-pick-GL_R8-on-ES3.patch
|
||||||
0003-qopengltextureuploader-pick-GL_R8-on-ES3.patch)
|
0003-qopengltextureuploader-pick-GL_R8-on-ES3.patch)
|
||||||
sha256sums=('2223c075e95d86f8dbf6395b025a74d996c418f094453c903290e3c2663fbed2'
|
sha256sums=('2eafe504fae873d20f206b5661e2e10506879455cb2d370f42c5bb72ccf7a8a1'
|
||||||
'5411edbe215c24b30448fac69bd0ba7c882f545e8cf05027b2b6e2227abc5e78'
|
'5411edbe215c24b30448fac69bd0ba7c882f545e8cf05027b2b6e2227abc5e78'
|
||||||
'4b93f6a79039e676a56f9d6990a324a64a36f143916065973ded89adc621e094'
|
'4b93f6a79039e676a56f9d6990a324a64a36f143916065973ded89adc621e094'
|
||||||
'SKIP'
|
'SKIP'
|
||||||
@@ -126,9 +127,8 @@ prepare() {
|
|||||||
patch -d $_pkgfn -p1 < qt6-base-cflags.patch # Use system CFLAGS
|
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 < qt6-base-nostrip.patch # Don't strip binaries with qmake
|
||||||
|
|
||||||
# cherry-pick needs git author identity; git-cli refuses without it.
|
# 8b54513cdcf6 (qdbus crash fix) cherry-pick removed: landed upstream
|
||||||
git -C $_pkgfn -c user.email=fourier@build -c user.name='qt6-base-fourier build' \
|
# in 6.11.1. Re-add if qdbus regressions re-surface.
|
||||||
cherry-pick -n 8b54513cdcf62047376a5d27d784ad68a8f235bf # Fix qdbus crashes
|
|
||||||
|
|
||||||
# qt6-base-fourier — three small runtime-checks that pick GL_R8 over
|
# qt6-base-fourier — three small runtime-checks that pick GL_R8 over
|
||||||
# GL_ALPHA when the live GL context is ES 3 or newer. See the
|
# GL_ALPHA when the live GL context is ES 3 or newer. See the
|
||||||
@@ -165,7 +165,7 @@ build() {
|
|||||||
-DFEATURE_system_sqlite=ON \
|
-DFEATURE_system_sqlite=ON \
|
||||||
-DFEATURE_system_xcb_xinput=ON \
|
-DFEATURE_system_xcb_xinput=ON \
|
||||||
-DFEATURE_no_direct_extern_access=$_no_direct_extern_access \
|
-DFEATURE_no_direct_extern_access=$_no_direct_extern_access \
|
||||||
-DFEATURE_sql_ibase=OFF \
|
-DFEATURE_mimetype_database=OFF \
|
||||||
-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \
|
-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \
|
||||||
-DCMAKE_MESSAGE_LOG_LEVEL=STATUS
|
-DCMAKE_MESSAGE_LOG_LEVEL=STATUS
|
||||||
cmake --build build
|
cmake --build build
|
||||||
|
|||||||
Reference in New Issue
Block a user