From 68a1b890a67c693e79354bfcc3a8bcfe377edc2a Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Fri, 13 Dec 2024 06:45:42 +0000
Subject: [PATCH] squish: support styhead

Support the new UNPACKDIR style used in styhead and the old WORKDIR
style used in older Yocto releases.
Skip buildpath QA tests for squish source package, generated source
files have references to build paths.

Change-Id: Ia3477abb29544219236f97d9d10c49fd49ef5509
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
---
 recipes-qt/squish/squish_8.0-20240704-1900.bb | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/recipes-qt/squish/squish_8.0-20240704-1900.bb b/recipes-qt/squish/squish_8.0-20240704-1900.bb
index caeeefd..b9dcebd 100644
--- a/recipes-qt/squish/squish_8.0-20240704-1900.bb
+++ b/recipes-qt/squish/squish_8.0-20240704-1900.bb
@@ -32,8 +32,12 @@ OE_QMAKE_PATH_HOST_LIBEXECS = "${STAGING_DIR_NATIVE}/${QT6_INSTALL_LIBEXECDIR}"
 do_install_squish[cleandirs] = "${WORKDIR}/squish"
 do_install_squish[network] = "1"
 do_install_squish() {
-    chmod +x ${WORKDIR}/squish-${PV}-qt67x-linux64.run
-    TMPDIR=${WORKDIR}/tmp XDG_RUNTIME_DIR=${WORKDIR}/tmp ${WORKDIR}/squish-${PV}-qt67x-linux64.run \
+    SQUISH_INSTALLER=${UNPACKDIR}/squish-${PV}-qt67x-linux64.run
+    if [ ! -e $SQUISH_INSTALLER ]; then
+        SQUISH_INSTALLER=${WORKDIR}/squish-${PV}-qt67x-linux64.run
+    fi
+    chmod +x $SQUISH_INSTALLER
+    TMPDIR=${WORKDIR}/tmp XDG_RUNTIME_DIR=${WORKDIR}/tmp $SQUISH_INSTALLER \
         -platform minimal unattended=1 targetdir=${WORKDIR}/squish ide=0
 }
 
@@ -85,3 +89,5 @@ FILES:${PN}-staticdev += "\
 "
 
 addtask install_squish after do_unpack before do_configure
+
+INSANE_SKIP:${PN}-src += "buildpaths"