CaROS/meta-qt6
3
0
Fork 0
mirror of http://code.qt.io/yocto/meta-qt6.git synced 2026-01-01 13:58:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

squish: upgrade to Squish 9.0.0

Browse Source 
Latest release supporting Qt 6.8.

Change-Id: If8fb06c0d2e25f61187558d68f38667cf93af221
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
This commit is contained in:
Samuli Piippo 2025-03-25 06:56:23 +00:00
parent adb13e7931
commit 4d7c35d7ac
2 changed files with 3 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
recipes-qt/squish/squish/0001-Use-correct-prefix-for-Xft-include.patch
View File

@ -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;
}

7
recipes-qt/squish/squish_8.1.0.bb → recipes-qt/squish/squish_9.0.0.bb
View File

@ -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"