Revision: 77484 http://trac.macports.org/changeset/77484 Author: raphael@macports.org Date: 2011-03-31 22:57:12 -0700 (Thu, 31 Mar 2011) Log Message: ----------- openvrml: apply upstream patch to fix building with newer versions of libgnomeui; see #28989 Modified Paths: -------------- trunk/dports/graphics/openvrml/files/patch-Makefile.am.diff Modified: trunk/dports/graphics/openvrml/files/patch-Makefile.am.diff =================================================================== --- trunk/dports/graphics/openvrml/files/patch-Makefile.am.diff 2011-04-01 04:20:50 UTC (rev 77483) +++ trunk/dports/graphics/openvrml/files/patch-Makefile.am.diff 2011-04-01 05:57:12 UTC (rev 77484) @@ -1,5 +1,5 @@ ---- src/Makefile.am 2011/02/11 05:14:30 4226 -+++ src/Makefile.am 2011/02/11 05:21:26 4227 +--- src/Makefile.am.orig 2011-03-31 23:20:00.000000000 +0200 ++++ src/Makefile.am 2011-03-31 23:18:47.000000000 +0200 @@ -70,7 +70,8 @@ -DOPENVRML_PKGDATADIR_=\"$(pkgdatadir)\" \ -DOPENVRML_PKGLIBDIR_=\"$(pkglibdir)\" \ @@ -10,7 +10,7 @@ libopenvrml_libopenvrml_la_CXXFLAGS = \ $(FREETYPE_CFLAGS) \ $(PTHREAD_CFLAGS) \ -@@ -132,7 +133,8 @@ +@@ -131,7 +132,8 @@ local/libopenvrml-dl/openvrml/local/dl.h local_libopenvrml_dl_la_CPPFLAGS = \ -I$(top_builddir)/src/libopenvrml \ @@ -19,8 +19,8 @@ + -DBOOST_FILESYSTEM_VERSION=2 local_libopenvrml_dl_la_LIBADD = \ -lboost_filesystem$(BOOST_LIB_SUFFIX) \ - -lboost_system$(BOOST_LIB_SUFFIX) \ -@@ -175,7 +177,8 @@ + -lltdl +@@ -173,7 +175,8 @@ -DJAVA_HOME=\"$(JAVA_HOME)\" \ -DOPENVRML_JVM_ARCH=\"$(OPENVRML_JVM_ARCH)\" \ -DBOOST_MPL_CFG_NO_PREPROCESSED_HEADERS \ @@ -30,3 +30,31 @@ script_java_la_LDFLAGS = \ -module \ -no-undefined \ +@@ -760,8 +763,7 @@ + -I$(top_builddir)/src/libopenvrml \ + -I$(top_srcdir)/src/libopenvrml \ + -I$(top_builddir)/src/libopenvrml-gl \ +- -I$(top_srcdir)/src/libopenvrml-gl \ +- -DGTK_DISABLE_DEPRECATED ++ -I$(top_srcdir)/src/libopenvrml-gl + openvrml_xembed_openvrml_xembed_CXXFLAGS = \ + $(PTHREAD_CFLAGS) \ + $(DBUS_G_CFLAGS) \ +@@ -830,9 +832,6 @@ + endif + + openvrml_player_openvrml_player_CPPFLAGS = \ +- -DG_DISABLE_DEPRECATED \ +- -DGTK_DISABLE_DEPRECATED \ +- -DGNOME_DISABLE_DEPRECATED \ + -DOPENVRML_PLAYER_PKGDATADIR_=\"$(datadir)/openvrml-player\" \ + -DOPENVRML_LIBEXECDIR_=\"$(libexecdir)\" \ + -Iopenvrml-player \ +@@ -886,7 +885,6 @@ + + mozilla_plugin_openvrml_la_CPPFLAGS = \ + -DMOZ_X11 \ +- -DGTK_DISABLE_DEPRECATED \ + -DOPENVRML_LIBEXECDIR_=\"$(libexecdir)\" \ + -Imozilla-plugin + mozilla_plugin_openvrml_la_CXXFLAGS = \