From 47bf22448441db07edd04007e844e251acf06dfc Mon Sep 17 00:00:00 2001 From: Raphael Kubo da Costa Date: Thu, 24 Mar 2016 10:31:07 +0000 Subject: 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 --- .../files/patch-src_core_mergedproxymodel.h | 15 --------------- .../files/patch-src_library_groupbydialog.h | 14 -------------- 2 files changed, 29 deletions(-) delete mode 100644 audio/clementine-player/files/patch-src_core_mergedproxymodel.h delete mode 100644 audio/clementine-player/files/patch-src_library_groupbydialog.h (limited to 'audio/clementine-player') 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 - #include - #include - #include -+#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 - #include - #include -+#endif - - #include "librarymodel.h" - -- cgit v1.2.3