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: update recipe

Browse Source 
Update squish to newer version 8.0 snapshot & enable again.

Change-Id: I3d27670ee01a9763d7dfefa28a0dddbfbb75a5e9
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
This commit is contained in:
Mikko Gronoff 2024-06-13 14:59:44 +03:00
parent 57fef415fc
commit 2fd331fc38
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
coin/test-configs.inc
View File

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

19
recipes-qt/squish/squish_7.2-20240124-0915.bb → recipes-qt/squish/squish_8.0-20240704-1900.bb
View File

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