[prev in list] [next in list] [prev in thread] [next in thread]
List: macports-changes
Subject: [48951] trunk/dports/www/firefox-x11
From: jeremyhu () macports ! org
Date: 2009-03-31 20:45:45
Message-ID: 20090331204546.24F21135F880 () beta ! macosforge ! org
[Download RAW message or body]
[Attachment #2 (multipart/alternative)]
Revision: 48951
http://trac.macports.org/changeset/48951
Author: jeremyhu@macports.org
Date: 2009-03-31 13:45:44 -0700 (Tue, 31 Mar 2009)
Log Message:
-----------
firefox: Bump to 3.0.8 ... phew
Modified Paths:
--------------
trunk/dports/www/firefox-x11/Portfile
Added Paths:
-----------
trunk/dports/www/firefox-x11/files/configure.patch
trunk/dports/www/firefox-x11/files/icon-Makefile.patch
trunk/dports/www/firefox-x11/files/make-install.patch
trunk/dports/www/firefox-x11/files/system-nss.patch
trunk/dports/www/firefox-x11/files/xpcom-Makefile.patch
Removed Paths:
-------------
trunk/dports/www/firefox-x11/files/patch-browser-app-mozilla.in
trunk/dports/www/firefox-x11/files/patch-browser-app-profile-firefox.js
trunk/dports/www/firefox-x11/files/patch-browser-components-build-Makefile.in
trunk/dports/www/firefox-x11/files/patch-build-unix-mozilla-xpcom.pc
trunk/dports/www/firefox-x11/files/patch-en-US-chrome-branding-brand.dtd
trunk/dports/www/firefox-x11/files/patch-executable_path.diff
trunk/dports/www/firefox-x11/files/patch-layout-build-Makefile.in
trunk/dports/www/firefox-x11/files/patch-xpcom-build-Makefile
trunk/dports/www/firefox-x11/files/patch-xptcall_x86.diff
Modified: trunk/dports/www/firefox-x11/Portfile
===================================================================
--- trunk/dports/www/firefox-x11/Portfile 2009-03-31 19:52:33 UTC (rev 48950)
+++ trunk/dports/www/firefox-x11/Portfile 2009-03-31 20:45:44 UTC (rev 48951)
@@ -5,7 +5,7 @@
name firefox-x11
categories www x11
-version 2.0.0.20
+version 3.0.8
platforms darwin
maintainers nomaintainer
description Mozilla.org's popular stand-alone web browser
@@ -27,74 +27,151 @@
distname firefox-${version}-source
use_bzip2 yes
-checksums md5 f3718fefd01c8edc007ec0b416a8a7b8 \
- sha1 16601fdbbb0a83b85fd053e76350f7da397f525e \
- rmd160 60f66a4998892a51c6fdd72a8b457a22275364b4
+checksums md5 5fb6c6f3e973516df83a573348377a2f \
+ sha1 93f82c64ae9c805964fb6459223a1061e2d328fd \
+ rmd160 2b56dbb881e169ad0a3acad30b8aa0677c03a5e5
worksrcdir mozilla
-patchfiles patch-browser-app-profile-firefox.js \
- patch-en-US-chrome-branding-brand.dtd \
- patch-xpcom-build-Makefile \
- patch-dylib_file.diff \
- patch-layout-build-Makefile.in \
- patch-build-unix-mozilla-xpcom.pc \
- patch-browser-app-mozilla.in \
- patch-xptcall_x86.diff \
- patch-pthread.diff \
- patch-executable_path.diff
+depends_build \
+ port:findutils \
+ port:pkgconfig
-depends_build port:pkgconfig
+depends_lib \
+ port:gnome-vfs \
+ port:gnome-icon-theme \
+ port:nss \
+ port:nspr \
+ port:gtk2
-depends_lib port:libidl \
- port:zip \
- port:gtk2 \
- port:gnome-vfs \
- port:gnome-icon-theme \
- port:nspr
+# port:xulrunner can replace nss nspr and gtk2 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.env MOZCONFIG="${workpath}/.mozconfig"
+configure.args \
+ --disable-static \
+ --enable-shared \
+ --with-distribution-id=org.macports \
+ --enable-default-toolkit=cairo-gtk2 \
+ --x-includes=${prefix}/include \
+ --x-libraries=${prefix}/lib \
+ --with-system-nspr \
+ --with-nspr-prefix=${prefix} \
+ --with-system-nss \
+ --with-nss-prefix=${prefix} \
+ --with-system-bzip2=${prefix} \
+ --with-system-jpeg=${prefix} \
+ --with-system-zlib=${prefix} \
+ --enable-system-cairo \
+ --with-system-cairo=${prefix} \
+ --enable-system-sqlite \
+ --with-default-mozilla-five-home=${prefix}/lib/firefox \
+ --disable-oji \
+ --enable-plugins \
+ --enable-mathml \
+ --enable-extensions="default,spellcheck" \
+ --enable-permissions \
+ --enable-cookie \
+ --enable-image-decoders=all \
+ --enable-image-encoder=all \
+ --enable-canvas \
+ --enable-jsd \
+ --enable-xpctools \
+ --enable-crypto \
+ --enable-pango \
+ --enable-svg \
+ --enable-svg-renderer=cairo \
+ --enable-xinerama \
+ --with-pthreads \
+ --enable-gnomevfs \
+ --enable-postscript \
+ --enable-safe-browsing \
+ --enable-xft \
+ --disable-freetype2 \
+ --disable-crashreporter \
+ --enable-optimize=-O2 \
+ --disable-prebinding \
+ --enable-strip \
+ --disable-debug \
+ --disable-installer \
+ --disable-updater \
+ --disable-pedantic \
+ --disable-tests \
+ --disable-mochitest
-configure.args --enable-application=browser \
- --disable-official-branding \
- --with-distribution-id=org.macports \
- --disable-static \
- --enable-shared \
- --enable-default-toolkit=gtk2 \
- --enable-xft \
- --disable-freetype2 \
- --enable-xinerama \
- --with-pthreads \
- --enable-gnomevfs \
- --enable-postscript \
- --disable-prebinding \
- --disable-debug \
- --enable-strip \
- --enable-optimize='-O2' \
- --disable-tests \
- --with-default-mozilla-five-home=${prefix}/lib/firefox \
- --with-system-jpeg=${prefix} \
- --with-system-zlib=${prefix} \
- --with-system-png=${prefix} \
- --enable-system-cairo \
- --with-system-cairo=${prefix} \
- --with-system-nspr \
- --with-nspr-prefix=${prefix}
+# --with-libxul-sdk=${prefix}/lib/xulrunner
+# --enable-help-viewer \
+# --disable-official-branding
-
variant debug description "build with debugging symbols" {
configure.args-delete --disable-debug \
+ --disable-mochitest \
--enable-optimize='-O2' \
--enable-strip
configure.args-append --enable-debug \
+ --enable-mochitest \
--disable-optimize \
--disable-strip
}
+post-extract {
+ # https://bugzilla.mozilla.org/show_bug.cgi?id=484353
+ move ${worksrcpath}/modules/libjar/nsWildCard.cpp \
${worksrcpath}/modules/libjar/nsWildCard_jar.cpp +}
+
+# Upstream bugs (http://bugzilla.mozilla.org)
+# #485827 (xpcom-Makefile)
+# #485856 (configure)
+# #485862 (system-nss)
+# #486036 (make-install)
+# #485863 (icon-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 +
+post-patch {
+ # https://bugzilla.mozilla.org/show_bug.cgi?id=485857
+ reinplace "s:XP_MACOSX:__APPLE__:g" ${worksrcpath}/xpcom/base/nsStackWalk.cpp
+
+ # https://bugzilla.mozilla.org/show_bug.cgi?id=484353
+ reinplace "s:nsWildCard.cpp:nsWildCard_jar.cpp:g" \
${worksrcpath}/modules/libjar/objs.mk +
+ # https://bugzilla.mozilla.org/show_bug.cgi?id=486034
+ # find -xtype -> gfind -xtype
+ reinplace "s:find:gfind:g" ${worksrcpath}/toolkit/mozapps/installer/packager.mk
+
+ # Set the right install_name on the libs
+ reinplace "s:@executable_path:${prefix}/lib/${name}:g" \
${worksrcpath}/config/rules.mk +}
+
+configure.env \
+ MOZCONFIG="${worksrcpath}/browser/config/mozconfig" \
+ MOZILLA_FIVE_HOME="${prefix}/lib/${name}"
+
+build.args-append \
+ includedir="${prefix}/include/${name}" \
+ idldir="${prefix}/share/idl/${name}" \
+ installdir="${prefix}/lib/${name}" \
+ sdkdir="${prefix}/lib/${name}"
+
+destroot.args-append \
+ includedir="${prefix}/include/${name}" \
+ idldir="${prefix}/share/idl/${name}" \
+ installdir="${prefix}/lib/${name}" \
+ sdkdir="${prefix}/lib/${name}"
+
+# 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
+# is somewhere non-standard and should cause AC_X_PATH to let us setup our
+# CPPFLAGS and LDFLAGS without interference
pre-configure {
- system "touch ${workpath}/.mozconfig"
+ if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } {
+ configure.cppflags-append -I${x11prefix}/include
+ configure.ldflags-append -L${x11prefix}/lib
+ }
}
post-destroot {
Added: trunk/dports/www/firefox-x11/files/configure.patch
===================================================================
--- trunk/dports/www/firefox-x11/files/configure.patch (rev \
0)
+++ trunk/dports/www/firefox-x11/files/configure.patch 2009-03-31 20:45:44 UTC (rev \
48951) @@ -0,0 +1,16 @@
+--- configure.orig 2009-03-19 21:02:35.000000000 -0700
++++ configure 2009-03-19 21:03:53.000000000 -0700
+@@ -5807,11 +5807,10 @@ case "$host" in
+ ;;
+
+ *-darwin*)
+- HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX -DXP_MACOSX -DNO_X11"
+- HOST_NSPR_MDCPUCFG='\"md/_darwin.cfg\"'
++ HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX -DXP_MACOSX"
++ HOST_CXXFLAGS="$HOST_CXXFLAGS -DXP_UNIX -DXP_MACOSX"
+ HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}"
+ MOZ_FIX_LINK_PATHS='-Wl,-executable_path,$(LIBXUL_DIST)/bin'
+- LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) $(LIBXUL_DIST)/bin/XUL -lobjc'
+ ;;
+
+ *-linux*|*-kfreebsd*-gnu)
Added: trunk/dports/www/firefox-x11/files/icon-Makefile.patch
===================================================================
--- trunk/dports/www/firefox-x11/files/icon-Makefile.patch \
(rev 0)
+++ trunk/dports/www/firefox-x11/files/icon-Makefile.patch 2009-03-31 20:45:44 UTC \
(rev 48951) @@ -0,0 +1,11 @@
+--- modules/libpr0n/decoders/icon/Makefile.in.orig 2009-03-31 12:55:07.000000000 \
-0700 ++++ modules/libpr0n/decoders/icon/Makefile.in 2009-03-31 12:55:47.000000000 \
-0700 +@@ -67,7 +67,7 @@ ifeq ($(OS_ARCH),OS2)
+ PLATFORM = os2
+ endif
+
+-ifeq ($(OS_ARCH),Darwin)
++ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+ PLATFORM = mac
+ endif
+
Added: trunk/dports/www/firefox-x11/files/make-install.patch
===================================================================
--- trunk/dports/www/firefox-x11/files/make-install.patch \
(rev 0)
+++ trunk/dports/www/firefox-x11/files/make-install.patch 2009-03-31 20:45:44 UTC \
(rev 48951) @@ -0,0 +1,14 @@
+--- toolkit/mozapps/installer/packager.mk.bak 2009-03-30 17:04:13.000000000 -0700
++++ toolkit/mozapps/installer/packager.mk 2009-03-30 17:05:06.000000000 -0700
+@@ -410,7 +410,10 @@ make-package: stage-package
+ # dist/sdk/lib -> prefix/lib/appname-devel-version/lib
+ # prefix/lib/appname-devel-version/* symlinks to the above directories
+ install:: stage-package
+-ifneq (,$(filter WINNT Darwin,$(OS_ARCH)))
++ifneq (,$(filter WINNT,$(OS_ARCH)))
++ $(error "make install" is not supported on this platform. Use "make package" \
instead.) ++endif
++ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+ $(error "make install" is not supported on this platform. Use "make package" \
instead.) + endif
+ $(NSINSTALL) -D $(DESTDIR)$(installdir)
Deleted: trunk/dports/www/firefox-x11/files/patch-browser-app-mozilla.in
===================================================================
--- trunk/dports/www/firefox-x11/files/patch-browser-app-mozilla.in 2009-03-31 \
19:52:33 UTC (rev 48950)
+++ trunk/dports/www/firefox-x11/files/patch-browser-app-mozilla.in 2009-03-31 \
20:45:44 UTC (rev 48951) @@ -1,13 +0,0 @@
---- browser/app/mozilla.in~ 2006-02-19 09:13:13.000000000 -0500
-+++ browser/app/mozilla.in 2006-02-19 09:14:35.000000000 -0500
-@@ -99,7 +99,9 @@
- # If not, then start resolving symlinks until we find run-mozilla.sh
- found=0
- progname="$0"
--curdir=`dirname "$progname"`
-+#curdir=`dirname "$progname"`
-+#incorrectly uses ${prefix}/bin, so force use of ${prefix}/lib/firefox
-+curdir="$moz_libdir"
- progbase=`basename "$progname"`
- run_moz="$curdir/run-mozilla.sh"
- if test -x "$run_moz"; then
Deleted: trunk/dports/www/firefox-x11/files/patch-browser-app-profile-firefox.js
===================================================================
--- trunk/dports/www/firefox-x11/files/patch-browser-app-profile-firefox.js 2009-03-31 \
19:52:33 UTC (rev 48950)
+++ trunk/dports/www/firefox-x11/files/patch-browser-app-profile-firefox.js 2009-03-31 \
20:45:44 UTC (rev 48951) @@ -1,12 +0,0 @@
---- browser/app/profile/firefox.js~ 2006-02-20 11:21:57.000000000 -0500
-+++ browser/app/profile/firefox.js 2006-02-20 11:42:58.000000000 -0500
-@@ -48,6 +48,9 @@
- #endif
- #endif
-
-+// MacPorts-specific preferences
-+pref("general.useragent.vendorComment", "MacPorts Firefox Community Edition");
-+
- pref("general.startup.browser", true);
-
- pref("browser.chromeURL","chrome://browser/content/");
Deleted: trunk/dports/www/firefox-x11/files/patch-browser-components-build-Makefile.in
===================================================================
--- trunk/dports/www/firefox-x11/files/patch-browser-components-build-Makefile.in 2009-03-31 \
19:52:33 UTC (rev 48950)
+++ trunk/dports/www/firefox-x11/files/patch-browser-components-build-Makefile.in 2009-03-31 \
20:45:44 UTC (rev 48951) @@ -1,15 +0,0 @@
---- browser/components/build/Makefile.in~ 2006-02-19 09:54:45.000000000 -0500
-+++ browser/components/build/Makefile.in 2006-02-19 09:56:27.000000000 -0500
-@@ -74,6 +74,12 @@
- $(MOZ_COMPONENT_LIBS) \
- $(NULL)
-
-+# fix for building on Mac/X11 (bug 257773)
-+# dependencies for gkgfx
-+ifeq ($(MOZ_WIDGET_TOOLKIT), gtk2)
-+EXTRA_DSO_LDOPTS += $(MOZ_GTK2_LIBS)
-+endif
-+
- # Need to link to CoreFoundation for Mac Migrators (PList reading code)
- ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
- EXTRA_DSO_LDOPTS += \
Deleted: trunk/dports/www/firefox-x11/files/patch-build-unix-mozilla-xpcom.pc
===================================================================
--- trunk/dports/www/firefox-x11/files/patch-build-unix-mozilla-xpcom.pc 2009-03-31 \
19:52:33 UTC (rev 48950)
+++ trunk/dports/www/firefox-x11/files/patch-build-unix-mozilla-xpcom.pc 2009-03-31 \
20:45:44 UTC (rev 48951) @@ -1,9 +0,0 @@
---- build/unix/mozilla-xpcom.pc.in~ 2005-07-05 19:21:52.000000000 -0400
-+++ build/unix/mozilla-xpcom.pc.in 2007-08-20 23:41:09.000000000 -0400
-@@ -8,5 +8,5 @@
- Description: The Mozilla Cross Platform Component Library
- Version: %MOZILLA_VERSION%
- Requires: %NSPR_NAME% >= %NSPR_VERSION%
--Libs: -L${libdir} -lxpcom
-+Libs: -L${libdir} -lxpcom -lxpcom_core
- Cflags: -I${includedir} -I${includedir}/xpcom -I${includedir}/string
Deleted: trunk/dports/www/firefox-x11/files/patch-en-US-chrome-branding-brand.dtd
===================================================================
--- trunk/dports/www/firefox-x11/files/patch-en-US-chrome-branding-brand.dtd 2009-03-31 \
19:52:33 UTC (rev 48950)
+++ trunk/dports/www/firefox-x11/files/patch-en-US-chrome-branding-brand.dtd 2009-03-31 \
20:45:44 UTC (rev 48951) @@ -1,8 +0,0 @@
---- browser/locales/en-US/chrome/branding/brand.dtd.orig 2006-08-25 \
02:02:37.000000000 +0200
-+++ browser/locales/en-US/chrome/branding/brand.dtd 2008-03-27 18:16:48.000000000 \
+0100
-@@ -1,3 +1,3 @@
- <!ENTITY brandShortName "Bon Echo">
--<!ENTITY brandFullName "Bon Echo">
--<!ENTITY vendorShortName "Mozilla">
-+<!ENTITY brandFullName "Web Browser">
-+<!ENTITY vendorShortName "Web Browser">
Deleted: trunk/dports/www/firefox-x11/files/patch-executable_path.diff
===================================================================
--- trunk/dports/www/firefox-x11/files/patch-executable_path.diff 2009-03-31 19:52:33 \
UTC (rev 48950)
+++ trunk/dports/www/firefox-x11/files/patch-executable_path.diff 2009-03-31 20:45:44 \
UTC (rev 48951) @@ -1,110 +0,0 @@
---- config/rules.mk.orig 2006-12-22 14:50:41.000000000 +0200
-+++ config/rules.mk 2007-09-22 22:31:47.000000000 +0200
-@@ -424,7 +424,7 @@
- ifdef IS_COMPONENT
- EXTRA_DSO_LDOPTS += -bundle
- else
--EXTRA_DSO_LDOPTS += -dynamiclib -install_name @executable_path/$(SHARED_LIBRARY) \
-compatibility_version 1 -current_version 1
-+EXTRA_DSO_LDOPTS += -dynamiclib -install_name \
$(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)/$(SHARED_LIBRARY) -compatibility_version \
1 -current_version 1
- endif
- endif
- endif
---- config/config.mk.orig 2007-02-16 03:19:06.000000000 +0200
-+++ config/config.mk 2007-09-22 23:44:44.000000000 +0200
-@@ -745,7 +745,7 @@
- # Tell the linker where NSS is, if we're building crypto
- ifeq ($(OS_ARCH),Darwin)
- ifeq (,$(findstring crypto,$(MOZ_META_COMPONENTS)))
--MOZ_COMPONENTLIB_EXTRA_LIBS = $(foreach library, $(patsubst -l%, \
$(LIB_PREFIX)%$(DLL_SUFFIX), $(filter -l%, $(NSS_LIBS))), -dylib_file \
@executable_path/$(library):$(DIST)/bin/$(library))
-+MOZ_COMPONENTLIB_EXTRA_LIBS = $(foreach library, $(patsubst -l%, \
$(LIB_PREFIX)%$(DLL_SUFFIX), $(filter -l%, $(NSS_LIBS))), -dylib_file \
$(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)/$(library):$(DIST)/bin/$(library))
- endif
- endif
- endif
---- directory/c-sdk/configure.in.orig 2007-07-15 16:41:07.000000000 +0200
-+++ directory/c-sdk/configure.in 2007-09-23 10:38:22.000000000 +0200
-@@ -921,7 +921,7 @@ case "$target" in
- CPU_ARCH=ppc
- ;;
- esac
-- DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load \
-install_name @executable_path/$@'
-+ DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load \
-install_name \$(libdir)/\$(MOZ_APP_NAME)-\$(MOZ_APP_VERSION)/$@'
- # Use the standard preprocessor (cpp)
- CFLAGS="$CFLAGS -no-cpp-precomp"
- MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
---- directory/c-sdk/configure.orig 2006-02-23 01:58:13.000000000 +0100
-+++ directory/c-sdk/configure 2007-09-23 10:38:35.000000000 +0200
-@@ -3330,7 +3330,7 @@ EOF
- CPU_ARCH=ppc
- ;;
- esac
-- DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load \
-install_name @executable_path/$@'
-+ DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load \
-install_name \$(libdir)/\$(MOZ_APP_NAME)-\$(MOZ_APP_VERSION)/$@'
- # Use the standard preprocessor (cpp)
- CFLAGS="$CFLAGS -no-cpp-precomp"
- MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
---- nsprpub/configure.in.orig 2007-05-03 03:30:08.000000000 +0200
-+++ nsprpub/configure.in 2007-09-23 10:39:41.000000000 +0200
-@@ -979,7 +979,7 @@ case "$target" in
- ;;
- esac
- DSO_CFLAGS=-fPIC
-- DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load \
-install_name @executable_path/$@ -headerpad_max_install_names'
-+ DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load \
-install_name \$(libdir)/\$(MOZ_APP_NAME)-\$(MOZ_APP_VERSION)/$@ \
-headerpad_max_install_names'
- # Use the standard preprocessor (cpp)
- CFLAGS="$CFLAGS -no-cpp-precomp"
- MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
---- nsprpub/configure.orig 2007-05-03 03:30:08.000000000 +0200
-+++ nsprpub/configure 2007-09-23 10:39:24.000000000 +0200
-@@ -3326,7 +3326,7 @@ EOF
- ;;
- esac
- DSO_CFLAGS=-fPIC
-- DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load \
-install_name @executable_path/$@ -headerpad_max_install_names'
-+ DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load \
-install_name \$(libdir)/\$(MOZ_APP_NAME)-\$(MOZ_APP_VERSION)/$@ \
-headerpad_max_install_names'
- # Use the standard preprocessor (cpp)
- CFLAGS="$CFLAGS -no-cpp-precomp"
- MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
---- security/coreconf/Darwin.mk.orig 2005-01-20 09:12:48.000000000 +0100
-+++ security/coreconf/Darwin.mk 2007-09-23 12:49:02.000000000 +0200
-@@ -111,7 +111,7 @@ endif
-
- DSO_CFLAGS = -fPIC
- # May override this with -bundle to create a loadable module.
--DSO_LDOPTS = -dynamiclib -compatibility_version 1 -current_version 1 -install_name \
@executable_path/$(notdir $@) -headerpad_max_install_names
-+DSO_LDOPTS = -dynamiclib -compatibility_version 1 -current_version 1 -install_name \
\$(libdir)/\$(MOZ_APP_NAME)-\$(MOZ_APP_VERSION)/$(notdir $@) \
-headerpad_max_install_names
-
- MKSHLIB = $(CC) $(DSO_LDOPTS) $(DARWIN_SDK_SHLIBFLAGS)
- DLL_SUFFIX = dylib
---- security/nss/cmd/platlibs.mk.orig 2004-10-16 01:52:29.000000000 +0200
-+++ security/nss/cmd/platlibs.mk 2007-09-23 12:48:37.000000000 +0200
-@@ -226,7 +226,7 @@ endif
- endif
-
- ifeq ($(OS_ARCH), Darwin)
--EXTRA_SHARED_LIBS += -dylib_file \
@executable_path/libsoftokn3.dylib:$(DIST)/lib/libsoftokn3.dylib
-+EXTRA_SHARED_LIBS += -dylib_file \
$(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)/libsoftokn3.dylib:$(DIST)/lib/libsoftokn3.dylib
- endif
-
-
---- security/nss/lib/smime/config.mk.orig 2004-10-16 01:52:34.000000000 +0200
-+++ security/nss/lib/smime/config.mk 2007-09-23 12:48:24.000000000 +0200
-@@ -76,7 +76,7 @@ EXTRA_SHARED_LIBS += \
- $(NULL)
-
- ifeq ($(OS_ARCH), Darwin)
--EXTRA_SHARED_LIBS += -dylib_file \
@executable_path/libsoftokn3.dylib:$(DIST)/lib/libsoftokn3.dylib
-+EXTRA_SHARED_LIBS += -dylib_file \
$(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)/libsoftokn3.dylib:$(DIST)/lib/libsoftokn3.dylib
- endif
-
- endif
---- security/nss/lib/ssl/config.mk.orig 2004-10-16 01:52:35.000000000 +0200
-+++ security/nss/lib/ssl/config.mk 2007-09-23 12:48:15.000000000 +0200
-@@ -109,7 +109,7 @@ EXTRA_SHARED_LIBS += -lbe
- endif
-
- ifeq ($(OS_ARCH), Darwin)
--EXTRA_SHARED_LIBS += -dylib_file \
@executable_path/libsoftokn3.dylib:$(DIST)/lib/libsoftokn3.dylib
-+EXTRA_SHARED_LIBS += -dylib_file \
$(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)/libsoftokn3.dylib:$(DIST)/lib/libsoftokn3.dylib
- endif
-
- ifeq ($(OS_TARGET),SunOS)
Deleted: trunk/dports/www/firefox-x11/files/patch-layout-build-Makefile.in
===================================================================
--- trunk/dports/www/firefox-x11/files/patch-layout-build-Makefile.in 2009-03-31 \
19:52:33 UTC (rev 48950)
+++ trunk/dports/www/firefox-x11/files/patch-layout-build-Makefile.in 2009-03-31 \
20:45:44 UTC (rev 48951) @@ -1,22 +0,0 @@
---- /Users/mta/macports/dports/www/firefox-x11/save/layout_build_Makefile.in 2007-08-23 \
01:08:14.000000000 -0400
-+++ layout/build/Makefile.in 2007-08-23 01:07:49.000000000 -0400
-@@ -224,13 +224,15 @@
- $(NULL)
- endif
-
--ifdef MOZ_ENABLE_GTK2
--EXTRA_DSO_LDOPTS += $(MOZ_GTK2_LIBS) \
-+ifneq (,$(MOZ_ENABLE_CANVAS)$(MOZ_SVG_RENDERER_CAIRO))
-+EXTRA_DSO_LDOPTS += $(MOZ_CAIRO_LIBS) \
- $(NULL)
- endif
-
--ifneq (,$(MOZ_ENABLE_CANVAS)$(MOZ_SVG_RENDERER_CAIRO))
--EXTRA_DSO_LDOPTS += $(MOZ_CAIRO_LIBS) \
-+# MOZ_GTK2_LIBS must come after MOZ_CAIRO_LIBS to avoid multiply defined
-+# symbols between libcairo.dylib and libmozcairo.a
-+ifdef MOZ_ENABLE_GTK2
-+EXTRA_DSO_LDOPTS += $(MOZ_GTK2_LIBS) \
- $(NULL)
- endif
-
Deleted: trunk/dports/www/firefox-x11/files/patch-xpcom-build-Makefile
===================================================================
--- trunk/dports/www/firefox-x11/files/patch-xpcom-build-Makefile 2009-03-31 19:52:33 \
UTC (rev 48950)
+++ trunk/dports/www/firefox-x11/files/patch-xpcom-build-Makefile 2009-03-31 20:45:44 \
UTC (rev 48951) @@ -1,15 +0,0 @@
---- save/xpcom_build_Makefile.in 2007-08-22 16:11:33.000000000 -0400
-+++ xpcom/build/Makefile.in 2007-08-22 16:11:56.000000000 -0400
-@@ -139,6 +139,12 @@
- EXTRA_DEPS += $(DIST)/lib/$(LIB_PREFIX)macmorefiles_s.$(LIB_SUFFIX)
- endif
-
-+# nsMacUtilsImpl needs CoreFoundation on Darwin, probably wrong, but
-+# that's the way it is.
-+ifeq ($(OS_TARGET),Darwin)
-+OS_LIBS += -framework CoreServices -framework CoreFoundation
-+endif
-+
- # Force use of PIC
- FORCE_USE_PIC = 1
-
Deleted: trunk/dports/www/firefox-x11/files/patch-xptcall_x86.diff
===================================================================
--- trunk/dports/www/firefox-x11/files/patch-xptcall_x86.diff 2009-03-31 19:52:33 UTC \
(rev 48950)
+++ trunk/dports/www/firefox-x11/files/patch-xptcall_x86.diff 2009-03-31 20:45:44 UTC \
(rev 48951) @@ -1,22 +0,0 @@
---- xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h.bak 2007-04-09 \
22:01:13.000000000 +0200
-+++ xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h 2007-10-10 \
09:45:43.000000000 +0200
-@@ -173,7 +173,7 @@
- /* Define KEEP_STACK_16_BYTE_ALIGNED if the stack needs to maintain alignment
- * in a CALL for some good reason (like ABI compliance). */
-
--#if defined(XP_MACOSX) || defined(__QNXNTO__)
-+#if defined(__APPLE__) || defined(__QNXNTO__)
- /* http://developer.apple.com/documentation/DeveloperTools/Conceptual/LowLevelABI/Articles/IA32.html \
*/
- #define KEEP_STACK_16_BYTE_ALIGNED
- #endif
---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_unixish_x86.cpp.bak 2005-10-24 \
07:42:28.000000000 +0200
-+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_unixish_x86.cpp 2007-10-10 \
09:45:43.000000000 +0200
-@@ -104,7 +104,7 @@ PrepareAndDispatch(nsXPTCStubBase* self,
-
- #ifdef __GNUC__ /* Gnu Compiler. */
-
--#ifdef XP_MACOSX
-+#ifdef __APPLE__
- /* Make sure the stack is 16-byte aligned. Do that by aligning to 16 bytes and
- * then subtracting 4 so the three subsequent pushes result in a 16-byte aligned
- * stack. */
Added: trunk/dports/www/firefox-x11/files/system-nss.patch
===================================================================
--- trunk/dports/www/firefox-x11/files/system-nss.patch (rev \
0)
+++ trunk/dports/www/firefox-x11/files/system-nss.patch 2009-03-31 20:45:44 UTC (rev \
48951) @@ -0,0 +1,13 @@
+https://bugzilla.mozilla.org/show_bug.cgi?id=485862
+
+--- config/autoconf.mk.in.orig 2009-03-29 22:07:24.000000000 -0700
++++ config/autoconf.mk.in 2009-03-29 22:07:54.000000000 -0700
+@@ -278,7 +278,7 @@ OS_LDFLAGS = @LDFLAGS@
+ OS_COMPILE_CFLAGS = $(OS_CPPFLAGS) @COMPILE_CFLAGS@
+ OS_COMPILE_CXXFLAGS = $(OS_CPPFLAGS) @COMPILE_CXXFLAGS@
+
+-OS_INCLUDES = $(NSPR_CFLAGS) $(JPEG_CFLAGS) $(PNG_CFLAGS) $(ZLIB_CFLAGS) \
$(LCMS_CFLAGS) ++OS_INCLUDES = $(NSPR_CFLAGS) $(NSS_CFLAGS) $(JPEG_CFLAGS) \
$(PNG_CFLAGS) $(ZLIB_CFLAGS) $(LCMS_CFLAGS) + OS_LIBS = @LIBS@
+ ACDEFINES = @MOZ_DEFINES@
+
Added: trunk/dports/www/firefox-x11/files/xpcom-Makefile.patch
===================================================================
--- trunk/dports/www/firefox-x11/files/xpcom-Makefile.patch \
(rev 0)
+++ trunk/dports/www/firefox-x11/files/xpcom-Makefile.patch 2009-03-31 20:45:44 UTC \
(rev 48951) @@ -0,0 +1,11 @@
+--- xpcom/stub/Makefile.in.orig 2009-03-29 20:11:15.000000000 -0700
++++ xpcom/stub/Makefile.in 2009-03-29 20:11:48.000000000 -0700
+@@ -107,7 +107,7 @@ else
+ DEPENDENT_LIBS_LIST += $(LIB_PREFIX)mozjs$(DLL_SUFFIX)
+ endif
+
+-ifeq (Darwin,$(OS_ARCH))
++ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+ EXTRA_DSO_LDOPTS += $(DIST)/bin/XUL
+ DEPENDENT_LIBS_LIST += XUL
+ else
[Attachment #5 (text/html)]
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[48951] trunk/dports/www/firefox-x11</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: \
verdana,arial,helvetica,sans-serif; font-size: 10pt; } #msg dl a { font-weight: \
bold} #msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: \
bold; } #msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: \
6px; } #logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em \
0; } #logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg \
h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; } \
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; \
} #logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: \
-1.5em; padding-left: 1.5em; } #logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em \
1em 0 1em; background: white;} #logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid \
#fa0; border-bottom: 1px solid #fa0; background: #fff; } #logmsg table th { \
text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted \
#fa0; } #logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: \
0.2em 0.5em; } #logmsg table thead th { text-align: center; border-bottom: 1px solid \
#fa0; } #logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: \
6px; } #patch { width: 100%; }
#patch h4 {font-family: \
verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, \
#patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch ins \
{background:#dfd;text-decoration:none;display:block;padding:0 10px;} #patch del \
{background:#fdd;text-decoration:none;display:block;padding:0 10px;} #patch .lines, \
.info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a \
href="http://trac.macports.org/changeset/48951">48951</a></dd> <dt>Author</dt> \
<dd>jeremyhu@macports.org</dd> <dt>Date</dt> <dd>2009-03-31 13:45:44 -0700 (Tue, 31 \
Mar 2009)</dd> </dl>
<h3>Log Message</h3>
<pre>firefox: Bump to 3.0.8 ... phew</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportswwwfirefoxx11Portfile">trunk/dports/www/firefox-x11/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportswwwfirefoxx11filesconfigurepatch">trunk/dports/www/firefox-x11/files/configure.patch</a></li>
<li><a href="#trunkdportswwwfirefoxx11filesiconMakefilepatch">trunk/dports/www/firefox-x11/files/icon-Makefile.patch</a></li>
<li><a href="#trunkdportswwwfirefoxx11filesmakeinstallpatch">trunk/dports/www/firefox-x11/files/make-install.patch</a></li>
<li><a href="#trunkdportswwwfirefoxx11filessystemnsspatch">trunk/dports/www/firefox-x11/files/system-nss.patch</a></li>
<li><a href="#trunkdportswwwfirefoxx11filesxpcomMakefilepatch">trunk/dports/www/firefox-x11/files/xpcom-Makefile.patch</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportswwwfirefoxx11filespatchbrowserappmozillain">trunk/dports/www/firefox-x11/files/patch-browser-app-mozilla.in</a></li>
<li><a href="#trunkdportswwwfirefoxx11filespatchbrowserappprofilefirefoxjs">trunk/dports/www/firefox-x11/files/patch-browser-app-profile-firefox.js</a></li>
<li><a href="#trunkdportswwwfirefoxx11filespatchbrowsercomponentsbuildMakefilein">tru \
nk/dports/www/firefox-x11/files/patch-browser-components-build-Makefile.in</a></li> \
<li><a href="#trunkdportswwwfirefoxx11filespatchbuildunixmozillaxpcompc">trunk/dports/www/firefox-x11/files/patch-build-unix-mozilla-xpcom.pc</a></li>
<li><a href="#trunkdportswwwfirefoxx11filespatchenUSchromebrandingbranddtd">trunk/dports/www/firefox-x11/files/patch-en-US-chrome-branding-brand.dtd</a></li>
<li><a href="#trunkdportswwwfirefoxx11filespatchexecutable_pathdiff">trunk/dports/www/firefox-x11/files/patch-executable_path.diff</a></li>
<li><a href="#trunkdportswwwfirefoxx11filespatchlayoutbuildMakefilein">trunk/dports/www/firefox-x11/files/patch-layout-build-Makefile.in</a></li>
<li><a href="#trunkdportswwwfirefoxx11filespatchxpcombuildMakefile">trunk/dports/www/firefox-x11/files/patch-xpcom-build-Makefile</a></li>
<li><a href="#trunkdportswwwfirefoxx11filespatchxptcall_x86diff">trunk/dports/www/firefox-x11/files/patch-xptcall_x86.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportswwwfirefoxx11Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/www/firefox-x11/Portfile (48950 => \
48951)</h4> <pre class="diff"><span>
<span class="info">--- trunk/dports/www/firefox-x11/Portfile 2009-03-31 19:52:33 UTC \
(rev 48950)
+++ trunk/dports/www/firefox-x11/Portfile 2009-03-31 20:45:44 UTC (rev 48951)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx">
</span><span class="cx"> name firefox-x11
</span><span class="cx"> categories www x11
</span><del>-version 2.0.0.20
</del><ins>+version 3.0.8
</ins><span class="cx"> platforms darwin
</span><span class="cx"> maintainers nomaintainer
</span><span class="cx"> description Mozilla.org's popular stand-alone web \
browser </span><span class="lines">@@ -27,74 +27,151 @@
</span><span class="cx"> distname firefox-${version}-source
</span><span class="cx"> use_bzip2 yes
</span><span class="cx">
</span><del>-checksums md5 f3718fefd01c8edc007ec0b416a8a7b8 \
- sha1 16601fdbbb0a83b85fd053e76350f7da397f525e \
- rmd160 60f66a4998892a51c6fdd72a8b457a22275364b4
</del><ins>+checksums md5 5fb6c6f3e973516df83a573348377a2f \
+ sha1 93f82c64ae9c805964fb6459223a1061e2d328fd \
+ rmd160 2b56dbb881e169ad0a3acad30b8aa0677c03a5e5
</ins><span class="cx">
</span><span class="cx"> worksrcdir mozilla
</span><span class="cx">
</span><del>-patchfiles patch-browser-app-profile-firefox.js \
- patch-en-US-chrome-branding-brand.dtd \
- patch-xpcom-build-Makefile \
- patch-dylib_file.diff \
- patch-layout-build-Makefile.in \
- patch-build-unix-mozilla-xpcom.pc \
- patch-browser-app-mozilla.in \
- patch-xptcall_x86.diff \
- patch-pthread.diff \
- patch-executable_path.diff
</del><ins>+depends_build \
+ port:findutils \
+ port:pkgconfig
</ins><span class="cx">
</span><del>-depends_build port:pkgconfig
</del><ins>+depends_lib \
+ port:gnome-vfs \
+ port:gnome-icon-theme \
+ port:nss \
+ port:nspr \
+ port:gtk2
</ins><span class="cx">
</span><del>-depends_lib port:libidl \
- port:zip \
- port:gtk2 \
- port:gnome-vfs \
- port:gnome-icon-theme \
- port:nspr
</del><ins>+# port:xulrunner can replace nss nspr and gtk2 once it's used to build \
firefox </ins><span class="cx">
</span><ins>+#-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
</ins><span class="cx">
</span><del>-configure.env MOZCONFIG="${workpath}/.mozconfig"
</del><ins>+configure.args \
+ --disable-static \
+ --enable-shared \
+ --with-distribution-id=org.macports \
+ --enable-default-toolkit=cairo-gtk2 \
+ --x-includes=${prefix}/include \
+ --x-libraries=${prefix}/lib \
+ --with-system-nspr \
+ --with-nspr-prefix=${prefix} \
+ --with-system-nss \
+ --with-nss-prefix=${prefix} \
+ --with-system-bzip2=${prefix} \
+ --with-system-jpeg=${prefix} \
+ --with-system-zlib=${prefix} \
+ --enable-system-cairo \
+ --with-system-cairo=${prefix} \
+ --enable-system-sqlite \
+ --with-default-mozilla-five-home=${prefix}/lib/firefox \
+ --disable-oji \
+ --enable-plugins \
+ --enable-mathml \
+ --enable-extensions="default,spellcheck" \
+ --enable-permissions \
+ --enable-cookie \
+ --enable-image-decoders=all \
+ --enable-image-encoder=all \
+ --enable-canvas \
+ --enable-jsd \
+ --enable-xpctools \
+ --enable-crypto \
+ --enable-pango \
+ --enable-svg \
+ --enable-svg-renderer=cairo \
+ --enable-xinerama \
+ --with-pthreads \
+ --enable-gnomevfs \
+ --enable-postscript \
+ --enable-safe-browsing \
+ --enable-xft \
+ --disable-freetype2 \
+ --disable-crashreporter \
+ --enable-optimize=-O2 \
+ --disable-prebinding \
+ --enable-strip \
+ --disable-debug \
+ --disable-installer \
+ --disable-updater \
+ --disable-pedantic \
+ --disable-tests \
+ --disable-mochitest
</ins><span class="cx">
</span><del>-configure.args --enable-application=browser \
- --disable-official-branding \
- --with-distribution-id=org.macports \
- --disable-static \
- --enable-shared \
- --enable-default-toolkit=gtk2 \
- --enable-xft \
- --disable-freetype2 \
- --enable-xinerama \
- --with-pthreads \
- --enable-gnomevfs \
- --enable-postscript \
- --disable-prebinding \
- --disable-debug \
- --enable-strip \
- --enable-optimize='-O2' \
- --disable-tests \
- --with-default-mozilla-five-home=${prefix}/lib/firefox \
- --with-system-jpeg=${prefix} \
- --with-system-zlib=${prefix} \
- --with-system-png=${prefix} \
- --enable-system-cairo \
- --with-system-cairo=${prefix} \
- --with-system-nspr \
- --with-nspr-prefix=${prefix}
</del><ins>+# --with-libxul-sdk=${prefix}/lib/xulrunner
+# --enable-help-viewer \
+# --disable-official-branding
</ins><span class="cx">
</span><del>-
</del><span class="cx"> variant debug description "build with debugging \
symbols" { </span><span class="cx"> configure.args-delete --disable-debug \
\ </span><ins>+ --disable-mochitest \
</ins><span class="cx"> --enable-optimize='-O2' \
</span><span class="cx"> --enable-strip
</span><span class="cx">
</span><span class="cx"> configure.args-append --enable-debug \
</span><ins>+ --enable-mochitest \
</ins><span class="cx"> --disable-optimize \
</span><span class="cx"> --disable-strip
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+post-extract {
+ # https://bugzilla.mozilla.org/show_bug.cgi?id=484353
+ move ${worksrcpath}/modules/libjar/nsWildCard.cpp \
${worksrcpath}/modules/libjar/nsWildCard_jar.cpp +}
+
+# Upstream bugs (http://bugzilla.mozilla.org)
+# #485827 (xpcom-Makefile)
+# #485856 (configure)
+# #485862 (system-nss)
+# #486036 (make-install)
+# #485863 (icon-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 +
+post-patch {
+ # https://bugzilla.mozilla.org/show_bug.cgi?id=485857
+ reinplace "s:XP_MACOSX:__APPLE__:g" \
${worksrcpath}/xpcom/base/nsStackWalk.cpp +
+ # https://bugzilla.mozilla.org/show_bug.cgi?id=484353
+ reinplace "s:nsWildCard.cpp:nsWildCard_jar.cpp:g" \
${worksrcpath}/modules/libjar/objs.mk +
+ # https://bugzilla.mozilla.org/show_bug.cgi?id=486034
+ # find -xtype -> gfind -xtype
+ reinplace "s:find:gfind:g" \
${worksrcpath}/toolkit/mozapps/installer/packager.mk +
+ # Set the right install_name on the libs
+ reinplace "s:@executable_path:${prefix}/lib/${name}:g" \
${worksrcpath}/config/rules.mk +}
+
+configure.env \
+ MOZCONFIG="${worksrcpath}/browser/config/mozconfig" \
+ MOZILLA_FIVE_HOME="${prefix}/lib/${name}"
+
+build.args-append \
+ includedir="${prefix}/include/${name}" \
+ idldir="${prefix}/share/idl/${name}" \
+ installdir="${prefix}/lib/${name}" \
+ sdkdir="${prefix}/lib/${name}"
+
+destroot.args-append \
+ includedir="${prefix}/include/${name}" \
+ idldir="${prefix}/share/idl/${name}" \
+ installdir="${prefix}/lib/${name}" \
+ sdkdir="${prefix}/lib/${name}"
+
+# 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
+# is somewhere non-standard and should cause AC_X_PATH to let us setup our
+# CPPFLAGS and LDFLAGS without interference
</ins><span class="cx"> pre-configure {
</span><del>- system "touch ${workpath}/.mozconfig"
</del><ins>+ if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } {
+ configure.cppflags-append -I${x11prefix}/include
+ configure.ldflags-append -L${x11prefix}/lib
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> post-destroot {
</span></span></pre></div>
<a id="trunkdportswwwfirefoxx11filesconfigurepatch"></a>
<div class="addfile"><h4>Added: trunk/dports/www/firefox-x11/files/configure.patch (0 \
=> 48951)</h4> <pre class="diff"><span>
<span class="info">--- trunk/dports/www/firefox-x11/files/configure.patch \
(rev 0)
+++ trunk/dports/www/firefox-x11/files/configure.patch 2009-03-31 20:45:44 UTC (rev \
48951) </span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+--- configure.orig 2009-03-19 21:02:35.000000000 -0700
++++ configure 2009-03-19 21:03:53.000000000 -0700
+@@ -5807,11 +5807,10 @@ case "$host" in
+ ;;
+
+ *-darwin*)
+- HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX -DXP_MACOSX -DNO_X11"
+- HOST_NSPR_MDCPUCFG='\"md/_darwin.cfg\"'
++ HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX -DXP_MACOSX"
++ HOST_CXXFLAGS="$HOST_CXXFLAGS -DXP_UNIX -DXP_MACOSX"
+ HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}"
+ MOZ_FIX_LINK_PATHS='-Wl,-executable_path,$(LIBXUL_DIST)/bin'
+- LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) $(LIBXUL_DIST)/bin/XUL -lobjc'
+ ;;
+
+ *-linux*|*-kfreebsd*-gnu)
</ins></span></pre></div>
<a id="trunkdportswwwfirefoxx11filesiconMakefilepatch"></a>
<div class="addfile"><h4>Added: \
trunk/dports/www/firefox-x11/files/icon-Makefile.patch (0 => 48951)</h4> <pre \
class="diff"><span> <span class="info">--- \
trunk/dports/www/firefox-x11/files/icon-Makefile.patch (rev \
0)
+++ trunk/dports/www/firefox-x11/files/icon-Makefile.patch 2009-03-31 20:45:44 UTC \
(rev 48951) </span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+--- modules/libpr0n/decoders/icon/Makefile.in.orig 2009-03-31 \
12:55:07.000000000 -0700 ++++ modules/libpr0n/decoders/icon/Makefile.in 2009-03-31 \
12:55:47.000000000 -0700 +@@ -67,7 +67,7 @@ ifeq ($(OS_ARCH),OS2)
+ PLATFORM = os2
+ endif
+
+-ifeq ($(OS_ARCH),Darwin)
++ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+ PLATFORM = mac
+ endif
+
</ins></span></pre></div>
<a id="trunkdportswwwfirefoxx11filesmakeinstallpatch"></a>
<div class="addfile"><h4>Added: trunk/dports/www/firefox-x11/files/make-install.patch \
(0 => 48951)</h4> <pre class="diff"><span>
<span class="info">--- trunk/dports/www/firefox-x11/files/make-install.patch \
(rev 0)
+++ trunk/dports/www/firefox-x11/files/make-install.patch 2009-03-31 20:45:44 UTC \
(rev 48951) </span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+--- toolkit/mozapps/installer/packager.mk.bak 2009-03-30 \
17:04:13.000000000 -0700 ++++ toolkit/mozapps/installer/packager.mk 2009-03-30 \
17:05:06.000000000 -0700 +@@ -410,7 +410,10 @@ make-package: stage-package
+ # dist/sdk/lib -> prefix/lib/appname-devel-version/lib
+ # prefix/lib/appname-devel-version/* symlinks to the above directories
+ install:: stage-package
+-ifneq (,$(filter WINNT Darwin,$(OS_ARCH)))
++ifneq (,$(filter WINNT,$(OS_ARCH)))
++ $(error "make install" is not supported on this platform. Use "make \
package" instead.) ++endif
++ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+ $(error "make install" is not supported on this platform. Use "make \
package" instead.) + endif
+ $(NSINSTALL) -D $(DESTDIR)$(installdir)
</ins></span></pre></div>
<a id="trunkdportswwwfirefoxx11filespatchbrowserappmozillain"></a>
<div class="delfile"><h4>Deleted: \
trunk/dports/www/firefox-x11/files/patch-browser-app-mozilla.in (48950 => 48951)</h4> \
<pre class="diff"><span> <span class="info">--- \
trunk/dports/www/firefox-x11/files/patch-browser-app-mozilla.in 2009-03-31 19:52:33 \
UTC (rev 48950)
+++ trunk/dports/www/firefox-x11/files/patch-browser-app-mozilla.in 2009-03-31 \
20:45:44 UTC (rev 48951) </span><span class="lines">@@ -1,13 +0,0 @@
</span><del>---- browser/app/mozilla.in~ 2006-02-19 09:13:13.000000000 -0500
-+++ browser/app/mozilla.in 2006-02-19 09:14:35.000000000 -0500
-@@ -99,7 +99,9 @@
- # If not, then start resolving symlinks until we find run-mozilla.sh
- found=0
- progname="$0"
--curdir=`dirname "$progname"`
-+#curdir=`dirname "$progname"`
-+#incorrectly uses ${prefix}/bin, so force use of ${prefix}/lib/firefox
-+curdir="$moz_libdir"
- progbase=`basename "$progname"`
- run_moz="$curdir/run-mozilla.sh"
- if test -x "$run_moz"; then
</del></span></pre></div>
<a id="trunkdportswwwfirefoxx11filespatchbrowserappprofilefirefoxjs"></a>
<div class="delfile"><h4>Deleted: \
trunk/dports/www/firefox-x11/files/patch-browser-app-profile-firefox.js (48950 => \
48951)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/dports/www/firefox-x11/files/patch-browser-app-profile-firefox.js 2009-03-31 \
19:52:33 UTC (rev 48950)
+++ trunk/dports/www/firefox-x11/files/patch-browser-app-profile-firefox.js 2009-03-31 \
20:45:44 UTC (rev 48951) </span><span class="lines">@@ -1,12 +0,0 @@
</span><del>---- browser/app/profile/firefox.js~ 2006-02-20 11:21:57.000000000 -0500
-+++ browser/app/profile/firefox.js 2006-02-20 11:42:58.000000000 -0500
-@@ -48,6 +48,9 @@
- #endif
- #endif
-
-+// MacPorts-specific preferences
-+pref("general.useragent.vendorComment", "MacPorts Firefox Community \
Edition");
-+
- pref("general.startup.browser", true);
-
- pref("browser.chromeURL","chrome://browser/content/");
</del></span></pre></div>
<a id="trunkdportswwwfirefoxx11filespatchbrowsercomponentsbuildMakefilein"></a>
<div class="delfile"><h4>Deleted: \
trunk/dports/www/firefox-x11/files/patch-browser-components-build-Makefile.in (48950 \
=> 48951)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/dports/www/firefox-x11/files/patch-browser-components-build-Makefile.in 2009-03-31 \
19:52:33 UTC (rev 48950)
+++ trunk/dports/www/firefox-x11/files/patch-browser-components-build-Makefile.in 2009-03-31 \
20:45:44 UTC (rev 48951) </span><span class="lines">@@ -1,15 +0,0 @@
</span><del>---- browser/components/build/Makefile.in~ 2006-02-19 09:54:45.000000000 \
-0500
-+++ browser/components/build/Makefile.in 2006-02-19 09:56:27.000000000 -0500
-@@ -74,6 +74,12 @@
- $(MOZ_COMPONENT_LIBS) \
- $(NULL)
-
-+# fix for building on Mac/X11 (bug 257773)
-+# dependencies for gkgfx
-+ifeq ($(MOZ_WIDGET_TOOLKIT), gtk2)
-+EXTRA_DSO_LDOPTS += $(MOZ_GTK2_LIBS)
-+endif
-+
- # Need to link to CoreFoundation for Mac Migrators (PList reading code)
- ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
- EXTRA_DSO_LDOPTS += \
</del></span></pre></div>
<a id="trunkdportswwwfirefoxx11filespatchbuildunixmozillaxpcompc"></a>
<div class="delfile"><h4>Deleted: \
trunk/dports/www/firefox-x11/files/patch-build-unix-mozilla-xpcom.pc (48950 => \
48951)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/dports/www/firefox-x11/files/patch-build-unix-mozilla-xpcom.pc 2009-03-31 \
19:52:33 UTC (rev 48950)
+++ trunk/dports/www/firefox-x11/files/patch-build-unix-mozilla-xpcom.pc 2009-03-31 \
20:45:44 UTC (rev 48951) </span><span class="lines">@@ -1,9 +0,0 @@
</span><del>---- build/unix/mozilla-xpcom.pc.in~ 2005-07-05 19:21:52.000000000 -0400
-+++ build/unix/mozilla-xpcom.pc.in 2007-08-20 23:41:09.000000000 -0400
-@@ -8,5 +8,5 @@
- Description: The Mozilla Cross Platform Component Library
- Version: %MOZILLA_VERSION%
- Requires: %NSPR_NAME% >= %NSPR_VERSION%
--Libs: -L${libdir} -lxpcom
-+Libs: -L${libdir} -lxpcom -lxpcom_core
- Cflags: -I${includedir} -I${includedir}/xpcom -I${includedir}/string
</del></span></pre></div>
<a id="trunkdportswwwfirefoxx11filespatchenUSchromebrandingbranddtd"></a>
<div class="delfile"><h4>Deleted: \
trunk/dports/www/firefox-x11/files/patch-en-US-chrome-branding-brand.dtd (48950 => \
48951)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/dports/www/firefox-x11/files/patch-en-US-chrome-branding-brand.dtd 2009-03-31 \
19:52:33 UTC (rev 48950)
+++ trunk/dports/www/firefox-x11/files/patch-en-US-chrome-branding-brand.dtd 2009-03-31 \
20:45:44 UTC (rev 48951) </span><span class="lines">@@ -1,8 +0,0 @@
</span><del>---- browser/locales/en-US/chrome/branding/brand.dtd.orig 2006-08-25 \
02:02:37.000000000 +0200
-+++ browser/locales/en-US/chrome/branding/brand.dtd 2008-03-27 18:16:48.000000000 \
+0100
-@@ -1,3 +1,3 @@
- <!ENTITY brandShortName "Bon Echo">
--<!ENTITY brandFullName "Bon Echo">
--<!ENTITY vendorShortName "Mozilla">
-+<!ENTITY brandFullName "Web Browser">
-+<!ENTITY vendorShortName "Web Browser">
</del></span></pre></div>
<a id="trunkdportswwwfirefoxx11filespatchexecutable_pathdiff"></a>
<div class="delfile"><h4>Deleted: \
trunk/dports/www/firefox-x11/files/patch-executable_path.diff (48950 => 48951)</h4> \
<pre class="diff"><span> <span class="info">--- \
trunk/dports/www/firefox-x11/files/patch-executable_path.diff 2009-03-31 19:52:33 UTC \
(rev 48950)
+++ trunk/dports/www/firefox-x11/files/patch-executable_path.diff 2009-03-31 20:45:44 \
UTC (rev 48951) </span><span class="lines">@@ -1,110 +0,0 @@
</span><del>---- config/rules.mk.orig 2006-12-22 14:50:41.000000000 +0200
-+++ config/rules.mk 2007-09-22 22:31:47.000000000 +0200
-@@ -424,7 +424,7 @@
- ifdef IS_COMPONENT
- EXTRA_DSO_LDOPTS += -bundle
- else
--EXTRA_DSO_LDOPTS += -dynamiclib -install_name @executable_path/$(SHARED_LIBRARY) \
-compatibility_version 1 -current_version 1
-+EXTRA_DSO_LDOPTS += -dynamiclib -install_name \
$(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)/$(SHARED_LIBRARY) -compatibility_version \
1 -current_version 1
- endif
- endif
- endif
---- config/config.mk.orig 2007-02-16 03:19:06.000000000 +0200
-+++ config/config.mk 2007-09-22 23:44:44.000000000 +0200
-@@ -745,7 +745,7 @@
- # Tell the linker where NSS is, if we're building crypto
- ifeq ($(OS_ARCH),Darwin)
- ifeq (,$(findstring crypto,$(MOZ_META_COMPONENTS)))
--MOZ_COMPONENTLIB_EXTRA_LIBS = $(foreach library, $(patsubst -l%, \
$(LIB_PREFIX)%$(DLL_SUFFIX), $(filter -l%, $(NSS_LIBS))), -dylib_file \
@executable_path/$(library):$(DIST)/bin/$(library))
-+MOZ_COMPONENTLIB_EXTRA_LIBS = $(foreach library, $(patsubst -l%, \
$(LIB_PREFIX)%$(DLL_SUFFIX), $(filter -l%, $(NSS_LIBS))), -dylib_file \
$(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)/$(library):$(DIST)/bin/$(library))
- endif
- endif
- endif
---- directory/c-sdk/configure.in.orig 2007-07-15 16:41:07.000000000 +0200
-+++ directory/c-sdk/configure.in 2007-09-23 10:38:22.000000000 +0200
-@@ -921,7 +921,7 @@ case "$target" in
- CPU_ARCH=ppc
- ;;
- esac
-- DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load \
-install_name @executable_path/$@'
-+ DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load \
-install_name \$(libdir)/\$(MOZ_APP_NAME)-\$(MOZ_APP_VERSION)/$@'
- # Use the standard preprocessor (cpp)
- CFLAGS="$CFLAGS -no-cpp-precomp"
- MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
---- directory/c-sdk/configure.orig 2006-02-23 01:58:13.000000000 +0100
-+++ directory/c-sdk/configure 2007-09-23 10:38:35.000000000 +0200
-@@ -3330,7 +3330,7 @@ EOF
- CPU_ARCH=ppc
- ;;
- esac
-- DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load \
-install_name @executable_path/$@'
-+ DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load \
-install_name \$(libdir)/\$(MOZ_APP_NAME)-\$(MOZ_APP_VERSION)/$@'
- # Use the standard preprocessor (cpp)
- CFLAGS="$CFLAGS -no-cpp-precomp"
- MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
---- nsprpub/configure.in.orig 2007-05-03 03:30:08.000000000 +0200
-+++ nsprpub/configure.in 2007-09-23 10:39:41.000000000 +0200
-@@ -979,7 +979,7 @@ case "$target" in
- ;;
- esac
- DSO_CFLAGS=-fPIC
-- DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load \
-install_name @executable_path/$@ -headerpad_max_install_names'
-+ DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load \
-install_name \$(libdir)/\$(MOZ_APP_NAME)-\$(MOZ_APP_VERSION)/$@ \
-headerpad_max_install_names'
- # Use the standard preprocessor (cpp)
- CFLAGS="$CFLAGS -no-cpp-precomp"
- MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
---- nsprpub/configure.orig 2007-05-03 03:30:08.000000000 +0200
-+++ nsprpub/configure 2007-09-23 10:39:24.000000000 +0200
-@@ -3326,7 +3326,7 @@ EOF
- ;;
- esac
- DSO_CFLAGS=-fPIC
-- DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load \
-install_name @executable_path/$@ -headerpad_max_install_names'
-+ DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load \
-install_name \$(libdir)/\$(MOZ_APP_NAME)-\$(MOZ_APP_VERSION)/$@ \
-headerpad_max_install_names'
- # Use the standard preprocessor (cpp)
- CFLAGS="$CFLAGS -no-cpp-precomp"
- MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
---- security/coreconf/Darwin.mk.orig 2005-01-20 09:12:48.000000000 +0100
-+++ security/coreconf/Darwin.mk 2007-09-23 12:49:02.000000000 +0200
-@@ -111,7 +111,7 @@ endif
-
- DSO_CFLAGS = -fPIC
- # May override this with -bundle to create a loadable module.
--DSO_LDOPTS = -dynamiclib -compatibility_version 1 -current_version 1 -install_name \
@executable_path/$(notdir $@) -headerpad_max_install_names
-+DSO_LDOPTS = -dynamiclib -compatibility_version 1 -current_version 1 -install_name \
\$(libdir)/\$(MOZ_APP_NAME)-\$(MOZ_APP_VERSION)/$(notdir $@) \
-headerpad_max_install_names
-
- MKSHLIB = $(CC) $(DSO_LDOPTS) $(DARWIN_SDK_SHLIBFLAGS)
- DLL_SUFFIX = dylib
---- security/nss/cmd/platlibs.mk.orig 2004-10-16 01:52:29.000000000 +0200
-+++ security/nss/cmd/platlibs.mk 2007-09-23 12:48:37.000000000 +0200
-@@ -226,7 +226,7 @@ endif
- endif
-
- ifeq ($(OS_ARCH), Darwin)
--EXTRA_SHARED_LIBS += -dylib_file \
@executable_path/libsoftokn3.dylib:$(DIST)/lib/libsoftokn3.dylib
-+EXTRA_SHARED_LIBS += -dylib_file \
$(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)/libsoftokn3.dylib:$(DIST)/lib/libsoftokn3.dylib
- endif
-
-
---- security/nss/lib/smime/config.mk.orig 2004-10-16 01:52:34.000000000 +0200
-+++ security/nss/lib/smime/config.mk 2007-09-23 12:48:24.000000000 +0200
-@@ -76,7 +76,7 @@ EXTRA_SHARED_LIBS += \
- $(NULL)
-
- ifeq ($(OS_ARCH), Darwin)
--EXTRA_SHARED_LIBS += -dylib_file \
@executable_path/libsoftokn3.dylib:$(DIST)/lib/libsoftokn3.dylib
-+EXTRA_SHARED_LIBS += -dylib_file \
$(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)/libsoftokn3.dylib:$(DIST)/lib/libsoftokn3.dylib
- endif
-
- endif
---- security/nss/lib/ssl/config.mk.orig 2004-10-16 01:52:35.000000000 +0200
-+++ security/nss/lib/ssl/config.mk 2007-09-23 12:48:15.000000000 +0200
-@@ -109,7 +109,7 @@ EXTRA_SHARED_LIBS += -lbe
- endif
-
- ifeq ($(OS_ARCH), Darwin)
--EXTRA_SHARED_LIBS += -dylib_file \
@executable_path/libsoftokn3.dylib:$(DIST)/lib/libsoftokn3.dylib
-+EXTRA_SHARED_LIBS += -dylib_file \
$(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)/libsoftokn3.dylib:$(DIST)/lib/libsoftokn3.dylib
- endif
-
- ifeq ($(OS_TARGET),SunOS)
</del></span></pre></div>
<a id="trunkdportswwwfirefoxx11filespatchlayoutbuildMakefilein"></a>
<div class="delfile"><h4>Deleted: \
trunk/dports/www/firefox-x11/files/patch-layout-build-Makefile.in (48950 => \
48951)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/dports/www/firefox-x11/files/patch-layout-build-Makefile.in 2009-03-31 19:52:33 \
UTC (rev 48950)
+++ trunk/dports/www/firefox-x11/files/patch-layout-build-Makefile.in 2009-03-31 \
20:45:44 UTC (rev 48951) </span><span class="lines">@@ -1,22 +0,0 @@
</span><del>---- /Users/mta/macports/dports/www/firefox-x11/save/layout_build_Makefile.in 2007-08-23 \
01:08:14.000000000 -0400
-+++ layout/build/Makefile.in 2007-08-23 01:07:49.000000000 -0400
-@@ -224,13 +224,15 @@
- $(NULL)
- endif
-
--ifdef MOZ_ENABLE_GTK2
--EXTRA_DSO_LDOPTS += $(MOZ_GTK2_LIBS) \
-+ifneq (,$(MOZ_ENABLE_CANVAS)$(MOZ_SVG_RENDERER_CAIRO))
-+EXTRA_DSO_LDOPTS += $(MOZ_CAIRO_LIBS) \
- $(NULL)
- endif
-
--ifneq (,$(MOZ_ENABLE_CANVAS)$(MOZ_SVG_RENDERER_CAIRO))
--EXTRA_DSO_LDOPTS += $(MOZ_CAIRO_LIBS) \
-+# MOZ_GTK2_LIBS must come after MOZ_CAIRO_LIBS to avoid multiply defined
-+# symbols between libcairo.dylib and libmozcairo.a
-+ifdef MOZ_ENABLE_GTK2
-+EXTRA_DSO_LDOPTS += $(MOZ_GTK2_LIBS) \
- $(NULL)
- endif
-
</del></span></pre></div>
<a id="trunkdportswwwfirefoxx11filespatchxpcombuildMakefile"></a>
<div class="delfile"><h4>Deleted: \
trunk/dports/www/firefox-x11/files/patch-xpcom-build-Makefile (48950 => 48951)</h4> \
<pre class="diff"><span> <span class="info">--- \
trunk/dports/www/firefox-x11/files/patch-xpcom-build-Makefile 2009-03-31 19:52:33 UTC \
(rev 48950)
+++ trunk/dports/www/firefox-x11/files/patch-xpcom-build-Makefile 2009-03-31 20:45:44 \
UTC (rev 48951) </span><span class="lines">@@ -1,15 +0,0 @@
</span><del>---- save/xpcom_build_Makefile.in 2007-08-22 16:11:33.000000000 -0400
-+++ xpcom/build/Makefile.in 2007-08-22 16:11:56.000000000 -0400
-@@ -139,6 +139,12 @@
- EXTRA_DEPS += $(DIST)/lib/$(LIB_PREFIX)macmorefiles_s.$(LIB_SUFFIX)
- endif
-
-+# nsMacUtilsImpl needs CoreFoundation on Darwin, probably wrong, but
-+# that's the way it is.
-+ifeq ($(OS_TARGET),Darwin)
-+OS_LIBS += -framework CoreServices -framework CoreFoundation
-+endif
-+
- # Force use of PIC
- FORCE_USE_PIC = 1
-
</del></span></pre></div>
<a id="trunkdportswwwfirefoxx11filespatchxptcall_x86diff"></a>
<div class="delfile"><h4>Deleted: \
trunk/dports/www/firefox-x11/files/patch-xptcall_x86.diff (48950 => 48951)</h4> <pre \
class="diff"><span> <span class="info">--- \
trunk/dports/www/firefox-x11/files/patch-xptcall_x86.diff 2009-03-31 19:52:33 UTC \
(rev 48950)
+++ trunk/dports/www/firefox-x11/files/patch-xptcall_x86.diff 2009-03-31 20:45:44 UTC \
(rev 48951) </span><span class="lines">@@ -1,22 +0,0 @@
</span><del>---- xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h.bak 2007-04-09 \
22:01:13.000000000 +0200
-+++ xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h 2007-10-10 \
09:45:43.000000000 +0200
-@@ -173,7 +173,7 @@
- /* Define KEEP_STACK_16_BYTE_ALIGNED if the stack needs to maintain alignment
- * in a CALL for some good reason (like ABI compliance). */
-
--#if defined(XP_MACOSX) || defined(__QNXNTO__)
-+#if defined(__APPLE__) || defined(__QNXNTO__)
- /* http://developer.apple.com/documentation/DeveloperTools/Conceptual/LowLevelABI/Articles/IA32.html \
*/
- #define KEEP_STACK_16_BYTE_ALIGNED
- #endif
---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_unixish_x86.cpp.bak 2005-10-24 \
07:42:28.000000000 +0200
-+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_unixish_x86.cpp 2007-10-10 \
09:45:43.000000000 +0200
-@@ -104,7 +104,7 @@ PrepareAndDispatch(nsXPTCStubBase* self,
-
- #ifdef __GNUC__ /* Gnu Compiler. */
-
--#ifdef XP_MACOSX
-+#ifdef __APPLE__
- /* Make sure the stack is 16-byte aligned. Do that by aligning to 16 bytes and
- * then subtracting 4 so the three subsequent pushes result in a 16-byte aligned
- * stack. */
</del></span></pre></div>
<a id="trunkdportswwwfirefoxx11filessystemnsspatch"></a>
<div class="addfile"><h4>Added: trunk/dports/www/firefox-x11/files/system-nss.patch \
(0 => 48951)</h4> <pre class="diff"><span>
<span class="info">--- trunk/dports/www/firefox-x11/files/system-nss.patch \
(rev 0)
+++ trunk/dports/www/firefox-x11/files/system-nss.patch 2009-03-31 20:45:44 UTC (rev \
48951) </span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+https://bugzilla.mozilla.org/show_bug.cgi?id=485862
+
+--- config/autoconf.mk.in.orig 2009-03-29 22:07:24.000000000 -0700
++++ config/autoconf.mk.in 2009-03-29 22:07:54.000000000 -0700
+@@ -278,7 +278,7 @@ OS_LDFLAGS = @LDFLAGS@
+ OS_COMPILE_CFLAGS = $(OS_CPPFLAGS) @COMPILE_CFLAGS@
+ OS_COMPILE_CXXFLAGS = $(OS_CPPFLAGS) @COMPILE_CXXFLAGS@
+
+-OS_INCLUDES = $(NSPR_CFLAGS) $(JPEG_CFLAGS) $(PNG_CFLAGS) $(ZLIB_CFLAGS) \
$(LCMS_CFLAGS) ++OS_INCLUDES = $(NSPR_CFLAGS) $(NSS_CFLAGS) $(JPEG_CFLAGS) \
$(PNG_CFLAGS) $(ZLIB_CFLAGS) $(LCMS_CFLAGS) + OS_LIBS = @LIBS@
+ ACDEFINES = @MOZ_DEFINES@
+
</ins></span></pre></div>
<a id="trunkdportswwwfirefoxx11filesxpcomMakefilepatch"></a>
<div class="addfile"><h4>Added: \
trunk/dports/www/firefox-x11/files/xpcom-Makefile.patch (0 => 48951)</h4> <pre \
class="diff"><span> <span class="info">--- \
trunk/dports/www/firefox-x11/files/xpcom-Makefile.patch (rev \
0)
+++ trunk/dports/www/firefox-x11/files/xpcom-Makefile.patch 2009-03-31 20:45:44 UTC \
(rev 48951) </span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+--- xpcom/stub/Makefile.in.orig 2009-03-29 20:11:15.000000000 -0700
++++ xpcom/stub/Makefile.in 2009-03-29 20:11:48.000000000 -0700
+@@ -107,7 +107,7 @@ else
+ DEPENDENT_LIBS_LIST += $(LIB_PREFIX)mozjs$(DLL_SUFFIX)
+ endif
+
+-ifeq (Darwin,$(OS_ARCH))
++ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+ EXTRA_DSO_LDOPTS += $(DIST)/bin/XUL
+ DEPENDENT_LIBS_LIST += XUL
+ else
</ins></span></pre>
</div>
</div>
</body>
</html>
_______________________________________________
macports-changes mailing list
macports-changes@lists.macosforge.org
http://lists.macosforge.org/mailman/listinfo.cgi/macports-changes
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic