chiaki-ng-bin: apply Qt6GuiPrivate patch only when the tag lacks the fix
This commit is contained in:
1 parent
f42572b41a
commit
83db919716
1 file changed
+3
@@ -33,7 +33,10 @@ build_artifact() {
|
|||||||
# use the system curl instead of the vendored submodule
|
# use the system curl instead of the vendored submodule
|
||||||
git -C "$srctree" rm -q third-party/curl
|
git -C "$srctree" rm -q third-party/curl
|
||||||
sed -i 's:libcurl_shared:libcurl:' "$srctree/lib/CMakeLists.txt"
|
sed -i 's:libcurl_shared:libcurl:' "$srctree/lib/CMakeLists.txt"
|
||||||
|
# newer tags (>= 1.10.0) carry the GuiPrivate fix themselves
|
||||||
|
if ! grep -q 'GuiPrivate' "$srctree/gui/CMakeLists.txt"; then
|
||||||
patch -d "$srctree" -p1 < "$pkgdir/Qt6GuiPrivate-fix.patch"
|
patch -d "$srctree" -p1 < "$pkgdir/Qt6GuiPrivate-fix.patch"
|
||||||
|
fi
|
||||||
git -C "$srctree" submodule update --init
|
git -C "$srctree" submodule update --init
|
||||||
|
|
||||||
CFLAGS="${CFLAGS:-} -std=gnu17" cmake -B "$workdir/build" -S "$srctree" -Wno-dev \
|
CFLAGS="${CFLAGS:-} -std=gnu17" cmake -B "$workdir/build" -S "$srctree" -Wno-dev \
|
||||||
|
|||||||
Reference in new issue
Block a user