openbsd-ports/www/fennec/patches/patch-toolkit_library_libxul-config_mk

$OpenBSD: patch-toolkit_library_libxul-config_mk,v 1.6 2012/01/11 02:17:13 nigel Exp $
Ensure systemwide nss is taken
Ensure local libjs is taken (build failure when spidermonkey is installed,
its libjs_static.a is found first in lib search path)
https://bugzilla.mozilla.org/show_bug.cgi?id=646375
--- toolkit/library/libxul-config.mk.orig	Fri Dec 16 21:59:27 2011
+++ toolkit/library/libxul-config.mk	Thu Dec 22 00:39:30 2011
@@ -321,14 +321,15 @@ EXTRA_DSO_LDOPTS += \
 	$(JPEG_LIBS) \
 	$(PNG_LIBS) \
 	$(QCMS_LIBS) \
-	$(MOZ_JS_LIBS) \
-	$(NSS_LIBS) \
+	../../dist/lib/libjs_static.a \
 	$(MOZ_CAIRO_LIBS) \
 	$(MOZ_HARFBUZZ_LIBS) \
 	$(MOZ_OTS_LIBS) \
 	$(MOZ_APP_EXTRA_LIBS) \
 	$(SQLITE_LIBS) \
 	$(NULL)
+
+OS_LIBS	+= $(NSS_LIBS)
 
 ifdef MOZ_NATIVE_ZLIB
 EXTRA_DSO_LDOPTS += $(ZLIB_LIBS)
Update fennec to 9.0 Change for macppc from mpi@ Ok landry@ stsp@ mpi@ 2012-01-10 21:17:13 -05:00			$OpenBSD: patch-toolkit_library_libxul-config_mk,v 1.6 2012/01/11 02:17:13 nigel Exp $
Import fennec 4.0: Firefox for mobile (codenamed Fennec) is the name of the build of the Mozilla Firefox web browser for devices such as mobile phones and personal digital assistants (PDAs). While it initially targets android and maemo, it also works on desktop machines, and can be useful on small screens or low-powered devices. Looks ok to jasper@ 2011-04-12 15:48:57 -04:00			`Ensure systemwide nss is taken`
			`Ensure local libjs is taken (build failure when spidermonkey is installed,`
			`its libjs_static.a is found first in lib search path)`
			`https://bugzilla.mozilla.org/show_bug.cgi?id=646375`
Update fennec to 9.0 Change for macppc from mpi@ Ok landry@ stsp@ mpi@ 2012-01-10 21:17:13 -05:00			`--- toolkit/library/libxul-config.mk.orig Fri Dec 16 21:59:27 2011`
			`+++ toolkit/library/libxul-config.mk Thu Dec 22 00:39:30 2011`
			`@@ -321,14 +321,15 @@ EXTRA_DSO_LDOPTS += \`
Import fennec 4.0: Firefox for mobile (codenamed Fennec) is the name of the build of the Mozilla Firefox web browser for devices such as mobile phones and personal digital assistants (PDAs). While it initially targets android and maemo, it also works on desktop machines, and can be useful on small screens or low-powered devices. Looks ok to jasper@ 2011-04-12 15:48:57 -04:00			`$(JPEG_LIBS) \`
			`$(PNG_LIBS) \`
			`$(QCMS_LIBS) \`
			`- $(MOZ_JS_LIBS) \`
			`- $(NSS_LIBS) \`
			`+ ../../dist/lib/libjs_static.a \`
			`$(MOZ_CAIRO_LIBS) \`
			`$(MOZ_HARFBUZZ_LIBS) \`
			`$(MOZ_OTS_LIBS) \`
			`$(MOZ_APP_EXTRA_LIBS) \`
Update fennec v7.0.1 to v8.0 - continued 2011-12-07 20:35:08 -05:00			`$(SQLITE_LIBS) \`
Import fennec 4.0: Firefox for mobile (codenamed Fennec) is the name of the build of the Mozilla Firefox web browser for devices such as mobile phones and personal digital assistants (PDAs). While it initially targets android and maemo, it also works on desktop machines, and can be useful on small screens or low-powered devices. Looks ok to jasper@ 2011-04-12 15:48:57 -04:00			`$(NULL)`
			`+`
			`+OS_LIBS += $(NSS_LIBS)`

			`ifdef MOZ_NATIVE_ZLIB`
			`EXTRA_DSO_LDOPTS += $(ZLIB_LIBS)`