[49601] trunk/dports/www/firefox-x11-devel

[jeremyhu at macports.org]

Revision: 49601
          http://trac.macports.org/changeset/49601
Author:   jeremyhu at macports.org
Date:     2009-04-12 22:06:32 -0700 (Sun, 12 Apr 2009)
Log Message:
-----------
firefox-x11-devel: Fix compilation on intel machines

Modified Paths:
--------------
    trunk/dports/www/firefox-x11-devel/Portfile

Added Paths:
-----------
    trunk/dports/www/firefox-x11-devel/files/gdk-Status.patch

Modified: trunk/dports/www/firefox-x11-devel/Portfile
===================================================================
--- trunk/dports/www/firefox-x11-devel/Portfile	2009-04-13 05:00:59 UTC (rev 49600)
+++ trunk/dports/www/firefox-x11-devel/Portfile	2009-04-13 05:06:32 UTC (rev 49601)
@@ -162,8 +162,9 @@
 # #486892 (plugins)
 # #486890 (sydneyaudio, 3.1b3 and later)
 # #487367 (browser-xulrunner-stub)
+# #484457 (gdk-Status)
 # Previous firefox-x11 port (patch-dylib_file.diff patch-pthread.diff)
-patchfiles configure.patch xpcom-Makefile.patch system-nss.patch make-install.patch patch-dylib_file.diff  patch-pthread.diff icon-Makefile.patch nsFilePicker.patch plugins.patch gfxPangoFonts.patch sydneyaudio.patch browser-xulrunner-stub.patch
+patchfiles configure.patch xpcom-Makefile.patch system-nss.patch make-install.patch patch-dylib_file.diff  patch-pthread.diff icon-Makefile.patch nsFilePicker.patch plugins.patch gfxPangoFonts.patch sydneyaudio.patch browser-xulrunner-stub.patch gdk-Status.patch
 
 post-patch {
     # https://bugzilla.mozilla.org/show_bug.cgi?id=485857

Added: trunk/dports/www/firefox-x11-devel/files/gdk-Status.patch
===================================================================
--- trunk/dports/www/firefox-x11-devel/files/gdk-Status.patch	                        (rev 0)
+++ trunk/dports/www/firefox-x11-devel/files/gdk-Status.patch	2009-04-13 05:06:32 UTC (rev 49601)
@@ -0,0 +1,15 @@
+--- gfx/thebes/src/gfxPlatformGtk.cpp.orig	2009-04-07 16:13:18.000000000 -0700
++++ gfx/thebes/src/gfxPlatformGtk.cpp	2009-04-07 16:14:29.000000000 -0700
+@@ -63,6 +63,12 @@
+ #include <gdk/gdkx.h>
+ #include "gfxXlibSurface.h"
+ #include "cairo-xlib.h"
++
++/* Undefine the Status from Xlib since it will conflict with system headers on OSX */
++#if defined(__APPLE__) && defined(Status)
++#undef Status
++#endif
++
+ #endif /* MOZ_X11 */
+ 
+ #ifdef MOZ_DFB
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090412/c38bc83c/attachment.html>