[49485] trunk/dports/www/firefox-x11-devel
jeremyhu at macports.org
jeremyhu at macports.org
Fri Apr 10 17:06:04 PDT 2009
Revision: 49485
http://trac.macports.org/changeset/49485
Author: jeremyhu at macports.org
Date: 2009-04-10 17:06:04 -0700 (Fri, 10 Apr 2009)
Log Message:
-----------
firefox-x11-devel: Updating patches to match versions submitted to mozilla bugzilla. This doesn't change anything in the build, so not revbumping
Modified Paths:
--------------
trunk/dports/www/firefox-x11-devel/Portfile
trunk/dports/www/firefox-x11-devel/files/configure.patch
trunk/dports/www/firefox-x11-devel/files/sydneyaudio.patch
Modified: trunk/dports/www/firefox-x11-devel/Portfile
===================================================================
--- trunk/dports/www/firefox-x11-devel/Portfile 2009-04-10 23:53:05 UTC (rev 49484)
+++ trunk/dports/www/firefox-x11-devel/Portfile 2009-04-11 00:06:04 UTC (rev 49485)
@@ -36,7 +36,8 @@
depends_build \
port:findutils \
- port:pkgconfig
+ port:pkgconfig \
+ port:autoconf213
depends_lib \
port:heimdal \
@@ -49,10 +50,8 @@
# port:nspr
# 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
+use_autoconf yes
+autoconf.cmd autoconf213
configure.args \
--with-xulrunner-stub-name=xulrunner-stub \
Modified: trunk/dports/www/firefox-x11-devel/files/configure.patch
===================================================================
--- trunk/dports/www/firefox-x11-devel/files/configure.patch 2009-04-10 23:53:05 UTC (rev 49484)
+++ trunk/dports/www/firefox-x11-devel/files/configure.patch 2009-04-11 00:06:04 UTC (rev 49485)
@@ -1,16 +1,118 @@
---- 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
+diff --git a/configure.in b/configure.in
+--- configure.in
++++ configure.in
+@@ -1558,21 +1558,21 @@ case "$host" in
+ if test "`${PYTHON} -c 'import sys; print sys.platform;'`" != "cygwin"; then
+ PYTHON="${CYGWIN_WRAPPER} $PYTHON"
+ fi
+ ;;
+ esac
;;
*-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_NSPR_MDCPUCFG='\"md/_darwin.cfg\"'
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)
+ HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX"
+ HOST_NSPR_MDCPUCFG='\"md/_linux.cfg\"'
+ HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}"
+ ;;
+
+@@ -1704,25 +1704,24 @@ case "$target" in
+ esac
+ ;;
+
+ *-darwin*)
+ MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
+ MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
+ MOZ_OPTIMIZE_FLAGS="-O2"
+ _PEDANTIC=
+- CFLAGS="$CFLAGS -fpascal-strings -fno-common"
+- CXXFLAGS="$CXXFLAGS -fpascal-strings -fno-common"
++ CFLAGS="$CFLAGS -fpascal-strings -fno-common -I${MACOS_SDK_DIR}/Developer/Headers/FlatCarbon"
++ CXXFLAGS="$CXXFLAGS -fpascal-strings -fno-common -I${MACOS_SDK_DIR}/Developer/Headers/FlatCarbon"
+ DLL_SUFFIX=".dylib"
+ DSO_LDOPTS=''
+ STRIP="$STRIP -x -S"
+ _PLATFORM_DEFAULT_TOOLKIT='cairo-cocoa'
+ MOZ_ENABLE_POSTSCRIPT=
+ TARGET_NSPR_MDCPUCFG='\"md/_darwin.cfg\"'
+- LDFLAGS="$LDFLAGS -framework Cocoa"
+ # The ExceptionHandling framework is needed for Objective-C exception
+ # logging code in nsObjCExceptions.h. Currently we only use that in debug
+ # builds.
+ MOZ_DEBUG_LDFLAGS="$MOZ_DEBUG_LDFLAGS -framework ExceptionHandling"
+ # set MACOSX to generate lib/mac/MoreFiles/Makefile
+ MACOSX=1
+
+ dnl DTrace and -dead_strip don't interact well. See bug 403132.
+@@ -4754,28 +4753,30 @@ cairo-os2)
+ TK_LIBS='$(MOZ_CAIRO_LIBS)'
+ ;;
+
+ cairo-mac|cairo-cocoa)
+ if test "$MOZ_WIDGET_TOOLKIT" = "cairo-cocoa"; then
+ MOZ_WIDGET_TOOLKIT=cocoa
+ AC_DEFINE(MOZ_WIDGET_COCOA)
+ MOZ_ENABLE_COCOA=1
++ LDFLAGS="$LDFLAGS -framework Cocoa"
+ else
+ MOZ_WIDGET_TOOLKIT=mac
+ fi
+ MOZ_GFX_TOOLKIT=cairo
+ MOZ_USER_DIR="Mozilla"
+ AC_DEFINE(XP_MACOSX)
+ AC_DEFINE(TARGET_CARBON)
+ AC_DEFINE(TARGET_API_MAC_CARBON)
+ TK_LIBS='-framework Carbon -framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework AddressBook'
+- TK_CFLAGS="-I${MACOS_SDK_DIR}/Developer/Headers/FlatCarbon"
++ TK_CFLAGS="-DNO_X11"
+ CFLAGS="$CFLAGS $TK_CFLAGS"
+ CXXFLAGS="$CXXFLAGS $TK_CFLAGS"
++ LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) $(LIBXUL_DIST)/bin/XUL -lobjc'
+ ;;
+ esac
+
+ if test "$MOZ_ENABLE_XREMOTE"; then
+ AC_DEFINE(MOZ_ENABLE_XREMOTE)
+ fi
+
+ if test "$COMPILE_ENVIRONMENT"; then
+@@ -4790,16 +4791,30 @@ if test "$COMPILE_ENVIRONMENT"; then
+ PKG_CHECK_MODULES(MOZ_GTK2, gtk+-2.0 >= $GTK2_VERSION gtk+-unix-print-2.0 glib-2.0 gobject-2.0 $GDK_PACKAGES)
+ fi
+
+ fi # COMPILE_ENVIRONMENT
+
+ AC_SUBST(MOZ_DEFAULT_TOOLKIT)
+
+ dnl ========================================================
++dnl = Filesystem layout choice. Mainly useful for determining
++dnl = if we're building on darwin "unix like" or "OSX like"
++dnl ========================================================
++
++MOZILLA_FS_LAYOUT="unix"
++case "$MOZ_WIDGET_TOOLKIT" in
++cairo-mac|cairo-cocoa)
++ MOZILLA_FS_LAYOUT="bundle"
++ ;;
++esac
++
++AC_SUBST(MOZILLA_FS_LAYOUT)
++
++dnl ========================================================
+ dnl = startup-notification support module
+ dnl ========================================================
+
+ if test "$MOZ_ENABLE_GTK2"
+ then
+ MOZ_ENABLE_STARTUP_NOTIFICATION=
+
+ MOZ_ARG_ENABLE_BOOL(startup-notification,
Modified: trunk/dports/www/firefox-x11-devel/files/sydneyaudio.patch
===================================================================
--- trunk/dports/www/firefox-x11-devel/files/sydneyaudio.patch 2009-04-10 23:53:05 UTC (rev 49484)
+++ trunk/dports/www/firefox-x11-devel/files/sydneyaudio.patch 2009-04-11 00:06:04 UTC (rev 49485)
@@ -1,6 +1,6 @@
--- 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,9 @@ EXTRA_DSO_LDOPTS += \
+@@ -205,7 +205,10 @@ EXTRA_DSO_LDOPTS += \
-lcrypto \
$(TK_LIBS) \
$(NULL)
@@ -9,4 +9,5 @@
+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/20090410/39473e3b/attachment-0001.html>
More information about the macports-changes
mailing list