From 92833a85e73a6f6a2377b3e3fcdf0eb7ee810520 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 7 Nov 2024 05:48:49 +0000 Subject: [PATCH] qt6: update licenses The Qt-GPL-exception-1.0 license has not been used in few module for a while and the license file was now removed. More accurate licenses for qtdoc and webengine modules. Pick-to: 6.8 Change-Id: I7833593f0e45fb4c89cc8deff6124835dce3ba41 Reviewed-by: Mikko Gronoff --- recipes-qt/qt6/qtcharts_git.bb | 3 +-- recipes-qt/qt6/qtdoc_git.bb | 4 ++-- recipes-qt/qt6/qtimageformats_git.bb | 3 +-- recipes-qt/qt6/qtquicktimeline_git.bb | 3 +-- recipes-qt/qt6/qtwebchannel_git.bb | 3 +-- recipes-qt/qt6/qtwebengine.inc | 5 ++++- recipes-qt/qt6/qtwebsockets_git.bb | 3 +-- recipes-qt/qt6/qtwebview_git.bb | 3 +-- 8 files changed, 12 insertions(+), 15 deletions(-) diff --git a/recipes-qt/qt6/qtcharts_git.bb b/recipes-qt/qt6/qtcharts_git.bb index 5bcbc7d..7d27917 100644 --- a/recipes-qt/qt6/qtcharts_git.bb +++ b/recipes-qt/qt6/qtcharts_git.bb @@ -1,9 +1,8 @@ -LICENSE = "The-Qt-Company-Commercial | (GPL-3.0-only & Qt-GPL-exception-1.0) & GFDL-1.3-no-invariants-only" +LICENSE = "The-Qt-Company-Commercial | GPL-3.0-only & GFDL-1.3-no-invariants-only" LIC_FILES_CHKSUM = " \ file://LICENSES/GFDL-1.3-no-invariants-only.txt;md5=a22d0be1ce2284b67950a4d1673dd1b0 \ file://LICENSES/GPL-3.0-only.txt;md5=d32239bcb673463ab874e80d47fae504 \ file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \ - file://LICENSES/Qt-GPL-exception-1.0.txt;md5=9a13522cd91a88fba784baf16ea66af8 \ " inherit qt6-cmake diff --git a/recipes-qt/qt6/qtdoc_git.bb b/recipes-qt/qt6/qtdoc_git.bb index 2ec789b..0a55c61 100644 --- a/recipes-qt/qt6/qtdoc_git.bb +++ b/recipes-qt/qt6/qtdoc_git.bb @@ -1,4 +1,4 @@ -LICENSE = "(The-Qt-Company-Commercial | (GPL-3.0-only & Qt-GPL-exception-1.0) & GFDL-1.3-no-invariants-only & BSD-3-Clause) & Apache-2.0 & CC-BY-4.0 & CC-BY-SA-4.0" +LICENSE = "(The-Qt-Company-Commercial | GPL-3.0-only & GFDL-1.3-no-invariants-only & BSD-3-Clause) & Apache-2.0 & CC-BY-4.0 & CC-BY-SA-4.0 & ISC" LIC_FILES_CHKSUM = " \ file://LICENSES/Apache-2.0.txt;md5=b4c615f64dff32f71eeed614d13dfd4c \ file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \ @@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = " \ file://LICENSES/CC-BY-SA-4.0.txt;md5=7130783469368ceb248a4f03e89ea4b8 \ file://LICENSES/GFDL-1.3-no-invariants-only.txt;md5=a22d0be1ce2284b67950a4d1673dd1b0 \ file://LICENSES/GPL-3.0-only.txt;md5=d32239bcb673463ab874e80d47fae504 \ + file://LICENSES/ISC.txt;md5=2494cdbaca137fd93842fe9702e9bc4d \ file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=caa060942f6b722bc4329d4195584c38 \ - file://LICENSES/Qt-GPL-exception-1.0.txt;md5=9a13522cd91a88fba784baf16ea66af8 \ " inherit qt6-cmake diff --git a/recipes-qt/qt6/qtimageformats_git.bb b/recipes-qt/qt6/qtimageformats_git.bb index bac148c..41de1bc 100644 --- a/recipes-qt/qt6/qtimageformats_git.bb +++ b/recipes-qt/qt6/qtimageformats_git.bb @@ -1,11 +1,10 @@ -LICENSE = "The-Qt-Company-Commercial | (GPL-3.0-only & Qt-GPL-exception-1.0) & (LGPL-3.0-only | GPL-2.0-only | GPL-3.0-only) & GFDL-1.3-no-invariants-only" +LICENSE = "The-Qt-Company-Commercial | GPL-3.0-only & (LGPL-3.0-only | GPL-2.0-only | GPL-3.0-only) & GFDL-1.3-no-invariants-only" LIC_FILES_CHKSUM = " \ file://LICENSES/GFDL-1.3-no-invariants-only.txt;md5=a22d0be1ce2284b67950a4d1673dd1b0 \ file://LICENSES/GPL-2.0-only.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://LICENSES/GPL-3.0-only.txt;md5=d32239bcb673463ab874e80d47fae504 \ file://LICENSES/LGPL-3.0-only.txt;md5=e6a600fd5e1d9cbde2d983680233ad02 \ file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \ - file://LICENSES/Qt-GPL-exception-1.0.txt;md5=9a13522cd91a88fba784baf16ea66af8 \ " inherit qt6-cmake diff --git a/recipes-qt/qt6/qtquicktimeline_git.bb b/recipes-qt/qt6/qtquicktimeline_git.bb index ec8520d..06daf4f 100644 --- a/recipes-qt/qt6/qtquicktimeline_git.bb +++ b/recipes-qt/qt6/qtquicktimeline_git.bb @@ -1,10 +1,9 @@ -LICENSE = "The-Qt-Company-Commercial | (GPL-3.0-only & Qt-GPL-exception-1.0) & GFDL-1.3-no-invariants-only & BSD-3-Clause" +LICENSE = "The-Qt-Company-Commercial | GPL-3.0-only & GFDL-1.3-no-invariants-only & BSD-3-Clause" LIC_FILES_CHKSUM = " \ file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \ file://LICENSES/GFDL-1.3-no-invariants-only.txt;md5=a22d0be1ce2284b67950a4d1673dd1b0 \ file://LICENSES/GPL-3.0-only.txt;md5=d32239bcb673463ab874e80d47fae504 \ file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \ - file://LICENSES/Qt-GPL-exception-1.0.txt;md5=9a13522cd91a88fba784baf16ea66af8 \ " inherit qt6-cmake diff --git a/recipes-qt/qt6/qtwebchannel_git.bb b/recipes-qt/qt6/qtwebchannel_git.bb index ec09d1f..698d633 100644 --- a/recipes-qt/qt6/qtwebchannel_git.bb +++ b/recipes-qt/qt6/qtwebchannel_git.bb @@ -1,4 +1,4 @@ -LICENSE = "The-Qt-Company-Commercial | (GPL-3.0-only & Qt-GPL-exception-1.0) & (LGPL-3.0-only | GPL-2.0-only | GPL-3.0-only) & GFDL-1.3-no-invariants-only & BSD-3-Clause" +LICENSE = "The-Qt-Company-Commercial | GPL-3.0-only & (LGPL-3.0-only | GPL-2.0-only | GPL-3.0-only) & GFDL-1.3-no-invariants-only & BSD-3-Clause" LIC_FILES_CHKSUM = " \ file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \ file://LICENSES/GFDL-1.3-no-invariants-only.txt;md5=a22d0be1ce2284b67950a4d1673dd1b0 \ @@ -6,7 +6,6 @@ LIC_FILES_CHKSUM = " \ file://LICENSES/GPL-3.0-only.txt;md5=d32239bcb673463ab874e80d47fae504 \ file://LICENSES/LGPL-3.0-only.txt;md5=e6a600fd5e1d9cbde2d983680233ad02 \ file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \ - file://LICENSES/Qt-GPL-exception-1.0.txt;md5=9a13522cd91a88fba784baf16ea66af8 \ " inherit qt6-cmake diff --git a/recipes-qt/qt6/qtwebengine.inc b/recipes-qt/qt6/qtwebengine.inc index 8932593..c2c2214 100644 --- a/recipes-qt/qt6/qtwebengine.inc +++ b/recipes-qt/qt6/qtwebengine.inc @@ -1,10 +1,13 @@ -LICENSE = "(The-Qt-Company-Commercial | (GPL-3.0-only & Qt-GPL-exception-1.0) & (LGPL-3.0-only | GPL-2.0-only | GPL-3.0-only) & GFDL-1.3-no-invariants-only) & BSD-3-Clause" +LICENSE = "(The-Qt-Company-Commercial | (GPL-3.0-only & Qt-GPL-exception-1.0) & (LGPL-3.0-only | GPL-2.0-only | GPL-3.0-only) & LGPL-2.0-or-later & GFDL-1.3-no-invariants-only) & BSD-3-Clause & Apache-2.0 & MIT" LIC_FILES_CHKSUM = " \ + file://LICENSES/Apache-2.0.txt;md5=b4c615f64dff32f71eeed614d13dfd4c \ file://LICENSES/GFDL-1.3-no-invariants-only.txt;md5=a22d0be1ce2284b67950a4d1673dd1b0 \ file://LICENSES/GPL-2.0-only.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://LICENSES/GPL-3.0-only.txt;md5=d32239bcb673463ab874e80d47fae504 \ + file://LICENSES/LGPL-2.0-or-later.txt;md5=efce6405b860a099130379f50121ec8b \ file://LICENSES/LGPL-3.0-only.txt;md5=e6a600fd5e1d9cbde2d983680233ad02 \ file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \ + file://LICENSES/MIT.txt;md5=3605d54ecceddcd50962eb89318779ec \ file://LICENSES/Qt-GPL-exception-1.0.txt;md5=9a13522cd91a88fba784baf16ea66af8 \ file://LICENSE.Chromium;md5=d64fde5d347c3a68afe70f5e2e31fe83 \ " diff --git a/recipes-qt/qt6/qtwebsockets_git.bb b/recipes-qt/qt6/qtwebsockets_git.bb index bd05d95..dc88001 100644 --- a/recipes-qt/qt6/qtwebsockets_git.bb +++ b/recipes-qt/qt6/qtwebsockets_git.bb @@ -1,4 +1,4 @@ -LICENSE = "The-Qt-Company-Commercial | (GPL-3.0-only & Qt-GPL-exception-1.0) & (LGPL-3.0-only | GPL-2.0-only | GPL-3.0-only) & GFDL-1.3-no-invariants-only & BSD-3-Clause" +LICENSE = "The-Qt-Company-Commercial | GPL-3.0-only & (LGPL-3.0-only | GPL-2.0-only | GPL-3.0-only) & GFDL-1.3-no-invariants-only & BSD-3-Clause" LIC_FILES_CHKSUM = " \ file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \ file://LICENSES/GFDL-1.3-no-invariants-only.txt;md5=a22d0be1ce2284b67950a4d1673dd1b0 \ @@ -6,7 +6,6 @@ LIC_FILES_CHKSUM = " \ file://LICENSES/GPL-3.0-only.txt;md5=d32239bcb673463ab874e80d47fae504 \ file://LICENSES/LGPL-3.0-only.txt;md5=e6a600fd5e1d9cbde2d983680233ad02 \ file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \ - file://LICENSES/Qt-GPL-exception-1.0.txt;md5=9a13522cd91a88fba784baf16ea66af8 \ " inherit qt6-cmake diff --git a/recipes-qt/qt6/qtwebview_git.bb b/recipes-qt/qt6/qtwebview_git.bb index f7a4ee3..6320056 100644 --- a/recipes-qt/qt6/qtwebview_git.bb +++ b/recipes-qt/qt6/qtwebview_git.bb @@ -1,4 +1,4 @@ -LICENSE = "The-Qt-Company-Commercial | (GPL-3.0-only & Qt-GPL-exception-1.0) & (LGPL-3.0-only | GPL-2.0-only | GPL-3.0-only) & GFDL-1.3-no-invariants-only & BSD-3-Clause" +LICENSE = "The-Qt-Company-Commercial | GPL-3.0-only & (LGPL-3.0-only | GPL-2.0-only | GPL-3.0-only) & GFDL-1.3-no-invariants-only & BSD-3-Clause" LIC_FILES_CHKSUM = " \ file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \ file://LICENSES/GFDL-1.3-no-invariants-only.txt;md5=a22d0be1ce2284b67950a4d1673dd1b0 \ @@ -6,7 +6,6 @@ LIC_FILES_CHKSUM = " \ file://LICENSES/GPL-3.0-only.txt;md5=d32239bcb673463ab874e80d47fae504 \ file://LICENSES/LGPL-3.0-only.txt;md5=e6a600fd5e1d9cbde2d983680233ad02 \ file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \ - file://LICENSES/Qt-GPL-exception-1.0.txt;md5=9a13522cd91a88fba784baf16ea66af8 \ " inherit qt6-cmake