[meta-qt4][PATCH] qt4: Fix build with moc4 and boost

[meta-qt4][PATCH] qt4: Fix build with moc4 and boost

[Ricardo Ribalda Delgado]

Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
---
 recipes-qt4/qt4/qt4-4.8.7.inc                        |  1 +
 ...everywhere-opensource-src-4.8.6-QTBUG-22829.patch | 20 ++++++++++++++++++++
 recipes-qt4/qt4/qt4-native.inc                       |  1 +
 3 files changed, 22 insertions(+)
 create mode 100644 recipes-qt4/qt4/qt4-4.8.7/qt-everywhere-opensource-src-4.8.6-QTBUG-22829.patch

diff --git a/recipes-qt4/qt4/qt4-4.8.7.inc b/recipes-qt4/qt4/qt4-4.8.7.inc
index 16b22a808a62..4bade85abe98 100644
--- a/recipes-qt4/qt4/qt4-4.8.7.inc
+++ b/recipes-qt4/qt4/qt4-4.8.7.inc
@@ -34,6 +34,7 @@ SRC_URI = "http://download.qt-project.org/official_releases/qt/4.8/${PV}/qt-ever
            file://g++.conf \
            file://linux.conf \
            file://fix-for-mips-n32.patch \
+	   file://qt-everywhere-opensource-src-4.8.6-QTBUG-22829.patch \
            "
 
 SRC_URI[md5sum] = "d990ee66bf7ab0c785589776f35ba6ad"
diff --git a/recipes-qt4/qt4/qt4-4.8.7/qt-everywhere-opensource-src-4.8.6-QTBUG-22829.patch b/recipes-qt4/qt4/qt4-4.8.7/qt-everywhere-opensource-src-4.8.6-QTBUG-22829.patch
new file mode 100644
index 000000000000..2b9da641e42b
--- /dev/null
+++ b/recipes-qt4/qt4/qt4-4.8.7/qt-everywhere-opensource-src-4.8.6-QTBUG-22829.patch
@@ -0,0 +1,20 @@
+Error described on: https://bugzilla.redhat.com/show_bug.cgi?id=1396755
+
+Upstream-Status: Backport
+diff -up qt-everywhere-opensource-src-4.8.7/src/tools/moc/main.cpp.QTBUG-22829 qt-everywhere-opensource-src-4.8.7/src/tools/moc/main.cpp
+--- qt-everywhere-opensource-src-4.8.7/src/tools/moc/main.cpp.QTBUG-22829	2015-05-07 09:14:44.000000000 -0500
++++ qt-everywhere-opensource-src-4.8.7/src/tools/moc/main.cpp	2016-12-08 12:32:46.638962448 -0600
+@@ -188,8 +188,12 @@ int runMoc(int _argc, char **_argv)
+     pp.macros["Q_MOC_RUN"];
+     pp.macros["__cplusplus"];
+ 
+-    // Workaround a bug while parsing the boost/type_traits/has_operator.hpp header. See QTBUG-22829
++    // Workaround a bugs while parsing some boost headers. See QTBUG-22829 
+     pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"];
++    pp.macros["BOOST_LEXICAL_CAST_INCLUDED"];
++    pp.macros["BOOST_NEXT_PRIOR_HPP_INCLUDED"];
++    pp.macros["BOOST_TYPE_TRAITS_HPP"];
++    pp.macros["_SYS_SYSMACROS_H_OUTER"];
+ 
+     QByteArray filename;
+     QByteArray output;
diff --git a/recipes-qt4/qt4/qt4-native.inc b/recipes-qt4/qt4/qt4-native.inc
index 5a873de4e8f4..c0d6b3cb4cd4 100644
--- a/recipes-qt4/qt4/qt4-native.inc
+++ b/recipes-qt4/qt4/qt4-native.inc
@@ -21,6 +21,7 @@ SRC_URI = "http://download.qt-project.org/official_releases/qt/4.8/${PV}/qt-ever
 	   file://gcc-6.patch \
            file://g++.conf \
            file://linux.conf \
+	   file://qt-everywhere-opensource-src-4.8.6-QTBUG-22829.patch \
 	"
 
 UPSTREAM_CHECK_URI = "http://download.qt.io/official_releases/qt/4.8/"
-- 
2.13.2

Re: [meta-qt4][PATCH] qt4: Fix build with moc4 and boost

[Alexander Kanavin]

On 07/07/2017 01:30 PM, Ricardo Ribalda Delgado wrote:
> +Error described on: https://bugzilla.redhat.com/show_bug.cgi?id=1396755
> +
> +Upstream-Status: Backport

Backport from where? Please provide a link.


Alex

Re: [meta-qt4][PATCH] qt4: Fix build with moc4 and boost

[Alexander Kanavin]

On 07/17/2017 05:11 PM, Ricardo Ribalda Delgado wrote:
> https://codereview.qt-project.org/#/c/40593/3/src/tools/moc/main.cpp
> 

Can you add this link to the patch please?

Alex

Re: [meta-qt4][PATCH] qt4: Fix build with moc4 and boost

[Ricardo Ribalda Delgado]

https://codereview.qt-project.org/#/c/40593/3/src/tools/moc/main.cpp

On Mon, Jul 17, 2017 at 4:04 PM, Alexander Kanavin
<alexander.kanavin@linux.intel.com> wrote:
> On 07/07/2017 01:30 PM, Ricardo Ribalda Delgado wrote:
>>
>> +Error described on: https://bugzilla.redhat.com/show_bug.cgi?id=1396755
>> +
>> +Upstream-Status: Backport
>
>
> Backport from where? Please provide a link.
>
>
> Alex



-- 
Ricardo Ribalda

Re: [meta-qt4][PATCH] qt4: Fix build with moc4 and boost

[Alexander Kanavin]

On 07/17/2017 05:12 PM, Ricardo Ribalda Delgado wrote:
> Actually I got the patch from
> 
> https://bugzilla.redhat.com/show_bug.cgi?id=1396755
> http://pkgs.fedoraproject.org/cgit/rpms/qt.git/tree/qt-everywhere-opensource-src-4.8.6-QTBUG-22829.patch

In which case it is not a backport. Then the upstream status should be 
inappropriate, and you should still include a link for where the patch 
was taken from.

Alex

Re: [meta-qt4][PATCH] qt4: Fix build with moc4 and boost

[Ricardo Ribalda Delgado]

Actually I got the patch from

https://bugzilla.redhat.com/show_bug.cgi?id=1396755
http://pkgs.fedoraproject.org/cgit/rpms/qt.git/tree/qt-everywhere-opensource-src-4.8.6-QTBUG-22829.patch

On Mon, Jul 17, 2017 at 4:11 PM, Ricardo Ribalda Delgado
<ricardo.ribalda@gmail.com> wrote:
> https://codereview.qt-project.org/#/c/40593/3/src/tools/moc/main.cpp
>
> On Mon, Jul 17, 2017 at 4:04 PM, Alexander Kanavin
> <alexander.kanavin@linux.intel.com> wrote:
>> On 07/07/2017 01:30 PM, Ricardo Ribalda Delgado wrote:
>>>
>>> +Error described on: https://bugzilla.redhat.com/show_bug.cgi?id=1396755
>>> +
>>> +Upstream-Status: Backport
>>
>>
>> Backport from where? Please provide a link.
>>
>>
>> Alex
>
>
>
> --
> Ricardo Ribalda



-- 
Ricardo Ribalda

Re: [meta-qt4][PATCH] qt4: Fix build with moc4 and boost

[Ricardo Ribalda Delgado]

Hi Alex

I will fix and resend.

Sorry!

On Mon, Jul 17, 2017 at 4:12 PM, Alexander Kanavin
<alexander.kanavin@linux.intel.com> wrote:
> On 07/17/2017 05:12 PM, Ricardo Ribalda Delgado wrote:
>>
>> Actually I got the patch from
>>
>> https://bugzilla.redhat.com/show_bug.cgi?id=1396755
>>
>> http://pkgs.fedoraproject.org/cgit/rpms/qt.git/tree/qt-everywhere-opensource-src-4.8.6-QTBUG-22829.patch
>
>
> In which case it is not a backport. Then the upstream status should be
> inappropriate, and you should still include a link for where the patch was
> taken from.
>
> Alex



-- 
Ricardo Ribalda