From 2fd331fc382f81417cad0b2e8fd9f84acd256c54 Mon Sep 17 00:00:00 2001
From: Mikko Gronoff <mikko.gronoff@qt.io>
Date: Thu, 13 Jun 2024 14:59:44 +0300
Subject: [PATCH] squish: update recipe

Update squish to newer version 8.0 snapshot & enable again.

Change-Id: I3d27670ee01a9763d7dfefa28a0dddbfbb75a5e9
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
---
 coin/test-configs.inc                         |  2 +-
 ...24-0915.bb => squish_8.0-20240704-1900.bb} | 19 +++++++++----------
 2 files changed, 10 insertions(+), 11 deletions(-)
 rename recipes-qt/squish/{squish_7.2-20240124-0915.bb => squish_8.0-20240704-1900.bb} (80%)

diff --git a/coin/test-configs.inc b/coin/test-configs.inc
index 3625b5a..9aa295a 100644
--- a/coin/test-configs.inc
+++ b/coin/test-configs.inc
@@ -35,7 +35,7 @@ INSANE_SKIP:nativesdk-qemu-user-mips = "build-deps"
 PREFERRED_ARM_INSTRUCTION_SET              ?= "thumb"
 ARM_INSTRUCTION_SET = "${PREFERRED_ARM_INSTRUCTION_SET}"
 
-#RDEPENDS:${PN}:append:pn-packagegroup-qt6-addons = " squish"
+RDEPENDS:${PN}:append:pn-packagegroup-qt6-addons = " squish"
 
 # enable webengine with commercial/proprietary features
 DISTRO_FEATURES:append = " webengine"
diff --git a/recipes-qt/squish/squish_7.2-20240124-0915.bb b/recipes-qt/squish/squish_8.0-20240704-1900.bb
similarity index 80%
rename from recipes-qt/squish/squish_7.2-20240124-0915.bb
rename to recipes-qt/squish/squish_8.0-20240704-1900.bb
index 0aafc3a..caeeefd 100644
--- a/recipes-qt/squish/squish_7.2-20240124-0915.bb
+++ b/recipes-qt/squish/squish_8.0-20240704-1900.bb
@@ -1,20 +1,19 @@
 LICENSE = "Squish-Commercial-License-Agreement"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=26ea9708fd32ef443b69239b5d9b343c"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=899603087536444c628655da3a982a75"
 
 EXCLUDE_FROM_WORLD = "1"
 
 inherit qt6-qmake
-inherit disable-build
 
-SQUISH_MIRROR ?= "https://ci-files01-hki.ci.qt.io/input/squish/coin/66x/20240124"
+SQUISH_MIRROR ?= "https://ci-files01-hki.ci.qt.io/input/squish/coin/67x"
 
 SRC_URI = "\
-    ${SQUISH_MIRROR}/squish-${PV}-qt66x-linux64.run;name=squish \
+    ${SQUISH_MIRROR}/squish-${PV}-qt67x-linux64.run;name=squish \
     ${SQUISH_MIRROR}/squish-${PV}-qt-embedded-src.tar.gz;name=qt-squish-embedded \
 "
 
-SRC_URI[squish.sha256sum] = "69689f25cecf07ce15f8e8975f9cf44d85cc1d0f628d3013dfb6dfc9f562aa91"
-SRC_URI[qt-squish-embedded.sha256sum] = "8f0c03f3814eb44f2366f0599e7f6ef52446651fc1882bd487918e441ceac07a"
+SRC_URI[squish.sha256sum] = "5a84e611a9bdda23f5fcc3ee08945f99d13629afa695c6bb38c59bf4ad5c3591"
+SRC_URI[qt-squish-embedded.sha256sum] = "64fe9a6728c299fa29ee7c03077edd0562e9a79198511e74dd4d89ca9adddf2a"
 
 S = "${WORKDIR}/squish-${PV}-qt-embedded-src"
 B = "${WORKDIR}/build"
@@ -33,9 +32,9 @@ 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}-qt66x-linux64.run
-    TMPDIR=${WORKDIR}/tmp XDG_RUNTIME_DIR=${WORKDIR}/tmp ${WORKDIR}/squish-${PV}-qt66x-linux64.run \
-        -platform minimal unattended=1 targetdir=${WORKDIR}/squish ide=0 testcenter=0
+    chmod +x ${WORKDIR}/squish-${PV}-qt67x-linux64.run
+    TMPDIR=${WORKDIR}/tmp XDG_RUNTIME_DIR=${WORKDIR}/tmp ${WORKDIR}/squish-${PV}-qt67x-linux64.run \
+        -platform minimal unattended=1 targetdir=${WORKDIR}/squish ide=0
 }
 
 do_configure() {
@@ -73,7 +72,7 @@ FILES:${PN} += "\
 "
 FILES:${PN}-dev += "\
     /opt/squish/qtbuiltinhook.pri \
-    /opt/squish/LICENSE \
+    /opt/squish/LICENSE.txt \
     /opt/squish/include \
     /opt/squish/lib/cmake \
     /opt/squish/sdk \