diff options
| author | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2016-03-24 10:31:07 +0000 |
|---|---|---|
| committer | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2016-03-24 10:31:07 +0000 |
| commit | 47bf22448441db07edd04007e844e251acf06dfc (patch) | |
| tree | 87b699fa6423b6c968f546361d0d46f42e85a4cc /audio | |
| parent | baac3115e0a2408f00194087da57c652e4a050fa (diff) | |
qt4-moc: Add more Boost include guards to moc's definition list.
In preparation for updating Boost to 1.60, add include guards from more Boost
headers to the list of macros that moc automatically defines when processing
files. As explained in r408911, Qt4's moc cannot parse some constructs used by
a few Boost headers, so we define their include guards to make moc skip them.
This is a cleaner approach that allows us to largely revert r408472, r408473,
r408474, r408475, r408502, r408773 and r408419, which added several patches to
many ports to work around this moc bug.
PR: 199601
PR: 208322
Notes
Notes:
svn path=/head/; revision=411765
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/clementine-player/files/patch-src_core_mergedproxymodel.h | 15 | ||||
| -rw-r--r-- | audio/clementine-player/files/patch-src_library_groupbydialog.h | 14 |
2 files changed, 0 insertions, 29 deletions
diff --git a/audio/clementine-player/files/patch-src_core_mergedproxymodel.h b/audio/clementine-player/files/patch-src_core_mergedproxymodel.h deleted file mode 100644 index 94996d1ef6d0..000000000000 --- a/audio/clementine-player/files/patch-src_core_mergedproxymodel.h +++ /dev/null @@ -1,15 +0,0 @@ ---- src/core/mergedproxymodel.h.orig 2014-04-23 10:16:44 UTC -+++ src/core/mergedproxymodel.h -@@ -25,10 +25,12 @@ - using std::placeholders::_1; - using std::placeholders::_2; - -+#ifndef Q_MOC_RUN - #include <boost/multi_index_container.hpp> - #include <boost/multi_index/member.hpp> - #include <boost/multi_index/ordered_index.hpp> - #include <boost/multi_index/hashed_index.hpp> -+#endif - - using boost::multi_index::multi_index_container; - using boost::multi_index::indexed_by; diff --git a/audio/clementine-player/files/patch-src_library_groupbydialog.h b/audio/clementine-player/files/patch-src_library_groupbydialog.h deleted file mode 100644 index 3a9ce9c68bfe..000000000000 --- a/audio/clementine-player/files/patch-src_library_groupbydialog.h +++ /dev/null @@ -1,14 +0,0 @@ ---- src/library/groupbydialog.h.orig 2014-04-23 10:16:44 UTC -+++ src/library/groupbydialog.h -@@ -25,9 +25,11 @@ - using std::placeholders::_1; - using std::placeholders::_2; - -+#ifndef Q_MOC_RUN - #include <boost/multi_index_container.hpp> - #include <boost/multi_index/member.hpp> - #include <boost/multi_index/ordered_index.hpp> -+#endif - - #include "librarymodel.h" - |