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 /graphics/aqsis | |
| 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 'graphics/aqsis')
5 files changed, 0 insertions, 69 deletions
diff --git a/graphics/aqsis/files/patch-include_aqsis_tex_buffers_channellist.h b/graphics/aqsis/files/patch-include_aqsis_tex_buffers_channellist.h deleted file mode 100644 index f92fe6849bdd..000000000000 --- a/graphics/aqsis/files/patch-include_aqsis_tex_buffers_channellist.h +++ /dev/null @@ -1,12 +0,0 @@ ---- include/aqsis/tex/buffers/channellist.h.orig 2012-08-24 12:26:50 UTC -+++ include/aqsis/tex/buffers/channellist.h -@@ -43,7 +43,9 @@ - #include <iosfwd> - #include <vector> - -+#ifndef Q_MOC_RUN - #include <boost/format.hpp> -+#endif - - #include <aqsis/tex/buffers/channelinfo.h> - #include <aqsis/tex/texexception.h> diff --git a/graphics/aqsis/files/patch-include_aqsis_tex_buffers_mixedimagebuffer.h b/graphics/aqsis/files/patch-include_aqsis_tex_buffers_mixedimagebuffer.h deleted file mode 100644 index a6f4a717a9d6..000000000000 --- a/graphics/aqsis/files/patch-include_aqsis_tex_buffers_mixedimagebuffer.h +++ /dev/null @@ -1,14 +0,0 @@ ---- include/aqsis/tex/buffers/mixedimagebuffer.h.orig 2012-08-24 12:26:50 UTC -+++ include/aqsis/tex/buffers/mixedimagebuffer.h -@@ -45,9 +45,11 @@ - #include <string> - #include <vector> - -+#ifndef Q_MOC_RUN - #include <boost/shared_array.hpp> - #include <boost/shared_ptr.hpp> - #include <boost/utility.hpp> -+#endif - - #include <aqsis/math/math.h> - #include <aqsis/tex/buffers/channellist.h> diff --git a/graphics/aqsis/files/patch-include_aqsis_util_socket.h b/graphics/aqsis/files/patch-include_aqsis_util_socket.h deleted file mode 100644 index ab52c4bc5ec9..000000000000 --- a/graphics/aqsis/files/patch-include_aqsis_util_socket.h +++ /dev/null @@ -1,12 +0,0 @@ ---- include/aqsis/util/socket.h.orig 2012-08-24 12:26:50 UTC -+++ include/aqsis/util/socket.h -@@ -32,7 +32,9 @@ - - #include <sstream> - -+#ifndef Q_MOC_RUN - #include <boost/utility.hpp> -+#endif - - #ifdef AQSIS_SYSTEM_WIN32 - # include <winsock2.h> diff --git a/graphics/aqsis/files/patch-tools_piqsl_displayserverimage.cpp b/graphics/aqsis/files/patch-tools_piqsl_displayserverimage.cpp deleted file mode 100644 index 1111fea67773..000000000000 --- a/graphics/aqsis/files/patch-tools_piqsl_displayserverimage.cpp +++ /dev/null @@ -1,16 +0,0 @@ ---- tools/piqsl/displayserverimage.cpp.orig 2012-08-24 12:26:50 UTC -+++ tools/piqsl/displayserverimage.cpp -@@ -39,11 +39,13 @@ - #include <map> - #include <algorithm> - -+#ifndef Q_MOC_RUN - #include <boost/archive/iterators/base64_from_binary.hpp> - #include <boost/archive/iterators/transform_width.hpp> - #include <boost/archive/iterators/insert_linebreaks.hpp> - #include <boost/format.hpp> - #include <boost/filesystem.hpp> -+#endif - - #include "displayserverimage.h" - diff --git a/graphics/aqsis/files/patch-tools_piqsl_image.h b/graphics/aqsis/files/patch-tools_piqsl_image.h deleted file mode 100644 index d6b365033524..000000000000 --- a/graphics/aqsis/files/patch-tools_piqsl_image.h +++ /dev/null @@ -1,15 +0,0 @@ ---- tools/piqsl/image.h.orig 2012-08-24 12:26:50 UTC -+++ tools/piqsl/image.h -@@ -46,10 +46,12 @@ - #include <QtCore/QObject> - #include <QtGui/QImage> - -+#ifndef Q_MOC_RUN - #include <boost/shared_ptr.hpp> - #include <boost/shared_array.hpp> - #include <boost/filesystem/path.hpp> - #include <boost/thread/mutex.hpp> -+#endif - - #include "tinyxml.h" - |