--- a/firefox-multilocale-chrome.patch Mon Nov 10 16:41:30 2014 +0100
+++ b/firefox-multilocale-chrome.patch Tue Nov 11 21:40:37 2014 +0100
@@ -1,5 +1,5 @@
# HG changeset patch
-# Parent 839ad2a7997b5b64edf2454b42c733a0fc729270
+# Parent e6f3afc034d1bef0f7661469d8ca3ef7744c907e
# User Wolfgang Rosenauer <wr@rosenauer.org>
Add searchplugins to chrome packaging for proper localization
@@ -42,7 +42,7 @@
-SEARCHPLUGINS_NAMES = $(shell cat $(call MERGE_FILE,/searchplugins/list.txt))
+SEARCHPLUGINS_NAMES = $(shell cat \
+ $(firstword $(wildcard $(LOCALE_SRCDIR)/searchplugins/list.txt) \
-+ @srcdir@/en-US/searchplugins/list.txt ) ) ddg
++ @srcdir@/en-US/searchplugins/list.txt ) )
endif
SEARCHPLUGINS_PATH := $(FINAL_TARGET)/searchplugins
SEARCHPLUGINS := $(addsuffix .xml,$(SEARCHPLUGINS_NAMES))
--- a/mozilla-shared-nss-db.patch Mon Nov 10 16:41:30 2014 +0100
+++ b/mozilla-shared-nss-db.patch Tue Nov 11 21:40:37 2014 +0100
@@ -7,7 +7,7 @@
diff --git a/configure.in b/configure.in
--- a/configure.in
+++ b/configure.in
-@@ -8192,16 +8192,31 @@ if test "$MOZ_ENABLE_SKIA"; then
+@@ -8199,16 +8199,31 @@ if test "$MOZ_ENABLE_SKIA"; then
MOZ_ENABLE_SKIA_GPU=1
AC_DEFINE(USE_SKIA_GPU)
AC_SUBST(MOZ_ENABLE_SKIA_GPU)
@@ -51,8 +51,8 @@
'../../../pkix/include',
]
-+LOCAL_INCLUDES += CONFIG['NSSHELPER_CFLAGS']
-+EXTRA_DSO_LDOPTS += CONFIG['NSSHELPER_LIBS']
++CXXFLAGS += sorted(CONFIG['NSSHELPER_CFLAGS'])
++OS_LIBS += sorted(CONFIG['NSSHELPER_LIBS'])
+
if CONFIG['NSS_DISABLE_DBM']:
DEFINES['NSS_DISABLE_DBM'] = '1'
@@ -89,7 +89,7 @@
#include "nsCertVerificationThread.h"
#include "nsAppDirectoryServiceDefs.h"
#include "nsComponentManagerUtils.h"
-@@ -944,17 +951,31 @@ nsNSSComponent::InitializeNSS()
+@@ -943,17 +950,31 @@ nsNSSComponent::InitializeNSS()
if (NS_FAILED(rv)) {
nsPSMInitPanic::SetPanic();
return NS_ERROR_NOT_AVAILABLE;
@@ -134,7 +134,7 @@
'winspool.drv'
]
-+EXTRA_DSO_LDOPTS += CONFIG['NSSHELPER_LIBS']
++OS_LIBS += sorted(CONFIG['NSSHELPER_LIBS'])
+
if CONFIG['MOZ_METRO']:
DELAYLOAD_DLLS += [