From 4d7c35d7ac84a76d1f3e7958f1eda230cc1f6853 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Tue, 25 Mar 2025 06:56:23 +0000
Subject: [PATCH] squish: upgrade to Squish 9.0.0

Latest release supporting Qt 6.8.

Change-Id: If8fb06c0d2e25f61187558d68f38667cf93af221
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
---
 ...1-Use-correct-prefix-for-Xft-include.patch | 26 -------------------
 .../{squish_8.1.0.bb => squish_9.0.0.bb}      |  7 +++--
 2 files changed, 3 insertions(+), 30 deletions(-)
 delete mode 100644 recipes-qt/squish/squish/0001-Use-correct-prefix-for-Xft-include.patch
 rename recipes-qt/squish/{squish_8.1.0.bb => squish_9.0.0.bb} (90%)

diff --git a/recipes-qt/squish/squish/0001-Use-correct-prefix-for-Xft-include.patch b/recipes-qt/squish/squish/0001-Use-correct-prefix-for-Xft-include.patch
deleted file mode 100644
index 4e0075a..0000000
--- a/recipes-qt/squish/squish/0001-Use-correct-prefix-for-Xft-include.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 4c4daf9c1d2b32bcd19206f91d50aaf8f073c764 Mon Sep 17 00:00:00 2001
-From: Samuli Piippo <samuli.piippo@qt.io>
-Date: Fri, 24 Jan 2025 16:54:17 +0000
-Subject: [PATCH] Use correct prefix for Xft include
-
-Use sysroot prefix include path to prevent:
-  cc1plus: error: include location "/usr/include/freetype2" is unsafe for cross-compilation [-Werror=poison-system-directories]
-
-Upstream-Status: Pending
----
- configure.cos | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.cos b/configure.cos
-index 138e5fe..d1c1723 100644
---- a/configure.cos
-+++ b/configure.cos
-@@ -2257,7 +2257,7 @@ function checkXft()
-     if ( compileTest( target ) ) {
-         msgResult( "yes" );
-         config["LIBXFT"] = libXft;
--        config["XFT_INC"] = ["/usr/include/freetype2"];
-+        config["XFT_INC"] = [freetypePrefix + "/include/freetype2"];
-         defines["HAVE_XFT"] = 1;
-         return true;
-     }
diff --git a/recipes-qt/squish/squish_8.1.0.bb b/recipes-qt/squish/squish_9.0.0.bb
similarity index 90%
rename from recipes-qt/squish/squish_8.1.0.bb
rename to recipes-qt/squish/squish_9.0.0.bb
index 2b17cf0..049c62f 100644
--- a/recipes-qt/squish/squish_8.1.0.bb
+++ b/recipes-qt/squish/squish_9.0.0.bb
@@ -1,5 +1,5 @@
 LICENSE = "Squish-Commercial-License-Agreement"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=899603087536444c628655da3a982a75"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a25acc1c5f693af9921102a049958aa8"
 
 EXCLUDE_FROM_WORLD = "1"
 
@@ -19,11 +19,10 @@ SQUISH_INSTALLER = "squish-${PV}-qt68x-linux64.run"
 SRC_URI = "\
     ${SQUISH_MIRROR}/${SQUISH_INSTALLER};name=squish \
     ${SQUISH_MIRROR}/squish-${PV}-qt-embedded-src.tar.gz;name=qt-squish-embedded \
-    file://0001-Use-correct-prefix-for-Xft-include.patch \
 "
 
-SRC_URI[squish.sha256sum] = "2ff96e9f2e8594833c186d0b34f12f2014b2fcd30f087e53edc39066587c42b6"
-SRC_URI[qt-squish-embedded.sha256sum] = "729870aafba482d7a772c930209830796a5c9d4a8ab0c49e8caa54738f1032e8"
+SRC_URI[squish.sha256sum] = "145191899db959d627861094a7d3cfcb11ebb614cb96a3d7e9f564b2b6081a71"
+SRC_URI[qt-squish-embedded.sha256sum] = "4a64c4304defdc937efe997862a65c5d17d654f425a9d2a6840c6c62dbbc698e"
 
 S = "${WORKDIR}/squish-${PV}-qt-embedded-src"
 B = "${WORKDIR}/build"