Re: [oe] [meta-qt5][PATCH] Remove license files that were dropped in 5.9.5

2018-04-13 Thread Martin Jansa 
Thanks, f23d1d54a06b0f3473e17300c3a1c495bcc25fdc added in rocko-next and
jansa/rocko

On Fri, Apr 13, 2018 at 10:47 AM, Daniel Mack  wrote:

> On Thursday, April 12, 2018 11:21 PM, Martin Jansa wrote:
> > Included in rocko-next and jansa/rocko branches now, thanks.
>
> qtdeclarative needs a bump as well ...
>
> diff --git a/recipes-qt/qt5/qtdeclarative_git.bb
> b/recipes-qt/qt5/qtdeclarative_git.bb
> index 827745d..0f1a30f 100644
> --- a/recipes-qt/qt5/qtdeclarative_git.bb
> +++ b/recipes-qt/qt5/qtdeclarative_git.bb
> @@ -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"
>
>
-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Re: [oe] [meta-qt5][PATCH] Remove license files that were dropped in 5.9.5

2018-04-13 Thread Daniel Mack 
On Thursday, April 12, 2018 11:21 PM, Martin Jansa wrote:
> Included in rocko-next and jansa/rocko branches now, thanks.

qtdeclarative needs a bump as well ...

diff --git a/recipes-qt/qt5/qtdeclarative_git.bb
b/recipes-qt/qt5/qtdeclarative_git.bb
index 827745d..0f1a30f 100644
--- a/recipes-qt/qt5/qtdeclarative_git.bb
+++ b/recipes-qt/qt5/qtdeclarative_git.bb
@@ -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"

-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Re: [oe] [meta-qt5][PATCH] Remove license files that were dropped in 5.9.5

2018-04-12 Thread Martin Jansa 
Included in rocko-next and jansa/rocko branches now, thanks.

On Thu, Apr 12, 2018 at 9:33 PM, Martin Jansa 
wrote:

> Thanks I already have this part for qtxmlpatterns, will do the same for
> qtquickcontrols.
>
> On Thu, Apr 12, 2018 at 9:09 PM, Daniel Mack  wrote:
>
>> See upstream commits:
>>
>>   https://code.qt.io/cgit/qt/qtquickcontrols.git/commit/?h=5.
>> 9.5=a843884697602891d21b9f9bc62603548dd6a6b8
>>   https://code.qt.io/cgit/qt/qtxmlpatterns.git/commit/?h=5.9.
>> 5=81dd12388d67f6b2be253ea831b876c8dec2dca5
>>
>> Signed-off-by: Daniel Mack 
>> ---
>> 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(-)
>>
>> diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/
>> qtquickcontrols_git.bb
>> index 14b465a..c7c491d 100644
>> --- a/recipes-qt/qt5/qtquickcontrols_git.bb
>> +++ b/recipes-qt/qt5/qtquickcontrols_git.bb
>> @@ -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 \
>>  "
>>
>> diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/
>> qtxmlpatterns_git.bb
>> index 3787b86..7a027b4 100644
>> --- a/recipes-qt/qt5/qtxmlpatterns_git.bb
>> +++ b/recipes-qt/qt5/qtxmlpatterns_git.bb
>> @@ -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 \
>>  "
>> --
>> 2.14.3
>>
>>
>
-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Re: [oe] [meta-qt5][PATCH] Remove license files that were dropped in 5.9.5

2018-04-12 Thread Martin Jansa 
Thanks I already have this part for qtxmlpatterns, will do the same for
qtquickcontrols.

On Thu, Apr 12, 2018 at 9:09 PM, Daniel Mack  wrote:

> See upstream commits:
>
>   https://code.qt.io/cgit/qt/qtquickcontrols.git/commit/?h=5.9.5=
> a843884697602891d21b9f9bc62603548dd6a6b8
>   https://code.qt.io/cgit/qt/qtxmlpatterns.git/commit/?h=5.9.5=
> 81dd12388d67f6b2be253ea831b876c8dec2dca5
>
> Signed-off-by: Daniel Mack 
> ---
> 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(-)
>
> diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/
> qtquickcontrols_git.bb
> index 14b465a..c7c491d 100644
> --- a/recipes-qt/qt5/qtquickcontrols_git.bb
> +++ b/recipes-qt/qt5/qtquickcontrols_git.bb
> @@ -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 \
>  "
>
> diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/
> qtxmlpatterns_git.bb
> index 3787b86..7a027b4 100644
> --- a/recipes-qt/qt5/qtxmlpatterns_git.bb
> +++ b/recipes-qt/qt5/qtxmlpatterns_git.bb
> @@ -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 \
>  "
> --
> 2.14.3
>
>
-- 
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel