diff options
| author |   Davide Pesavento <davidepesa@gmail.com> | 2013-02-15 02:49:45 -0800 |
|---|---|---|
| committer | Davide Pesavento <davidepesa@gmail.com> | 2013-02-15 02:49:45 -0800 |
| commit | e650c5e2993cca1a271626d6f4ea3291369dbeb7 (patch) | |
| tree | fd49fb7cc4ed5988b87ad92d2aeee7319cbadd45 /x11-libs | |
| parent | [x11-libs/qt-dbus:4] Sync with portage. (diff) | |
| download | qt-e650c5e2993cca1a271626d6f4ea3291369dbeb7.tar.gz qt-e650c5e2993cca1a271626d6f4ea3291369dbeb7.tar.bz2 qt-e650c5e2993cca1a271626d6f4ea3291369dbeb7.zip | |
[x11-libs/qt-core:4] Apply moc-workaround-for-BOOST_JOIN to live ebuild too.
Diffstat (limited to 'x11-libs')
| -rw-r--r-- | x11-libs/qt-core/files/moc-workaround-for-BOOST_JOIN.patch | 15 | ||||
| -rw-r--r-- | x11-libs/qt-core/qt-core-4.8.9999.ebuild | 4 |
2 files changed, 19 insertions, 0 deletions
diff --git a/x11-libs/qt-core/files/moc-workaround-for-BOOST_JOIN.patch b/x11-libs/qt-core/files/moc-workaround-for-BOOST_JOIN.patch new file mode 100644 index 00000000..fa82334d --- /dev/null +++ b/x11-libs/qt-core/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/x11-libs/qt-core/qt-core-4.8.9999.ebuild b/x11-libs/qt-core/qt-core-4.8.9999.ebuild index 37baee3a..509b5dae 100644 --- a/x11-libs/qt-core/qt-core-4.8.9999.ebuild +++ b/x11-libs/qt-core/qt-core-4.8.9999.ebuild @@ -28,6 +28,10 @@ PDEPEND=" qt3support? ( ~x11-libs/qt-gui-${PV}[aqua=,debug=,glib=,qt3support] ) " +PATCHES=( + "${FILESDIR}/moc-workaround-for-BOOST_JOIN.patch" +) + pkg_setup() { QT4_TARGET_DIRECTORIES=" src/tools/bootstrap |