[meta-qt5][PATCH]

[meta-qt5][PATCH]

[Andrey Rusalin]

[-- Attachment #1: Type: text/plain, Size: 253 bytes --]




-------- Forwarded Message --------
Subject: 	[meta-qt5][PATCH]
Date: 	Wed, 13 May 2015 13:44:59 +0300
From: 	arusalin <arusalin@dev.rtsoft.ru>
To: 	openembedded-devel@lists.openembedded.org



-- 
Best Regards,
Andrey Rusalin.





[-- Attachment #2: 0001-Fixed-dependency-for-sql-mysql-option-of-qtbase-pack.patch --]
[-- Type: text/x-patch, Size: 1093 bytes --]

From 7040c6382af3d99f53b3f9fa45336cb911438923 Mon Sep 17 00:00:00 2001
From: Andrey Rusalin <arusalin@dev.rtsoft.ru>
Date: Wed, 13 May 2015 14:25:42 +0400
Subject: [PATCH] Fixed dependency for sql-mysql option of qtbase package

---
 recipes-qt/qt5/qtbase.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc
index 50cb505..d2654ef 100644
--- a/recipes-qt/qt5/qtbase.inc
+++ b/recipes-qt/qt5/qtbase.inc
@@ -84,7 +84,7 @@ PACKAGECONFIG[cups] = "-cups,-no-cups,cups"
 PACKAGECONFIG[dbus] = "-dbus,-no-dbus,dbus"
 PACKAGECONFIG[xcb] = "-xcb -xcb-xlib -system-xcb,-no-xcb,libxcb xcb-util-wm xcb-util-image xcb-util-keysyms xcb-util-renderutil"
 PACKAGECONFIG[sql-ibase] = "-sql-ibase,-no-sql-ibase"
-PACKAGECONFIG[sql-mysql] = "-sql-mysql,-no-sql-mysql,mysql"
+PACKAGECONFIG[sql-mysql] = "-sql-mysql,-no-sql-mysql,mysql5"
 PACKAGECONFIG[sql-psql] = "-sql-psql,-no-sql-psql,postgresql"
 PACKAGECONFIG[sql-odbc] = "-sql-odbc,-no-sql-odbc"
 PACKAGECONFIG[sql-oci] = "-sql-oci,-no-sql-oci"
-- 
1.9.1

Re: [meta-qt5][PATCH]

[Martin Jansa]

On Wed, May 13, 2015 at 02:42:40PM +0300, Andrey Rusalin wrote:
> 
> 

Missing SOB line and patchwork doesn't pick forwarded inline patches
correctly.

I've fixed both when cherry-picking to master-next, but please reply that you agree with your SOB.

> 
> -------- Forwarded Message --------
> Subject: 	[meta-qt5][PATCH]
> Date: 	Wed, 13 May 2015 13:44:59 +0300
> From: 	arusalin <arusalin@dev.rtsoft.ru>
> To: 	openembedded-devel@lists.openembedded.org
> 
> 
> 
> -- 
> Best Regards,
> Andrey Rusalin.
> 
> 
> 
> 

> From 7040c6382af3d99f53b3f9fa45336cb911438923 Mon Sep 17 00:00:00 2001
> From: Andrey Rusalin <arusalin@dev.rtsoft.ru>
> Date: Wed, 13 May 2015 14:25:42 +0400
> Subject: [PATCH] Fixed dependency for sql-mysql option of qtbase package
> 
> ---
>  recipes-qt/qt5/qtbase.inc | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc
> index 50cb505..d2654ef 100644
> --- a/recipes-qt/qt5/qtbase.inc
> +++ b/recipes-qt/qt5/qtbase.inc
> @@ -84,7 +84,7 @@ PACKAGECONFIG[cups] = "-cups,-no-cups,cups"
>  PACKAGECONFIG[dbus] = "-dbus,-no-dbus,dbus"
>  PACKAGECONFIG[xcb] = "-xcb -xcb-xlib -system-xcb,-no-xcb,libxcb xcb-util-wm xcb-util-image xcb-util-keysyms xcb-util-renderutil"
>  PACKAGECONFIG[sql-ibase] = "-sql-ibase,-no-sql-ibase"
> -PACKAGECONFIG[sql-mysql] = "-sql-mysql,-no-sql-mysql,mysql"
> +PACKAGECONFIG[sql-mysql] = "-sql-mysql,-no-sql-mysql,mysql5"
>  PACKAGECONFIG[sql-psql] = "-sql-psql,-no-sql-psql,postgresql"
>  PACKAGECONFIG[sql-odbc] = "-sql-odbc,-no-sql-odbc"
>  PACKAGECONFIG[sql-oci] = "-sql-oci,-no-sql-oci"
> -- 
> 1.9.1
> 
> 

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


-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

Re: [meta-qt5][PATCH]

[Andrey Rusalin]

[-- Attachment #1: Type: text/plain, Size: 2080 bytes --]

I agree with SOB. Also correct patch is attached.

On 05/13/2015 03:39 PM, Martin Jansa wrote:
> On Wed, May 13, 2015 at 02:42:40PM +0300, Andrey Rusalin wrote:
>>
> Missing SOB line and patchwork doesn't pick forwarded inline patches
> correctly.
>
> I've fixed both when cherry-picking to master-next, but please reply that you agree with your SOB.
>
>> -------- Forwarded Message --------
>> Subject: 	[meta-qt5][PATCH]
>> Date: 	Wed, 13 May 2015 13:44:59 +0300
>> From: 	arusalin <arusalin@dev.rtsoft.ru>
>> To: 	openembedded-devel@lists.openembedded.org
>>
>>
>>
>> -- 
>> Best Regards,
>> Andrey Rusalin.
>>
>>
>>
>>
>>  From 7040c6382af3d99f53b3f9fa45336cb911438923 Mon Sep 17 00:00:00 2001
>> From: Andrey Rusalin <arusalin@dev.rtsoft.ru>
>> Date: Wed, 13 May 2015 14:25:42 +0400
>> Subject: [PATCH] Fixed dependency for sql-mysql option of qtbase package
>>
>> ---
>>   recipes-qt/qt5/qtbase.inc | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc
>> index 50cb505..d2654ef 100644
>> --- a/recipes-qt/qt5/qtbase.inc
>> +++ b/recipes-qt/qt5/qtbase.inc
>> @@ -84,7 +84,7 @@ PACKAGECONFIG[cups] = "-cups,-no-cups,cups"
>>   PACKAGECONFIG[dbus] = "-dbus,-no-dbus,dbus"
>>   PACKAGECONFIG[xcb] = "-xcb -xcb-xlib -system-xcb,-no-xcb,libxcb xcb-util-wm xcb-util-image xcb-util-keysyms xcb-util-renderutil"
>>   PACKAGECONFIG[sql-ibase] = "-sql-ibase,-no-sql-ibase"
>> -PACKAGECONFIG[sql-mysql] = "-sql-mysql,-no-sql-mysql,mysql"
>> +PACKAGECONFIG[sql-mysql] = "-sql-mysql,-no-sql-mysql,mysql5"
>>   PACKAGECONFIG[sql-psql] = "-sql-psql,-no-sql-psql,postgresql"
>>   PACKAGECONFIG[sql-odbc] = "-sql-odbc,-no-sql-odbc"
>>   PACKAGECONFIG[sql-oci] = "-sql-oci,-no-sql-oci"
>> -- 
>> 1.9.1
>>
>>
>> -- 
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>

-- 
Best Regards,
Andrey Rusalin.


[-- Attachment #2: 0001-Fixed-dependency-for-sql-mysql-option-of-qtbase-pack.patch --]
[-- Type: text/x-patch, Size: 1147 bytes --]

From 8b7d3580732c5ad9a8148cdca6a6413ecf0bbd49 Mon Sep 17 00:00:00 2001
From: Andrey Rusalin <arusalin@dev.rtsoft.ru>
Date: Wed, 13 May 2015 17:15:21 +0400
Subject: [PATCH] Fixed dependency for sql-mysql option of qtbase package

Signed-off-by: Andrey Rusalin <arusalin@dev.rtsoft.ru>
---
 recipes-qt/qt5/qtbase.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc
index 50cb505..d2654ef 100644
--- a/recipes-qt/qt5/qtbase.inc
+++ b/recipes-qt/qt5/qtbase.inc
@@ -84,7 +84,7 @@ PACKAGECONFIG[cups] = "-cups,-no-cups,cups"
 PACKAGECONFIG[dbus] = "-dbus,-no-dbus,dbus"
 PACKAGECONFIG[xcb] = "-xcb -xcb-xlib -system-xcb,-no-xcb,libxcb xcb-util-wm xcb-util-image xcb-util-keysyms xcb-util-renderutil"
 PACKAGECONFIG[sql-ibase] = "-sql-ibase,-no-sql-ibase"
-PACKAGECONFIG[sql-mysql] = "-sql-mysql,-no-sql-mysql,mysql"
+PACKAGECONFIG[sql-mysql] = "-sql-mysql,-no-sql-mysql,mysql5"
 PACKAGECONFIG[sql-psql] = "-sql-psql,-no-sql-psql,postgresql"
 PACKAGECONFIG[sql-odbc] = "-sql-odbc,-no-sql-odbc"
 PACKAGECONFIG[sql-oci] = "-sql-oci,-no-sql-oci"
-- 
1.9.1

[meta-qt5][PATCH]

[Andrey Rusalin]

[-- Attachment #1: Type: text/plain, Size: 96 bytes --]

Hi,

Here is a patch to prevent build failure of qtsystems package on yocto 
jethro.

AR.

[-- Attachment #2: 0001-qtsystems-downgrade-SRCREV-on-one-commit-to-fix-buil.patch --]
[-- Type: text/x-patch, Size: 1154 bytes --]

From 68e1d88d779b5f1070dcfa04b38a89e6837feffd Mon Sep 17 00:00:00 2001
From: Andrey Rusalin <andrey.rusalin@gmail.com>
Date: Fri, 20 Nov 2015 19:56:15 +0400
Subject: [PATCH] qtsystems: downgrade SRCREV on one commit to fix build issue

Downgrade source revision on one commit to fix build issue.
Last one commit in qtsystems repo is "Use the new way of
disabling strict C++ support".
Seems there is some restrictions with current version of
compiler that is used in yocto.

Signed-off-by: Andrey Rusalin <andrey.rusalin@gmail.com>
---
 recipes-qt/qt5/qtsystems_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-qt/qt5/qtsystems_git.bb b/recipes-qt/qt5/qtsystems_git.bb
index 7e36e80..4f76c06 100644
--- a/recipes-qt/qt5/qtsystems_git.bb
+++ b/recipes-qt/qt5/qtsystems_git.bb
@@ -30,4 +30,4 @@ QT_MODULE_BRANCH = "dev"
 # qtsystems wasn't released yet, last tag before this SRCREV is 5.0.0-beta1
 # qt5-git PV is only to indicate that this recipe is compatible with qt5 5.5
 
-SRCREV = "0577ffca58b7fed78c1820fc1c2b7ab3533d5698"
+SRCREV = "75738fd2cc441e5e8ebe353d90e1bb810d15ee72"
-- 
1.9.1