[gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/, dev-qt/qtcore/files/

["Markos Chandras" <hwoarang@gentoo.org>]

commit:     60db688930cf450c24b716ce212824fd035aec54
Author:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Fri Mar  8 18:12:31 2013 +0000
Commit:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Fri Mar  8 18:12:31 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=60db6889

Revert "dev-qt/qtcore: Remove obsolete boost patch."

This reverts commit f8b0c3ab9de766567b5151cdd77070b8302ab410.

---
 .../files/moc-workaround-for-BOOST_JOIN.patch      |   15 +++++++++++++++
 dev-qt/qtcore/qtcore-4.8.9999.ebuild               |    4 ++++
 2 files changed, 19 insertions(+), 0 deletions(-)

diff --git a/dev-qt/qtcore/files/moc-workaround-for-BOOST_JOIN.patch b/dev-qt/qtcore/files/moc-workaround-for-BOOST_JOIN.patch
new file mode 100644
index 0000000..fa82334
--- /dev/null
+++ b/dev-qt/qtcore/files/moc-workaround-for-BOOST_JOIN.patch
@@ -0,0 +1,15 @@
+diff -up qt-everywhere-opensource-src-4.8.4/src/tools/moc/main.cpp.moc-boost148 qt-everywhere-opensource-src-4.8.4/src/tools/moc/main.cpp
+--- qt-everywhere-opensource-src-4.8.4/src/tools/moc/main.cpp.moc-boost148	2012-11-23 04:09:53.000000000 -0600
++++ qt-everywhere-opensource-src-4.8.4/src/tools/moc/main.cpp	2013-02-11 07:07:18.942748176 -0600
+@@ -187,6 +187,11 @@ int runMoc(int _argc, char **_argv)
+     Moc moc;
+     pp.macros["Q_MOC_RUN"];
+     pp.macros["__cplusplus"];
++
++    // 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"];
++
+     QByteArray filename;
+     QByteArray output;
+     FILE *in = 0;

diff --git a/dev-qt/qtcore/qtcore-4.8.9999.ebuild b/dev-qt/qtcore/qtcore-4.8.9999.ebuild
index ff004f9..583f197 100644
--- a/dev-qt/qtcore/qtcore-4.8.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-4.8.9999.ebuild
@@ -27,6 +27,10 @@ PDEPEND="
 	qt3support? ( ~dev-qt/qtgui-${PV}[aqua=,debug=,glib=,qt3support] )
 "
 
+PATCHES=(
+	"${FILESDIR}/moc-workaround-for-BOOST_JOIN.patch"
+)
+
 pkg_setup() {
 	QT4_TARGET_DIRECTORIES="
 		src/tools/bootstrap