Remove license files that were dropped in 5.9.5

PATCH In review Daniel Mack 2 participants 5 messages Apr 12, 2018 – Apr 13, 2018

lore

Share & tools

lore

Daniel Mack

author

2018-04-12 19:09 UTC #0 lore raw

PATCH 1/1 Remove license files that were dropped in 5.9.5

See upstream commits:

https://code.qt.io/cgit/qt/qtquickcontrols.git/commit/?h=5.9.5&id=a843884697602891d21b9f9bc62603548dd6a6b8
https://code.qt.io/cgit/qt/qtxmlpatterns.git/commit/?h=5.9.5&id=81dd12388d67f6b2be253ea831b876c8dec2dca5

Signed-off-by Daniel Mack <[email protected]>

---
Martin, you can squash that into your bump commit if you wish to do so.

 recipes-qt/qt5/qtquickcontrols_git.bb | 3 ---
 recipes-qt/qt5/qtxmlpatterns_git.bb   | 3 ---
 2 files changed, 6 deletions(-)

recipes-qt/qt5/qtquickcontrols_git.bb +0 -3

index 14b465a..c7c491d 100644
@@ -4,12 +4,9 @@ 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 )"
 LIC_FILES_CHKSUM = " \
     file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
-    file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
     file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
     file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
     file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
-    file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \
-    file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
     file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
 "

recipes-qt/qt5/qtxmlpatterns_git.bb +0 -3

index 3787b86..7a027b4 100644
@@ -6,12 +6,9 @@ HOMEPAGE = "http://www.qt.io"
 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 )"
 LIC_FILES_CHKSUM = " \
     file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
-    file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
-    file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
     file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
     file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
     file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
-    file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
     file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
     file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
 "

Signature · 1 line

2.14.3

Martin Jansa

2018-04-12 19:33 UTC #1 lore raw

Thanks I already have this part for qtxmlpatterns, will do the same for qtquickcontrols.

Quoted 59 lines · Daniel Mack

See upstream commits:
https://code.qt.io/cgit/qt/qtquickcontrols.git/commit/?h=5.9.5&id=
a843884697602891d21b9f9bc62603548dd6a6b8
https://code.qt.io/cgit/qt/qtxmlpatterns.git/commit/?h=5.9.5&id=
81dd12388d67f6b2be253ea831b876c8dec2dca5
Signed-off-by Daniel Mack <[email protected]>
---
Martin, you can squash that into your bump commit if you wish to do so.
 recipes-qt/qt5/qtquickcontrols_git.bb | 3 ---
 recipes-qt/qt5/qtxmlpatterns_git.bb   | 3 ---
 2 files changed, 6 deletions(-)
recipes-qt/qt5/ renamed from recipes-qt/qt5/qtquickcontrols_git.bb +0 -0
qtquickcontrols_git.bb
index 14b465a..c7c491d 100644
recipes-qt/qt5/qtquickcontrols_git.bb +0 -0
@@ -4,12 +4,9 @@ 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 )"
 LIC_FILES_CHKSUM = " \
     file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
recipes-qt/qt5/qtquickcontrols_git.bb +0 -3
-    file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
     file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
     file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
     file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
-    file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \
-    file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
     file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
 "
recipes-qt/qt5/ renamed from recipes-qt/qt5/qtxmlpatterns_git.bb +0 -0
qtxmlpatterns_git.bb
index 3787b86..7a027b4 100644
recipes-qt/qt5/qtxmlpatterns_git.bb +0 -0
@@ -6,12 +6,9 @@ HOMEPAGE = "http://www.qt.io"
 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 )"
 LIC_FILES_CHKSUM = " \
     file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
recipes-qt/qt5/qtxmlpatterns_git.bb +0 -4
-    file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
-    file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
     file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
     file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
     file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
-    file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
     file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
     file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
 "
--
2.14.3

Martin Jansa

2018-04-12 21:21 UTC #2 lore raw

Included in rocko-next and jansa/rocko branches now, thanks.

Quoted 65 lines · Martin Jansa

Thanks I already have this part for qtxmlpatterns, will do the same for qtquickcontrols.
Quoted 59 lines · Daniel Mack
See upstream commits:
https://code.qt.io/cgit/qt/qtquickcontrols.git/commit/?h=5.
9.5&id=a843884697602891d21b9f9bc62603548dd6a6b8
https://code.qt.io/cgit/qt/qtxmlpatterns.git/commit/?h=5.9.
5&id=81dd12388d67f6b2be253ea831b876c8dec2dca5
Signed-off-by Daniel Mack <[email protected]>
---
Martin, you can squash that into your bump commit if you wish to do so.
 recipes-qt/qt5/qtquickcontrols_git.bb | 3 ---
 recipes-qt/qt5/qtxmlpatterns_git.bb   | 3 ---
 2 files changed, 6 deletions(-)
recipes-qt/qt5/ renamed from recipes-qt/qt5/qtquickcontrols_git.bb +0 -0
qtquickcontrols_git.bb
index 14b465a..c7c491d 100644
recipes-qt/qt5/qtquickcontrols_git.bb +0 -0
@@ -4,12 +4,9 @@ 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 )"
 LIC_FILES_CHKSUM = " \
     file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
recipes-qt/qt5/qtquickcontrols_git.bb +0 -3
-    file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
     file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
     file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
     file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
-    file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \
-    file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
     file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
 "
recipes-qt/qt5/ renamed from recipes-qt/qt5/qtxmlpatterns_git.bb +0 -0
qtxmlpatterns_git.bb
index 3787b86..7a027b4 100644
recipes-qt/qt5/qtxmlpatterns_git.bb +0 -0
@@ -6,12 +6,9 @@ HOMEPAGE = "http://www.qt.io"
 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 )"
 LIC_FILES_CHKSUM = " \
     file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
recipes-qt/qt5/qtxmlpatterns_git.bb +0 -4
-    file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
-    file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
     file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
     file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
     file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
-    file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
     file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
     file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
 "
--
2.14.3

Daniel Mack

author

2018-04-13 08:47 UTC #3 lore raw

Quoted 1 line · Martin Jansa

Included in rocko-next and jansa/rocko branches now, thanks.

qtdeclarative needs a bump as well ...

(quoted diff) +0 -0

b/recipes-qt/qt5/qtdeclarative_git.bb
index 827745d..0f1a30f 100644

recipes-qt/qt5/qtdeclarative_git.bb +0 -0

@@ -30,6 +30,6 @@ do_install_append_class-nativesdk() {
 
 EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG',

'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}"

-SRCREV = "317908e72a6ea0b4ca179690539cb352bbf60832" +SRCREV = "dfbe91853737ff8ab548925bbd40fc9183a6e05d"

BBCLASSEXTEND =+ "native nativesdk"

Martin Jansa

2018-04-13 09:05 UTC #4 lore raw

Thanks, f23d1d54a06b0f3473e17300c3a1c495bcc25fdc added in rocko-next and jansa/rocko

Quoted 21 lines · Daniel Mack

Quoted 1 line · Martin Jansa
Included in rocko-next and jansa/rocko branches now, thanks.
qtdeclarative needs a bump as well ...
recipes-qt/qt5/qtdeclarative_git.bb +0 -0
index 827745d..0f1a30f 100644
@@ -30,6 +30,6 @@ do_install_append_class-nativesdk() {
 
 EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG',
'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}"
recipes-qt/qt5/qtdeclarative_git.bb +1 -1
-SRCREV = "317908e72a6ea0b4ca179690539cb352bbf60832"
+SRCREV = "dfbe91853737ff8ab548925bbd40fc9183a6e05d"
 
 BBCLASSEXTEND =+ "native nativesdk"