diff options
| author | rakuco <rakuco@FreeBSD.org> | 2016-03-24 18:31:07 +0800 |
|---|---|---|
| committer | rakuco <rakuco@FreeBSD.org> | 2016-03-24 18:31:07 +0800 |
| commit | e892377df154dd2bb1aac25254db0588f33197a1 (patch) | |
| tree | 87b699fa6423b6c968f546361d0d46f42e85a4cc /cad | |
| parent | af04e8732655f813e9bedced3d06a50c5e3aed9d (diff) | |
| download | freebsd-ports-gnome-e892377df154dd2bb1aac25254db0588f33197a1.tar.gz freebsd-ports-gnome-e892377df154dd2bb1aac25254db0588f33197a1.tar.zst freebsd-ports-gnome-e892377df154dd2bb1aac25254db0588f33197a1.zip | |
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
Diffstat (limited to 'cad')
| -rw-r--r-- | cad/openscad/files/patch-src_colormap.h | 14 | ||||
| -rw-r--r-- | cad/openscad/files/patch-src_scintillaeditor.h | 14 |
2 files changed, 0 insertions, 28 deletions
diff --git a/cad/openscad/files/patch-src_colormap.h b/cad/openscad/files/patch-src_colormap.h deleted file mode 100644 index 7acadcfad624..000000000000 --- a/cad/openscad/files/patch-src_colormap.h +++ /dev/null @@ -1,14 +0,0 @@ ---- src/colormap.h.orig 2015-03-05 16:25:10 UTC -+++ src/colormap.h -@@ -5,9 +5,11 @@ - #include <list> - #include "linalg.h" - -+#ifndef Q_MOC_RUN - #include <boost/shared_ptr.hpp> - #include <boost/filesystem.hpp> - #include <boost/property_tree/ptree.hpp> -+#endif - - namespace fs = boost::filesystem; - diff --git a/cad/openscad/files/patch-src_scintillaeditor.h b/cad/openscad/files/patch-src_scintillaeditor.h deleted file mode 100644 index 871562905778..000000000000 --- a/cad/openscad/files/patch-src_scintillaeditor.h +++ /dev/null @@ -1,14 +0,0 @@ ---- src/scintillaeditor.h.orig 2015-03-05 20:25:13 UTC -+++ src/scintillaeditor.h -@@ -11,9 +11,11 @@ - #include "scadlexer.h" - #include "parsersettings.h" - -+#ifndef Q_MOC_RUN - #include <boost/shared_ptr.hpp> - #include <boost/property_tree/ptree.hpp> - #include <boost/property_tree/json_parser.hpp> -+#endif - - class EditorColorScheme - { |