[60198] trunk/dports/devel/xulrunner/files

[jeremyhu at macports.org]

Revision: 60198
          http://trac.macports.org/changeset/60198
Author:   jeremyhu at macports.org
Date:     2009-11-04 16:56:31 -0800 (Wed, 04 Nov 2009)
Log Message:
-----------
xulrunner: Add missing patches

Added Paths:
-----------
    trunk/dports/devel/xulrunner/files/gdk-Status.patch
    trunk/dports/devel/xulrunner/files/netwerk-wifi-src-Makefile.patch
    trunk/dports/devel/xulrunner/files/nsOggDecoder.patch
    trunk/dports/devel/xulrunner/files/sydneyaudio.patch

Added: trunk/dports/devel/xulrunner/files/gdk-Status.patch
===================================================================
--- trunk/dports/devel/xulrunner/files/gdk-Status.patch	                        (rev 0)
+++ trunk/dports/devel/xulrunner/files/gdk-Status.patch	2009-11-05 00:56:31 UTC (rev 60198)
@@ -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

Added: trunk/dports/devel/xulrunner/files/netwerk-wifi-src-Makefile.patch
===================================================================
--- trunk/dports/devel/xulrunner/files/netwerk-wifi-src-Makefile.patch	                        (rev 0)
+++ trunk/dports/devel/xulrunner/files/netwerk-wifi-src-Makefile.patch	2009-11-05 00:56:31 UTC (rev 60198)
@@ -0,0 +1,11 @@
+--- netwerk/wifi/src/Makefile.in.orig	2009-05-08 16:00:28.000000000 -0700
++++ netwerk/wifi/src/Makefile.in	2009-05-08 16:00:48.000000000 -0700
+@@ -57,7 +57,7 @@ CPPSRCS	=	nsWifiMonitor.cpp \
+ 		nsWifiAccessPoint.cpp \
+ 		$(NULL)
+ 
+-ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
++ifeq ($(OS_ARCH),Darwin)
+ CPPSRCS	+= nsWifiScannerMac.cpp
+ else
+ ifeq ($(MOZ_WIDGET_TOOLKIT),windows)

Added: trunk/dports/devel/xulrunner/files/nsOggDecoder.patch
===================================================================
--- trunk/dports/devel/xulrunner/files/nsOggDecoder.patch	                        (rev 0)
+++ trunk/dports/devel/xulrunner/files/nsOggDecoder.patch	2009-11-05 00:56:31 UTC (rev 60198)
@@ -0,0 +1,13 @@
+--- content/media/video/src/nsOggDecoder.cpp.orig	2009-06-18 16:04:53.000000000 -0700
++++ content/media/video/src/nsOggDecoder.cpp	2009-06-18 16:11:32.000000000 -0700
+@@ -53,6 +53,10 @@
+ #include "nsNetUtil.h"
+ #include "nsOggDecoder.h"
+ 
++#ifndef PR_ASSERT_CURRENT_THREAD_IN_MONITOR
++#define PR_ASSERT_CURRENT_THREAD_IN_MONITOR(m)
++#endif
++
+ using mozilla::TimeDuration;
+ using mozilla::TimeStamp;
+ 

Added: trunk/dports/devel/xulrunner/files/sydneyaudio.patch
===================================================================
--- trunk/dports/devel/xulrunner/files/sydneyaudio.patch	                        (rev 0)
+++ trunk/dports/devel/xulrunner/files/sydneyaudio.patch	2009-11-05 00:56:31 UTC (rev 60198)
@@ -0,0 +1,13 @@
+--- toolkit/library/Makefile.in.orig	2009-04-04 19:40:25.000000000 -0700
++++ toolkit/library/Makefile.in	2009-04-04 19:47:10.000000000 -0700
+@@ -205,7 +205,10 @@ EXTRA_DSO_LDOPTS += \
+ 	-lcrypto \
+ 	$(TK_LIBS) \
+ 	$(NULL)
++endif
+ 
++ifeq ($(OS_ARCH),Darwin)
+ ifdef MOZ_SYDNEYAUDIO
+ EXTRA_DSO_LDOPTS += \
++	-framework Carbon \
+ 	-framework CoreAudio \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091104/5a85e54d/attachment.html>