From f6b8856707050006a953c43db05a1a69f77325fd Mon Sep 17 00:00:00 2001 From: PHO Date: Wed, 4 Feb 2009 14:32:44 +0900 Subject: [PATCH] I've managed to build it! --- distinfo | 11 ++++++++--- patches/patch-ab | 15 ++++++++------- patches/patch-ao | 4 ++-- patches/patch-aq | 4 ++-- 4 files changed, 20 insertions(+), 14 deletions(-) diff --git a/distinfo b/distinfo index cb9f4f1..cffaef8 100644 --- 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) = a5756a6bb2928f2f214e969fe65a77b5b435a26e +SHA1 (patch-ab) = 4449a0c389d6080632866d571df116e510cf40d7 SHA1 (patch-ac) = c814530c1a8574739b7557d007563232b6070c51 SHA1 (patch-ad) = 20f2184a7e5e98b065e884c67e4c17fc52019a79 SHA1 (patch-ae) = fea251aabc772c3d4ad3044c8295af45cc9cab2d @@ -13,9 +13,14 @@ SHA1 (patch-ag) = f23dd38f6cfc4d2287ebeac57307c005521acb39 SHA1 (patch-ah) = dc79aa2d7f5ddc93ecf2a63e2d38e497c5a156cc SHA1 (patch-ai) = 641442d96b0443a24c91192fcf33f301001fb8f3 SHA1 (patch-aj) = 86168a710216d5e2f2ffbd8090c827a61d398c8e -SHA1 (patch-ao) = 3b283b2cbb13464c788d11b3c7297dfb90b2d755 +SHA1 (patch-ak) = f0e2a4d65d4e5cfb50e16307439482bfa7ee9889 +SHA1 (patch-al) = afbb3040899df2783a21ebcfcc0d6476e339bd1e +SHA1 (patch-am) = 4033bd385239a6754d4457e2d4e8bd6ba5524b06 +SHA1 (patch-an) = 0843d6f798f2d8c1a13ec5fb056b8d0b298515c6 +SHA1 (patch-ao) = 6d6fec20fde2fd4570b301349dc9303b66321a9b SHA1 (patch-ap) = 552694ac2d6ca713aec98ec394f1215c048c2392 -SHA1 (patch-aq) = fcd28831cf5fc012afba386ceeee95945bf82606 +SHA1 (patch-aq) = 91a9a3f39286a9fedfd4122084f2fb9f427040fb +SHA1 (patch-ar) = fab004236f5f0224386bb7ca7e64210a1b2b3cc5 SHA1 (patch-ax) = cbfe7a6392d5d2fefff123679ba1c056b1cc0aa9 SHA1 (patch-ba) = 3bd713cf2edcc61f489cea8269ca60e27c26f1d9 SHA1 (patch-bb) = c7286542a9fe97ac9819a00c345272efb7e90e9c diff --git a/patches/patch-ab b/patches/patch-ab index f797ee5..12e2304 100644 --- a/patches/patch-ab +++ b/patches/patch-ab @@ -2,7 +2,7 @@ $NetBSD: patch-ab,v 1.2 2008/09/16 11:24:58 tnn Exp $ --- configure.in.orig 2008-11-22 04:37:59.000000000 +0900 +++ configure.in -@@ -1521,10 +1521,9 @@ case "$host" in +@@ -1521,11 +1521,9 @@ case "$host" in ;; *-darwin*) @@ -11,10 +11,11 @@ $NetBSD: patch-ab,v 1.2 2008/09/16 11:24:58 tnn Exp $ 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' +- LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) $(LIBXUL_DIST)/bin/XUL -lobjc' ;; -@@ -1670,10 +1669,10 @@ case "$target" in + *-linux*|*-kfreebsd*-gnu) +@@ -1670,10 +1668,10 @@ case "$target" in MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@' MOZ_OPTIMIZE_FLAGS="-O2" _PEDANTIC= @@ -28,7 +29,7 @@ $NetBSD: patch-ab,v 1.2 2008/09/16 11:24:58 tnn Exp $ STRIP="$STRIP -x -S" _PLATFORM_DEFAULT_TOOLKIT='cairo-cocoa' MOZ_ENABLE_POSTSCRIPT= -@@ -1700,7 +1699,7 @@ case "$target" in +@@ -1700,7 +1698,7 @@ case "$target" in LDFLAGS=$_SAVE_LDFLAGS ;; @@ -37,7 +38,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 +1713,9 @@ case "$target" in +@@ -1714,6 +1712,9 @@ case "$target" in # MKSHLIB_FORCE_ALL='-Wl,-Bforcearchive' # MKSHLIB_UNFORCE_ALL='' # fi @@ -47,7 +48,7 @@ $NetBSD: patch-ab,v 1.2 2008/09/16 11:24:58 tnn Exp $ ;; *-hpux*) -@@ -2230,8 +2232,15 @@ case "$target" in +@@ -2230,8 +2231,15 @@ case "$target" in if test "$LIBRUNPATH"; then DSO_LDOPTS="-R$LIBRUNPATH $DSO_LDOPTS" fi @@ -63,7 +64,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) -@@ -6142,7 +6151,7 @@ dnl ==================================== +@@ -6142,7 +6150,7 @@ dnl ==================================== dnl = Enable code optimization. ON by default. dnl ======================================================== if test -z "$MOZ_OPTIMIZE_FLAGS"; then diff --git a/patches/patch-ao b/patches/patch-ao index c977836..daef77b 100644 --- a/patches/patch-ao +++ b/patches/patch-ao @@ -1,13 +1,13 @@ $NetBSD$ ---- security/coreconf/Darwin.mk.orig 2009-02-03 23:53:52.000000000 +0900 +--- security/coreconf/Darwin.mk.orig 2007-12-22 03:57:57.000000000 +0900 +++ security/coreconf/Darwin.mk @@ -115,7 +115,7 @@ ARCH = darwin 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)/$(MOZILLA_PKG_NAME)/$(notdir $@) ++DSO_LDOPTS = -dynamiclib -compatibility_version 1 -current_version 1 -install_name $(PREFIX)/lib/$(MOZILLA_PKG_NAME)/$(notdir $@) MKSHLIB = $(CC) $(DSO_LDOPTS) $(DARWIN_SDK_SHLIBFLAGS) DLL_SUFFIX = dylib diff --git a/patches/patch-aq b/patches/patch-aq index 2bed46b..9dab145 100644 --- a/patches/patch-aq +++ b/patches/patch-aq @@ -1,13 +1,13 @@ $NetBSD$ ---- security/nss/lib/freebl/config.mk.orig 2009-02-03 23:57:34.000000000 +0900 +--- security/nss/lib/freebl/config.mk.orig 2008-10-04 04:40:50.000000000 +0900 +++ security/nss/lib/freebl/config.mk @@ -111,7 +111,7 @@ EXTRA_SHARED_LIBS += \ endif ifeq ($(OS_ARCH), Darwin) -EXTRA_SHARED_LIBS += -dylib_file @executable_path/libplc4.dylib:$(DIST)/lib/libplc4.dylib -dylib_file @executable_path/libplds4.dylib:$(DIST)/lib/libplds4.dylib -+EXTRA_SHARED_LIBS += -dylib_file $(libdir)/$(MOZILLA_PKG_NAME)/libplc4.dylib:$(DIST)/lib/libplc4.dylib -dylib_file $(libdir)/$(MOZILLA_PKG_NAME)/libplds4.dylib:$(DIST)/lib/libplds4.dylib ++EXTRA_SHARED_LIBS += -dylib_file $(PREFIX)/lib/$(MOZILLA_PKG_NAME)/libplc4.dylib:$(DIST)/lib/libplc4.dylib -dylib_file $(PREFIX)/lib/$(MOZILLA_PKG_NAME)/libplds4.dylib:$(DIST)/lib/libplds4.dylib endif endif -- 2.40.0