More patches

diff --git a/distinfo b/distinfo
index cffaef8c51a2b534f344b8931e896ed76a79a3ef..cc1d9df3bc928f9a614490702108b59c8b8da40f 100644 (file)
--- a/distinfo
+++ b/distinfo
@@ -4,7 +4,7 @@ SHA1 (firefox-3.0.5-source.tar.bz2) = f934e073efaad3d4dde847c8491fa9529564d5d2
 RMD160 (firefox-3.0.5-source.tar.bz2) = ec6e7eab65649c5c79587a5a8ffb9b6b386b5a18
 Size (firefox-3.0.5-source.tar.bz2) = 36948252 bytes
 SHA1 (patch-aa) = f995b5e53fa11ecb659ab2dd10551db1c71cc5f3
-SHA1 (patch-ab) = 4449a0c389d6080632866d571df116e510cf40d7
+SHA1 (patch-ab) = 0bb71c0bb4c05e823366f943a05cbc96ac7a69b6
 SHA1 (patch-ac) = c814530c1a8574739b7557d007563232b6070c51
 SHA1 (patch-ad) = 20f2184a7e5e98b065e884c67e4c17fc52019a79
 SHA1 (patch-ae) = fea251aabc772c3d4ad3044c8295af45cc9cab2d

diff --git a/patches/patch-ab b/patches/patch-ab
index 12e23040813a1a8652badfe556fe7edb2b2c6e17..1881b53a76df04ccd7795fbbfce794672f503893 100644 (file)
--- a/patches/patch-ab
+++ b/patches/patch-ab
@@ -15,7 +15,7 @@ $NetBSD: patch-ab,v 1.2 2008/09/16 11:24:58 tnn Exp $
      ;;
  
  *-linux*|*-kfreebsd*-gnu)
-@@ -1670,10 +1668,10 @@ case "$target" in
+@@ -1670,13 +1668,12 @@ case "$target" in
      MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
      MOZ_OPTIMIZE_FLAGS="-O2"
      _PEDANTIC=
@@ -28,8 +28,11 @@ $NetBSD: patch-ab,v 1.2 2008/09/16 11:24:58 tnn Exp $
 +    DSO_LDOPTS='-framework CoreFoundation'
      STRIP="$STRIP -x -S"
      _PLATFORM_DEFAULT_TOOLKIT='cairo-cocoa'
-     MOZ_ENABLE_POSTSCRIPT=
-@@ -1700,7 +1698,7 @@ case "$target" in
+-    MOZ_ENABLE_POSTSCRIPT=
+     TARGET_NSPR_MDCPUCFG='\"md/_darwin.cfg\"'
+     LDFLAGS="$LDFLAGS -framework Cocoa"
+     # The ExceptionHandling framework is needed for Objective-C exception
+@@ -1700,7 +1697,7 @@ case "$target" in
      LDFLAGS=$_SAVE_LDFLAGS
      ;;
  
@@ -38,7 +41,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"
-@@ -1714,6 +1712,9 @@ case "$target" in
+@@ -1714,6 +1711,9 @@ case "$target" in
  #     MKSHLIB_FORCE_ALL='-Wl,-Bforcearchive'
  #     MKSHLIB_UNFORCE_ALL=''
  #    fi
@@ -48,7 +51,7 @@ $NetBSD: patch-ab,v 1.2 2008/09/16 11:24:58 tnn Exp $
      ;; 
  
  *-hpux*)
-@@ -2230,8 +2231,15 @@ case "$target" in
+@@ -2230,7 +2230,14 @@ case "$target" in
      if test "$LIBRUNPATH"; then
        DSO_LDOPTS="-R$LIBRUNPATH $DSO_LDOPTS"
      fi
@@ -56,15 +59,24 @@ $NetBSD: patch-ab,v 1.2 2008/09/16 11:24:58 tnn Exp $
 +    alpha*)
 +       CFLAGS="$CFLAGS -mieee"
 +       CXXFLAGS="$CXXFLAGS -mieee"
-+    ;;
-+    esac
      ;;
- 
++    esac
++    ;;
 +
+ 
  *-openvms*) 
      AC_DEFINE(NO_PW_GECOS)
-     AC_DEFINE(NO_UDSOCK)
-@@ -6142,7 +6150,7 @@ dnl ====================================
+@@ -4361,9 +4368,6 @@ XPC_IDISPATCH_SUPPORT=
+ 
+ 
+ case "$target_os" in
+-darwin*)
+-    ACCESSIBILITY=
+-    ;;
+ *)
+     ACCESSIBILITY=1
+     ;;
+@@ -6142,7 +6146,7 @@ dnl ====================================
  dnl = Enable code optimization. ON by default.
  dnl ========================================================
  if test -z "$MOZ_OPTIMIZE_FLAGS"; then

diff --git a/patches/patch-aj b/patches/patch-aj
new file mode 100644 (file)
index 0000000..7a1cd6c
--- /dev/null
+++ b/patches/patch-aj
@@ -0,0 +1,31 @@
+$NetBSD$
+
+--- gfx/thebes/src/gfxASurface.cpp.orig        2009-02-04 01:54:07.000000000 +0900
++++ gfx/thebes/src/gfxASurface.cpp
+@@ -50,11 +50,6 @@
+ #include "gfxXlibSurface.h"
+ #endif
+ 
+-#ifdef CAIRO_HAS_QUARTZ_SURFACE
+-#include "gfxQuartzSurface.h"
+-#include "gfxQuartzImageSurface.h"
+-#endif
+-
+ #include <stdio.h>
+ #include <limits.h>
+ 
+@@ -155,14 +150,6 @@ gfxASurface::Wrap (cairo_surface_t *csur
+         result = new gfxXlibSurface(csurf);
+     }
+ #endif
+-#ifdef CAIRO_HAS_QUARTZ_SURFACE
+-    else if (stype == CAIRO_SURFACE_TYPE_QUARTZ) {
+-        result = new gfxQuartzSurface(csurf);
+-    }
+-    else if (stype == CAIRO_SURFACE_TYPE_QUARTZ_IMAGE) {
+-        result = new gfxQuartzImageSurface(csurf);
+-    }
+-#endif
+     else {
+         result = new gfxUnknownSurface(csurf);
+     }

diff --git a/patches/patch-ak b/patches/patch-ak
new file mode 100644 (file)
index 0000000..6fa547e
--- /dev/null
+++ b/patches/patch-ak
@@ -0,0 +1,27 @@
+$NetBSD$
+
+--- xpcom/stub/Makefile.in.orig        2009-02-04 09:50:48.000000000 +0900
++++ xpcom/stub/Makefile.in
+@@ -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
+@@ -129,6 +129,13 @@ endif
+ 
+ EXTRA_DSO_LDOPTS += $(EXTRA_DSO_LIBS) $(NSPR_LIBS)
+ 
++ifeq (Darwin,$(OS_ARCH))
++_libs_to_fix = \
++      -lmozjs \
++      $(filter -l%, $(NSS_LIBS))
++EXTRA_DSO_LDOPTS += $(foreach library, $(patsubst -l%, $(LIB_PREFIX)%$(DLL_SUFFIX), $(_libs_to_fix)), -dylib_file $(libdir)/$(MOZILLA_PKG_NAME)/$(library):$(DIST)/bin/$(library))
++endif
++
+ include $(topsrcdir)/config/rules.mk
+ 
+ libs:: $(FINAL_TARGET)/dependentlibs.list

diff --git a/patches/patch-al b/patches/patch-al
new file mode 100644 (file)
index 0000000..319681a
--- /dev/null
+++ b/patches/patch-al
@@ -0,0 +1,24 @@
+$NetBSD$
+
+--- modules/libpr0n/decoders/icon/Makefile.in.orig     2009-02-04 12:46:11.000000000 +0900
++++ modules/libpr0n/decoders/icon/Makefile.in
+@@ -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
+ 
+@@ -127,4 +127,10 @@ include $(topsrcdir)/config/rules.mk
+ 
+ ifeq ($(OS_ARCH),Darwin)
+ EXTRA_DSO_LDOPTS += $(TK_LIBS)
++
++_libs_to_fix = \
++      -lxul \
++      -lmozjs \
++      $(filter -l%, $(NSS_LIBS))
++EXTRA_DSO_LDOPTS += $(foreach library, $(patsubst -l%, $(LIB_PREFIX)%$(DLL_SUFFIX), $(_libs_to_fix)), -dylib_file $(libdir)/$(MOZILLA_PKG_NAME)/$(library):$(DIST)/bin/$(library))
+ endif

diff --git a/patches/patch-am b/patches/patch-am
new file mode 100644 (file)
index 0000000..e0eac3b
--- /dev/null
+++ b/patches/patch-am
@@ -0,0 +1,18 @@
+$NetBSD$
+
+--- browser/components/dirprovider/Makefile.in.orig    2009-02-04 13:46:56.000000000 +0900
++++ browser/components/dirprovider/Makefile.in
+@@ -71,4 +71,13 @@ EXTRA_DSO_LDOPTS = \
+       $(NSPR_LIBS) \
+       $(NULL)
+ 
++ifeq ($(OS_ARCH),Darwin)
++_libs_to_fix = \
++      -lxul \
++      -lmozjs \
++      $(filter -l%, $(NSS_LIBS))
++EXTRA_DSO_LDOPTS += $(foreach library, $(patsubst -l%, $(LIB_PREFIX)%$(DLL_SUFFIX), $(_libs_to_fix)), -dylib_file $(libdir)/$(MOZILLA_PKG_NAME)/$(library):$(DIST)/bin/$(library))
++endif
++
++
+ include $(topsrcdir)/config/rules.mk

diff --git a/patches/patch-an b/patches/patch-an
new file mode 100644 (file)
index 0000000..bf346a3
--- /dev/null
+++ b/patches/patch-an
@@ -0,0 +1,17 @@
+$NetBSD$
+
+--- browser/components/build/Makefile.in.orig  2009-02-04 13:56:55.000000000 +0900
++++ browser/components/build/Makefile.in
+@@ -81,4 +81,12 @@ EXTRA_DSO_LDOPTS += \
+   $(NULL)
+ endif
+ 
++ifeq ($(OS_ARCH),Darwin)
++_libs_to_fix = \
++      -lxul \
++      -lmozjs \
++      $(filter -l%, $(NSS_LIBS))
++EXTRA_DSO_LDOPTS += $(foreach library, $(patsubst -l%, $(LIB_PREFIX)%$(DLL_SUFFIX), $(_libs_to_fix)), -dylib_file $(libdir)/$(MOZILLA_PKG_NAME)/$(library):$(DIST)/bin/$(library))
++endif
++
+ include $(topsrcdir)/config/rules.mk

diff --git a/patches/patch-ar b/patches/patch-ar
new file mode 100644 (file)
index 0000000..c2c3fee
--- /dev/null
+++ b/patches/patch-ar
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- browser/installer/Makefile.in.orig 2009-02-04 14:22:26.000000000 +0900
++++ browser/installer/Makefile.in
+@@ -62,7 +62,7 @@ ifneq (,$(BUILD_STATIC_LIBS)$(MOZ_ENABLE
+ ifeq (WINNT,$(OS_ARCH))
+ MOZ_PKG_MANIFEST_P = $(srcdir)/windows/packages-static
+ else
+-ifneq (,$(filter-out OS2 Darwin,$(OS_ARCH)))
++ifneq (,$(filter-out OS2,$(OS_ARCH)))
+ MOZ_PKG_MANIFEST_P = $(srcdir)/unix/packages-static
+ endif
+ endif