From f23d41fe8af059e1dbe2b4687a4569a6fd6f8187 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Fri, 11 Feb 2022 18:05:54 +0000 Subject: recipes-qt: update ambiguous "BSD" license with "BSD-3-Clause" OE-Core recently removed ambiguous "BSD" license in order for recipes to be more specific and use the exact variants of BSD. Update meta-qt5 recipes with "BSD-3-Clause" as that was the previous default. Signed-off-by: Denys Dmytriyenko Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtimageformats_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'recipes-qt/qt5/qtimageformats_git.bb') diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index 43db80ff..c49a1d76 100644 --- a/recipes-qt/qt5/qtimageformats_git.bb +++ b/recipes-qt/qt5/qtimageformats_git.bb @@ -1,7 +1,7 @@ require qt5.inc require qt5-git.inc -LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )" +LICENSE = "GFDL-1.3 & BSD-3-Clause & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )" LIC_FILES_CHKSUM = " \ file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \ -- cgit v1.2.3 From cc3d1c0c9b62f2062e980562c38b11d7dbdede1c Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 22 Feb 2022 10:22:23 +0100 Subject: meta: update license names * openembedded-core/scripts/contrib/convert-spdx-licenses.py . ... All files processed with version 0.01 Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtimageformats_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'recipes-qt/qt5/qtimageformats_git.bb') diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index c49a1d76..d954d16d 100644 --- a/recipes-qt/qt5/qtimageformats_git.bb +++ b/recipes-qt/qt5/qtimageformats_git.bb @@ -1,7 +1,7 @@ require qt5.inc require qt5-git.inc -LICENSE = "GFDL-1.3 & BSD-3-Clause & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )" +LICENSE = "GFDL-1.3 & BSD-3-Clause & ( GPL-3.0-only & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0-or-later | LGPL-3.0-only | The-Qt-Company-Commercial )" LIC_FILES_CHKSUM = " \ file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \ -- cgit v1.2.3 From 74c27fa59b329f1210d39e8cd2904acf30d10838 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 7 Mar 2022 13:44:09 +0100 Subject: qt5: upgrade to v5.15.3-lts-lgpl * https://github.com/meta-qt5/meta-qt5/issues/455 * https://lists.qt-project.org/pipermail/development/2022-March/042262.html qtbase/0021-qfloat16-Include-limits-header.patch partially resolved in upstream commit: 0afad46bb7 Fix build with GCC 11: include qtbase/0022-fix_timezone_dst.patch resolved in upstream commits: 692c7e021f Fix QTzTimeZonePrivate::displayName()'s fallback 5f91ed1493 QTzTimeZonePrivate::init(): fix handling of empty ID 9f74724d84 Fix handling of Sunday in POSIX time-zone rules qtsvg/CVE-2021-3481.patch: partially resolved in upstream commit: aceea78 Improve handling of malformed numeric values in svg files but the 2nd part is still needed. qtcoap, qtknx, qtmqtt, qtopcua: keep QT_MODULE_BRANCH "5.15.2" as it still wasn't downmerged to 5.15 branch and there is no v5.15.3-lts-lgpl tag in these as well Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtimageformats_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'recipes-qt/qt5/qtimageformats_git.bb') diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index d954d16d..790c3612 100644 --- a/recipes-qt/qt5/qtimageformats_git.bb +++ b/recipes-qt/qt5/qtimageformats_git.bb @@ -25,4 +25,4 @@ PACKAGECONFIG[libwebp] = ",CONFIG+=done_config_libwebp,libwebp" EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "74a5bc4a45195b876454e596e76cb23aeb365410" +SRCREV = "3f5d4216e52351a76ba9deae18c7f022c0c8b163" -- cgit v1.2.3