X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=patches%2Fpatch-ab;fp=patches%2Fpatch-ab;h=f797ee58278cc74a3deb231e4be633002b1dc6c7;hb=79dc9e440d417a506ad51d0e90f5c2c0865cf22a;hp=6ba008017b44371a2dbc2586dad368931b77b1e6;hpb=a2aa021df7b1ddc7d24a574ab84cb6c8c7908168;p=pkgsrc-firefox3.git

diff --git a/patches/patch-ab b/patches/patch-ab
index 6ba0080..f797ee5 100644
--- a/patches/patch-ab
+++ b/patches/patch-ab
@@ -1,8 +1,34 @@
 $NetBSD: patch-ab,v 1.2 2008/09/16 11:24:58 tnn Exp $
 
---- configure.in.orig	2008-06-25 00:51:17.000000000 +0200
+--- configure.in.orig	2008-11-22 04:37:59.000000000 +0900
 +++ configure.in
-@@ -1682,7 +1682,7 @@ case "$target" in
+@@ -1521,10 +1521,9 @@ case "$host" in
+     ;;
+ 
+ *-darwin*)
+-    HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX -DXP_MACOSX -DNO_X11"
++    HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX"
+     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'
+     ;;
+ 
+@@ -1670,10 +1669,10 @@ case "$target" in
+     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 -fno-common"
++    CXXFLAGS="$CXXFLAGS -fno-common"
+     DLL_SUFFIX=".dylib"
+-    DSO_LDOPTS=''
++    DSO_LDOPTS='-framework CoreFoundation'
+     STRIP="$STRIP -x -S"
+     _PLATFORM_DEFAULT_TOOLKIT='cairo-cocoa'
+     MOZ_ENABLE_POSTSCRIPT=
+@@ -1700,7 +1699,7 @@ case "$target" in
      LDFLAGS=$_SAVE_LDFLAGS
      ;;
  
@@ -11,7 +37,7 @@ $NetBSD: patch-ab,v 1.2 2008/09/16 11:24:58 tnn Exp $
      if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` != "elf"; then
  	DLL_SUFFIX=".so.1.0"
  	DSO_LDOPTS="-shared"
-@@ -1696,6 +1696,9 @@ case "$target" in
+@@ -1714,6 +1713,9 @@ case "$target" in
  #	MKSHLIB_FORCE_ALL='-Wl,-Bforcearchive'
  #	MKSHLIB_UNFORCE_ALL=''
  #    fi
@@ -21,7 +47,7 @@ $NetBSD: patch-ab,v 1.2 2008/09/16 11:24:58 tnn Exp $
      ;; 
  
  *-hpux*)
-@@ -2212,8 +2215,15 @@ case "$target" in
+@@ -2230,8 +2232,15 @@ case "$target" in
      if test "$LIBRUNPATH"; then
  	DSO_LDOPTS="-R$LIBRUNPATH $DSO_LDOPTS"
      fi
@@ -37,7 +63,7 @@ $NetBSD: patch-ab,v 1.2 2008/09/16 11:24:58 tnn Exp $
  *-openvms*) 
      AC_DEFINE(NO_PW_GECOS)
      AC_DEFINE(NO_UDSOCK)
-@@ -6116,7 +6126,7 @@ dnl ====================================
+@@ -6142,7 +6151,7 @@ dnl ====================================
  dnl = Enable code optimization. ON by default.
  dnl ========================================================
  if test -z "$MOZ_OPTIMIZE_FLAGS"; then