From 9cc91bff05caa8ce86307a527a2083263de9156b Mon Sep 17 00:00:00 2001 From: PHO Date: Thu, 5 Feb 2009 12:16:10 +0900 Subject: [PATCH] --enable-debug didn't work... --- Makefile | 3 --- distinfo | 8 +++++--- patches/patch-al | 6 ++++-- patches/patch-am | 6 ++++-- patches/patch-at | 4 +++- patches/patch-aw | 21 +++++++++++++++++++++ patches/patch-az | 21 +++++++++++++++++++++ 7 files changed, 58 insertions(+), 11 deletions(-) create mode 100644 patches/patch-aw create mode 100644 patches/patch-az diff --git a/Makefile b/Makefile index 6fce328..806e58c 100644 --- a/Makefile +++ b/Makefile @@ -127,9 +127,6 @@ CONFIGURE_ARGS+= --disable-dbus # Avoids needing curl on Linux CONFIGURE_ARGS+= --disable-crashreporter -# FIXME: remove this after -CONFIGURE_ARGS+= --enable-debug - PYTHON_FOR_BUILD_ONLY= yes .include "../../lang/python/application.mk" CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q} diff --git a/distinfo b/distinfo index b6985a0..3e582a7 100644 --- a/distinfo +++ b/distinfo @@ -14,16 +14,18 @@ SHA1 (patch-ah) = dc79aa2d7f5ddc93ecf2a63e2d38e497c5a156cc SHA1 (patch-ai) = 641442d96b0443a24c91192fcf33f301001fb8f3 SHA1 (patch-aj) = 86168a710216d5e2f2ffbd8090c827a61d398c8e SHA1 (patch-ak) = f0e2a4d65d4e5cfb50e16307439482bfa7ee9889 -SHA1 (patch-al) = afbb3040899df2783a21ebcfcc0d6476e339bd1e -SHA1 (patch-am) = 4033bd385239a6754d4457e2d4e8bd6ba5524b06 +SHA1 (patch-al) = 7ccc31a8da9dc55453e40038c05f5099d6e557a7 +SHA1 (patch-am) = 74a2d1825ebf1b652d1ff3bb9b0127405f48aac0 SHA1 (patch-an) = 0843d6f798f2d8c1a13ec5fb056b8d0b298515c6 SHA1 (patch-ao) = 6d6fec20fde2fd4570b301349dc9303b66321a9b SHA1 (patch-ap) = 552694ac2d6ca713aec98ec394f1215c048c2392 SHA1 (patch-aq) = 91a9a3f39286a9fedfd4122084f2fb9f427040fb SHA1 (patch-ar) = fab004236f5f0224386bb7ca7e64210a1b2b3cc5 SHA1 (patch-as) = c0c53394379166419c2aaed8410715c6c98f8a14 -SHA1 (patch-at) = 486a94ff0fd7041621ec6306b9d5c66cf721ac3c +SHA1 (patch-at) = 9d1509631be58baab71d5c55f56e386168e0bb88 +SHA1 (patch-aw) = 70b92b30ae4aa4a6fdf8fd032eff5f4939959304 SHA1 (patch-ax) = cbfe7a6392d5d2fefff123679ba1c056b1cc0aa9 +SHA1 (patch-az) = 35623569c1755e1fe6aacb61d11b9567f3d193ed SHA1 (patch-ba) = 3bd713cf2edcc61f489cea8269ca60e27c26f1d9 SHA1 (patch-bb) = c7286542a9fe97ac9819a00c345272efb7e90e9c SHA1 (patch-bm) = a0a69ca516e8a569d5e61293d5610b236192bf85 diff --git a/patches/patch-al b/patches/patch-al index 319681a..24e50db 100644 --- a/patches/patch-al +++ b/patches/patch-al @@ -1,6 +1,6 @@ $NetBSD$ ---- modules/libpr0n/decoders/icon/Makefile.in.orig 2009-02-04 12:46:11.000000000 +0900 +--- modules/libpr0n/decoders/icon/Makefile.in.orig 2008-03-01 08:24:54.000000000 +0900 +++ modules/libpr0n/decoders/icon/Makefile.in @@ -67,7 +67,7 @@ ifeq ($(OS_ARCH),OS2) PLATFORM = os2 @@ -11,12 +11,14 @@ $NetBSD$ PLATFORM = mac endif -@@ -127,4 +127,10 @@ include $(topsrcdir)/config/rules.mk +@@ -127,4 +127,12 @@ include $(topsrcdir)/config/rules.mk ifeq ($(OS_ARCH),Darwin) EXTRA_DSO_LDOPTS += $(TK_LIBS) + +_libs_to_fix = \ ++ -lxpcom \ ++ -lxpcom_core \ + -lxul \ + -lmozjs \ + $(filter -l%, $(NSS_LIBS)) diff --git a/patches/patch-am b/patches/patch-am index e0eac3b..60ceaef 100644 --- a/patches/patch-am +++ b/patches/patch-am @@ -1,13 +1,15 @@ $NetBSD$ ---- browser/components/dirprovider/Makefile.in.orig 2009-02-04 13:46:56.000000000 +0900 +--- browser/components/dirprovider/Makefile.in.orig 2008-03-14 03:34:13.000000000 +0900 +++ browser/components/dirprovider/Makefile.in -@@ -71,4 +71,13 @@ EXTRA_DSO_LDOPTS = \ +@@ -71,4 +71,15 @@ EXTRA_DSO_LDOPTS = \ $(NSPR_LIBS) \ $(NULL) +ifeq ($(OS_ARCH),Darwin) +_libs_to_fix = \ ++ -lxpcom \ ++ -lxpcom_core \ + -lxul \ + -lmozjs \ + $(filter -l%, $(NSS_LIBS)) diff --git a/patches/patch-at b/patches/patch-at index 1570a19..c2d9c96 100644 --- a/patches/patch-at +++ b/patches/patch-at @@ -2,7 +2,7 @@ $NetBSD$ --- gfx/src/thebes/Makefile.in.orig 2009-02-05 07:58:57.000000000 +0900 +++ gfx/src/thebes/Makefile.in -@@ -139,6 +139,14 @@ EXTRA_DSO_LDOPTS += \ +@@ -139,6 +139,16 @@ EXTRA_DSO_LDOPTS += \ $(TK_LIBS) \ $(NULL) @@ -10,6 +10,8 @@ $NetBSD$ +_libs_to_fix = \ + -lxul \ + -lmozjs \ ++ -lmozz \ ++ -lmozlcms \ + $(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-aw b/patches/patch-aw new file mode 100644 index 0000000..e84077f --- /dev/null +++ b/patches/patch-aw @@ -0,0 +1,21 @@ +$NetBSD$ + +--- layout/build/Makefile.in.orig 2009-02-05 09:03:59.000000000 +0900 ++++ layout/build/Makefile.in +@@ -237,6 +237,16 @@ ifneq (,$(filter gtk2,$(MOZ_WIDGET_TOOLK + EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) + endif + ++ifeq ($(OS_ARCH),Darwin) ++_libs_to_fix = \ ++ -lxul \ ++ -lmozjs \ ++ -lmozz \ ++ -lmozlcms \ ++ $(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 + + LOCAL_INCLUDES += -I$(srcdir)/../base \ diff --git a/patches/patch-az b/patches/patch-az new file mode 100644 index 0000000..04a861a --- /dev/null +++ b/patches/patch-az @@ -0,0 +1,21 @@ +$NetBSD$ + +--- accessible/build/Makefile.in.orig 2009-02-05 09:21:33.000000000 +0900 ++++ accessible/build/Makefile.in +@@ -93,6 +93,16 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) + EXTRA_DSO_LDOPTS += $(MOZ_GTK2_LIBS) + endif + ++ifeq ($(OS_ARCH),Darwin) ++_libs_to_fix = \ ++ -lxul \ ++ -lmozjs \ ++ -lmozz \ ++ -lmozlcms \ ++ $(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 ++ + ifeq ($(OS_ARCH),WINNT) + OS_LIBS += \ + oleaut32.lib \ -- 2.40.0