From 83db9197163e138a16c0f3d5a0b7aa19dc26e049 Mon Sep 17 00:00:00 2001
From: Felitendo <95575686+Felitendo@users.noreply.github.com>
Date: Fri, 24 Jul 2026 09:32:31 +0200
Subject: [PATCH] chiaki-ng-bin: apply Qt6GuiPrivate patch only when the tag
 lacks the fix

---
 chiaki-ng-bin/pkg.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/chiaki-ng-bin/pkg.sh b/chiaki-ng-bin/pkg.sh
index 7783c4f..b794dda 100644
--- a/chiaki-ng-bin/pkg.sh
+++ b/chiaki-ng-bin/pkg.sh
@@ -33,7 +33,10 @@ build_artifact() {
   # use the system curl instead of the vendored submodule
   git -C "$srctree" rm -q third-party/curl
   sed -i 's:libcurl_shared:libcurl:' "$srctree/lib/CMakeLists.txt"
-  patch -d "$srctree" -p1 < "$pkgdir/Qt6GuiPrivate-fix.patch"
+  # 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"
+  fi
   git -C "$srctree" submodule update --init
 
   CFLAGS="${CFLAGS:-} -std=gnu17" cmake -B "$workdir/build" -S "$srctree" -Wno-dev \