aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbarner <barner@FreeBSD.org>2005-11-15 17:34:34 +0800
committerbarner <barner@FreeBSD.org>2005-11-15 17:34:34 +0800
commit20ba22aea2cd81d26c77810a42e56aed0248f81b (patch)
tree0eb168ac9996be1803f889751d21a5332757686d
parent40b326cacbc8b9378fd2c5e4f47f41b62b3b2e25 (diff)
downloadfreebsd-ports-gnome-20ba22aea2cd81d26c77810a42e56aed0248f81b.tar.gz
freebsd-ports-gnome-20ba22aea2cd81d26c77810a42e56aed0248f81b.tar.zst
freebsd-ports-gnome-20ba22aea2cd81d26c77810a42e56aed0248f81b.zip
Fix build with Boost 1.33.0 by moving a conflicting boost headers a bit
up. The conflicting symbol was "None", which is definied in ${LOCALBASE}/include/boost/numeric/conversion/detail/converter.hpp and ${X11BASE}/include/X11/X.h Reported by: pointyhat via kris
-rw-r--r--www/openvrml/files/patch-mozilla-plugin_src_openvrml-player_player.cpp19
1 files changed, 19 insertions, 0 deletions
diff --git a/www/openvrml/files/patch-mozilla-plugin_src_openvrml-player_player.cpp b/www/openvrml/files/patch-mozilla-plugin_src_openvrml-player_player.cpp
new file mode 100644
index 000000000000..6bc8559c91f4
--- /dev/null
+++ b/www/openvrml/files/patch-mozilla-plugin_src_openvrml-player_player.cpp
@@ -0,0 +1,19 @@
+--- mozilla-plugin/src/openvrml-player/player.cpp.orig Tue Nov 15 00:16:02 2005
++++ mozilla-plugin/src/openvrml-player/player.cpp Tue Nov 15 00:21:07 2005
+@@ -22,14 +22,14 @@
+ # include <boost/lexical_cast.hpp>
+ # include <boost/spirit.hpp>
+ # include <boost/spirit/phoenix.hpp>
++# include <openvrml/browser.h>
++# include <openvrml/gl/viewer.h>
+ # include <unistd.h>
+ # include <argp.h>
+ # include <X11/keysym.h>
+ # include <gdk/gdkx.h>
+ # include <gtk/gtk.h>
+ # include <gtk/gtkgl.h>
+-# include <openvrml/browser.h>
+-# include <openvrml/gl/viewer.h>
+
+ namespace {
+