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

[jeremyhu at macports.org]

Revision: 49442
          http://trac.macports.org/changeset/49442
Author:   jeremyhu at macports.org
Date:     2009-04-09 15:44:39 -0700 (Thu, 09 Apr 2009)
Log Message:
-----------
firefox-x11-devel: Fix path to gre.d

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

Added Paths:
-----------
    trunk/dports/www/firefox-x11-devel/files/browser-xulrunner-stub.patch
    trunk/dports/www/firefox-x11-devel/files/xulrunner-app-Makefile.patch

Modified: trunk/dports/www/firefox-x11-devel/Portfile
===================================================================
--- trunk/dports/www/firefox-x11-devel/Portfile	2009-04-09 22:15:51 UTC (rev 49441)
+++ trunk/dports/www/firefox-x11-devel/Portfile	2009-04-09 22:44:39 UTC (rev 49442)
@@ -6,7 +6,7 @@
 name            firefox-x11-devel
 categories      www x11
 version         3.1b3
-revision        1
+revision        2
 platforms       darwin
 maintainers     jeremyhu openmaintainer
 description     Mozilla.org's popular stand-alone web browser, Beta and Release Candidates
@@ -55,6 +55,7 @@
 configure.cxxflags-append -I/Developer/Headers/FlatCarbon
 
 configure.args \
+	--with-xulrunner-stub-name=xulrunner-stub \
 	--disable-static \
 	--enable-shared \
 	--disable-official-branding \
@@ -160,9 +161,10 @@
 # #478871 (gfxPangoFonts)
 # NOTFILED (nsFilePicker)
 # #486892 (plugins)
-# #486890 (sydneyaudio)
+# #486890 (sydneyaudio, 3.1b3 and later)
+# #487367 (browser-xulrunner-stub)
 # 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
+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
 
 post-patch {
     # https://bugzilla.mozilla.org/show_bug.cgi?id=485857
@@ -212,6 +214,11 @@
 
     # Set our system plugins path
     reinplace "s:/usr/lib/mozilla/plugins:${prefix}/lib/nsplugins:" ${worksrcpath}/xpcom/io/nsAppFileLocationProvider.cpp
+
+    reinplace "s:/etc/gre\.:${prefix}/etc/gre.:g" \
+	${worksrcpath}/xpcom/build/nsXPCOMPrivate.h \
+	${worksrcpath}/xulrunner/app/nsRegisterGREUnix.cpp \
+	${worksrcpath}/xulrunner/installer/Makefile.in
 }
 
 configure.env \
@@ -252,6 +259,9 @@
 
     ## Workaround to get root certs loaded, so https:// works
     #ln -s ${prefix}/lib/nss/libnssckbi.dylib ${destroot}${prefix}/lib/${name}/libnssckbi.dylib
+
+    # https://bugzilla.mozilla.org/show_bug.cgi?id=486064
+    system "cat ${worksrcpath}/dist/include/gfx/gfxtypes.h ${worksrcpath}/dist/include/thebes/gfxTypes.h > ${destroot}${prefix}/include/${name}/unstable/gfxtypes.h"
 }
 
 livecheck.check regex

Added: trunk/dports/www/firefox-x11-devel/files/browser-xulrunner-stub.patch
===================================================================
--- trunk/dports/www/firefox-x11-devel/files/browser-xulrunner-stub.patch	                        (rev 0)
+++ trunk/dports/www/firefox-x11-devel/files/browser-xulrunner-stub.patch	2009-04-09 22:44:39 UTC (rev 49442)
@@ -0,0 +1,11 @@
+--- browser/app/Makefile.in.orig	2009-04-07 21:38:10.000000000 -0700
++++ browser/app/Makefile.in	2009-04-07 21:40:05.000000000 -0700
+@@ -418,7 +418,7 @@ endif
+ else
+ ifdef LIBXUL_SDK
+ libs::
+-	cp $(LIBXUL_DIST)/bin/xulrunner-stub$(BIN_SUFFIX) $(DIST)/bin/firefox$(BIN_SUFFIX)
++	cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/firefox$(BIN_SUFFIX)
+ endif
+ endif
+ 

Added: trunk/dports/www/firefox-x11-devel/files/xulrunner-app-Makefile.patch
===================================================================
--- trunk/dports/www/firefox-x11-devel/files/xulrunner-app-Makefile.patch	                        (rev 0)
+++ trunk/dports/www/firefox-x11-devel/files/xulrunner-app-Makefile.patch	2009-04-09 22:44:39 UTC (rev 49442)
@@ -0,0 +1,48 @@
+--- xulrunner/app/Makefile.in.orig	2009-04-07 22:17:16.000000000 -0700
++++ xulrunner/app/Makefile.in	2009-04-07 22:22:16.000000000 -0700
+@@ -87,12 +87,16 @@ CPPSRCS = nsXULRunnerApp.cpp
+ ifeq ($(OS_ARCH),WINNT)
+ CPPSRCS += nsRegisterGREWin.cpp
+ else
+-ifneq (,$(filter OS2 Darwin,$(OS_ARCH)))
++ifeq (OS2,$(OS_ARCH))
++CPPSRCS += nsRegisterGREVoid.cpp
++else
++ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
+ CPPSRCS += nsRegisterGREVoid.cpp
+ else
+ CPPSRCS += nsRegisterGREUnix.cpp
+ endif
+ endif
++endif
+ 
+ LOCAL_INCLUDES += \
+         -I$(topsrcdir)/toolkit/xre \
+@@ -104,7 +108,7 @@ TK_LIBS := -framework Cocoa $(TK_LIBS)
+ endif
+ 
+ ifndef MOZ_ENABLE_LIBXUL
+-ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
++ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
+ LIBS += $(DIST)/bin/XUL
+ else
+ EXTRA_DSO_LIBS += xul
+@@ -202,8 +206,8 @@ LDFLAGS += /HEAP:0x40000
+ endif
+ endif
+ 
+-ifneq (,$(filter-out OS2 WINNT Darwin BeOS,$(OS_ARCH)))
+-
++ifneq (,$(filter-out OS2 WINNT BeOS,$(OS_ARCH)))
++ifneq (cocoa, $(MOZ_WIDGET_TOOLKIT))
+ xulrunner:: mozilla.in Makefile.in Makefile $(DEPTH)/config/autoconf.mk
+ 	cat $< | sed -e "s|%MOZAPPDIR%|$(mozappdir)|" \
+                 -e "s|%MOZ_USER_DIR%|.mozilla/xulrunner|" \
+@@ -218,6 +222,7 @@ install:: xulrunner
+ 
+ GARBAGE += xulrunner
+ endif
++endif
+ 
+ ifneq (,$(filter gtk gtk2,$(MOZ_WIDGET_TOOLKIT)))
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090409/1c21c0b5/attachment.html>