Skip to contentSkip to conversation

qt4: Fix build with moc4 and boost

PATCH Superseded Ricardo Ribalda Delgado 2 participants 7 messages Jul 7, 2017 – Jul 17, 2017

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Ricardo Ribalda Delgado

author
#0 lore raw

PATCH 1/1 qt4: Fix build with moc4 and boost

Signed-off-by Ricardo Ribalda Delgado <[email protected]>
---
 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
recipes-qt4/qt4/qt4-4.8.7.inc +1 -0
index 16b22a808a62..4bade85abe98 100644
@@ -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"
recipes-qt4/qt4/qt4-4.8.7/qt-everywhere-opensource-src-4.8.6-QTBUG-22829.patch new file +20 -0
new file mode 100644
index 000000000000..2b9da641e42b
@@ -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;
recipes-qt4/qt4/qt4-native.inc +1 -0
index 5a873de4e8f4..c0d6b3cb4cd4 100644
@@ -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/"
Signature · 1 line
2.13.2
#1 lore raw

recipes-qt4/qt4/qt4-4.8.7/qt-everywhere-opensource-src-4.8.6-QTBUG-22829.patch line 3

Quoted 3 lines · Ricardo Ribalda Delgado
recipes-qt4/qt4/qt4-4.8.7/qt-everywhere-opensource-src-4.8.6-QTBUG-22829.patch new file +3 -0
+Error described on: https://bugzilla.redhat.com/show_bug.cgi?id=1396755
+
+Upstream-Status: Backport

Backport from where? Please provide a link.

Alex

author
#2 lore raw

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

Quoted 11 lines · Alexander Kanavin

recipes-qt4/qt4/qt4-4.8.7/qt-everywhere-opensource-src-4.8.6-QTBUG-22829.patch line 3

Quoted 4 lines · Ricardo Ribalda Delgado
recipes-qt4/qt4/qt4-4.8.7/qt-everywhere-opensource-src-4.8.6-QTBUG-22829.patch new file +3 -0
+Error described on: https://bugzilla.redhat.com/show_bug.cgi?id=1396755
+
+Upstream-Status: Backport

Backport from where? Please provide a link.

Alex

Signature · 1 line
Ricardo Ribalda
author
#3 lore raw

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

Quoted 20 lines · Ricardo Ribalda Delgado

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

Quoted 11 lines · Alexander Kanavin

recipes-qt4/qt4/qt4-4.8.7/qt-everywhere-opensource-src-4.8.6-QTBUG-22829.patch line 3

Quoted 4 lines · Ricardo Ribalda Delgado
recipes-qt4/qt4/qt4-4.8.7/qt-everywhere-opensource-src-4.8.6-QTBUG-22829.patch new file +3 -0
+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

Signature · 1 line
Ricardo Ribalda
author
#5 lore raw

Hi Alex

I will fix and resend.

Sorry!

Quoted 14 lines · Alexander Kanavin
Quoted 6 lines · 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

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

Signature · 1 line
Ricardo Ribalda