dev-qt/qtcore: extend moc patch with workarounds for newer boost versions

Gentoo-Bug: 556104

Package-Manager: portage-2.2.28

diff --git a/dev-qt/qtcore/files/qtcore-4.8.6-moc-boost-1.60.patch b/dev-qt/qtcore/files/qtcore-4.8.6-moc-boost-1.60.patch
new file mode 100644 (file)
index 0000000..91a5526
--- /dev/null
+++ b/dev-qt/qtcore/files/qtcore-4.8.6-moc-boost-1.60.patch
@@ -0,0 +1,16 @@
+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-03-16 13:20:43.145899869 -0500
+@@ -188,8 +188,11 @@ 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 bug 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"];
+ 
+     QByteArray filename;
+     QByteArray output;

diff --git a/dev-qt/qtcore/qtcore-4.8.6-r2.ebuild b/dev-qt/qtcore/qtcore-4.8.6-r2.ebuild
index e56367b51b45a2cdd9a8a03ce10e7c34c00a3eca..365c019baf15fe65b0d7f86452033758f99c14f8 100644 (file)
--- a/dev-qt/qtcore/qtcore-4.8.6-r2.ebuild
+++ b/dev-qt/qtcore/qtcore-4.8.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -29,10 +29,10 @@ MULTILIB_WRAPPED_HEADERS=(
 )
 
 PATCHES=(
-       "${FILESDIR}/${PN}-4.8.5-moc-boost-lexical-cast.patch"
        "${FILESDIR}/${PN}-4.8.5-honor-ExcludeSocketNotifiers-in-glib-event-loop.patch" # bug 514968
        "${FILESDIR}/${PN}-4.8.5-qeventdispatcher-recursive.patch" # bug 514968
        "${FILESDIR}/${PN}-4.8.6-QNAM-corruptions-fix.patch" # bug 548622
+       "${FILESDIR}/${PN}-4.8.6-moc-boost-1.60.patch" # bug 556104
 )
 
 QT4_TARGET_DIRECTORIES="

diff --git a/dev-qt/qtcore/qtcore-4.8.7-r1.ebuild b/dev-qt/qtcore/qtcore-4.8.7-r1.ebuild
index c2d986be2f8c4b11e954964d449904cd15758370..331ce32832c1e87c2cd2744bbb4c734478504b7e 100644 (file)
--- a/dev-qt/qtcore/qtcore-4.8.7-r1.ebuild
+++ b/dev-qt/qtcore/qtcore-4.8.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -35,9 +35,9 @@ MULTILIB_WRAPPED_HEADERS=(
 )
 
 PATCHES=(
-       "${FILESDIR}/${PN}-4.8.5-moc-boost-lexical-cast.patch"
        "${FILESDIR}/${PN}-4.8.5-honor-ExcludeSocketNotifiers-in-glib-event-loop.patch" # bug 514968
        "${FILESDIR}/${PN}-4.8.5-qeventdispatcher-recursive.patch" # bug 514968
+       "${FILESDIR}/${PN}-4.8.6-moc-boost-1.60.patch" # bug 556104
 )
 
 QT4_TARGET_DIRECTORIES="