diff options
| author |   Michael Palimaka <kensington@gentoo.org> | 2017-10-26 23:10:15 +1100 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2017-10-26 23:11:12 +1100 |
| commit | c4e4d38735de346d371854586b1fea91a043d391 (patch) | |
| tree | 46552167a48ebdbe669d76e5e3bd44b36067debe /dev-qt/qtcore/files | |
| parent | net-analyzer/prometheus: Remove old (diff) | |
| download | gentoo-c4e4d38735de346d371854586b1fea91a043d391.tar.gz gentoo-c4e4d38735de346d371854586b1fea91a043d391.tar.bz2 gentoo-c4e4d38735de346d371854586b1fea91a043d391.zip | |
dev-qt/qtcore: improve moc patch to solve breakage with sys-libs/glibc-2.25-r8
Patch from Fedora.
Bug: https://bugs.gentoo.org/635394
Package-Manager: Portage-2.3.8, Repoman-2.3.3
Diffstat (limited to 'dev-qt/qtcore/files')
| -rw-r--r-- | dev-qt/qtcore/files/qtcore-4.8.7-moc.patch | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/dev-qt/qtcore/files/qtcore-4.8.7-moc.patch b/dev-qt/qtcore/files/qtcore-4.8.7-moc.patch new file mode 100644 index 000000000000..7660dedc1630 --- /dev/null +++ b/dev-qt/qtcore/files/qtcore-4.8.7-moc.patch @@ -0,0 +1,17 @@ +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,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 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"]; ++ pp.macros["_SYS_SYSMACROS_H_OUTER"]; + + QByteArray filename; + QByteArray output; |