[49353] trunk/dports/www/firefox-x11
jeremyhu at macports.org
jeremyhu at macports.org
Wed Apr 8 00:30:00 PDT 2009
Revision: 49353
http://trac.macports.org/changeset/49353
Author: jeremyhu at macports.org
Date: 2009-04-08 00:29:59 -0700 (Wed, 08 Apr 2009)
Log Message:
-----------
firefox-x11: Use xulrunner
Modified Paths:
--------------
trunk/dports/www/firefox-x11/Portfile
Added Paths:
-----------
trunk/dports/www/firefox-x11/files/browser-xulrunner-stub.patch
trunk/dports/www/firefox-x11/files/xulrunner-app-Makefile.patch
Modified: trunk/dports/www/firefox-x11/Portfile
===================================================================
--- trunk/dports/www/firefox-x11/Portfile 2009-04-08 07:22:07 UTC (rev 49352)
+++ trunk/dports/www/firefox-x11/Portfile 2009-04-08 07:29:59 UTC (rev 49353)
@@ -6,7 +6,7 @@
name firefox-x11
categories www x11
version 3.0.8
-revision 5
+revision 6
platforms darwin
maintainers jeremyhu openmaintainer
description Mozilla.org's popular stand-alone web browser
@@ -39,22 +39,10 @@
port:pkgconfig
depends_lib \
- port:heimdal \
- port:lcms \
- port:gconf \
- port:esound \
- port:libcanberra \
- port:nss \
- port:nspr
+ port:xulrunner
-# port:xulrunner can replace nss and nspr once it's used to build firefox
-
-#-DXP_UNIX -DXP_MACOSX -UNO_X11
-#configure.cppflags-append -I/Developer/Headers/FlatCarbon
-#configure.cflags-append -I/Developer/Headers/FlatCarbon
-#configure.cxxflags-append -I/Developer/Headers/FlatCarbon
-
configure.args \
+ --with-xulrunner-stub-name=xulrunner-stub \
--disable-static \
--enable-shared \
--disable-official-branding \
@@ -106,10 +94,8 @@
--disable-pedantic \
--disable-tests \
--disable-mochitest \
- --enable-libxul
+ --with-libxul-sdk=${prefix}/lib/xulrunner
-# --with-libxul-sdk=${prefix}/lib/xulrunner
-
variant debug description {build with debugging symbols} {
configure.args-delete --disable-debug \
--disable-mochitest \
@@ -158,9 +144,11 @@
# #486036 (make-install)
# #485863 (icon-Makefile)
# NOTFILED (nsFilePicker)
-# NOTFILED (plugins)
+# #486892 (plugins)
+# #487367 (browser-xulrunner-stub)
+# #487371 (xulrunner-app-Makefile)
# 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
+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 browser-xulrunner-stub.patch xulrunner-app-Makefile.patch
post-patch {
# https://bugzilla.mozilla.org/show_bug.cgi?id=485857
@@ -207,6 +195,14 @@
reinplace "s:libesd.so.0:${prefix}/lib/libesd.0.dylib:" ${worksrcpath}/widget/src/gtk2/nsSound.cpp
reinplace "s:libcanberra.so.0:${prefix}/lib/libcanberra.0.dylib:" ${worksrcpath}/widget/src/gtk2/nsSound.cpp
reinplace "s:libgtk-x11-2.0.dylib:${prefix}/lib/libgtk-x11-2.0.dylib:" ${worksrcpath}/widget/src/gtk2/nsFilePicker.cpp
+
+ # 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 \
@@ -217,13 +213,15 @@
includedir="${prefix}/include/${name}" \
idldir="${prefix}/share/idl/${name}" \
installdir="${prefix}/lib/${name}" \
- sdkdir="${prefix}/lib/${name}"
+ sdkdir="${prefix}/lib/${name}" \
+ SKIP_COPY_XULRUNNER=1
destroot.args-append \
includedir="${prefix}/include/${name}" \
idldir="${prefix}/share/idl/${name}" \
installdir="${prefix}/lib/${name}" \
- sdkdir="${prefix}/lib/${name}"
+ sdkdir="${prefix}/lib/${name}" \
+ SKIP_COPY_XULRUNNER=1
# AC_X_PATH blindly asks xmkmf where X11 is, and it always uses /usr/X11R6.
# This block helps us link correctly when we are +system_x11 and x11prefix
@@ -250,3 +248,4 @@
livecheck.check regex
livecheck.url http://releases.mozilla.org/pub/mozilla.org/firefox/releases
livecheck.regex ">(\\d+(?:\\.\\d+)*).<"
+
Added: trunk/dports/www/firefox-x11/files/browser-xulrunner-stub.patch
===================================================================
--- trunk/dports/www/firefox-x11/files/browser-xulrunner-stub.patch (rev 0)
+++ trunk/dports/www/firefox-x11/files/browser-xulrunner-stub.patch 2009-04-08 07:29:59 UTC (rev 49353)
@@ -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/files/xulrunner-app-Makefile.patch
===================================================================
--- trunk/dports/www/firefox-x11/files/xulrunner-app-Makefile.patch (rev 0)
+++ trunk/dports/www/firefox-x11/files/xulrunner-app-Makefile.patch 2009-04-08 07:29:59 UTC (rev 49353)
@@ -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/20090408/47079052/attachment.html>
More information about the macports-changes
mailing list