# HG changeset patch # User Wolfgang Rosenauer # Date 1437383483 -7200 # Node ID 0dd25a92df97aeb369cdb1939b7ce5cd1fb8cfab # Parent 284da266ec465181f3aed60dc57674ffdd2ef3a6 working FF 40 build diff -r 284da266ec46 -r 0dd25a92df97 MozillaFirefox/MozillaFirefox.changes --- a/MozillaFirefox/MozillaFirefox.changes Sat Jul 18 15:01:59 2015 +0200 +++ b/MozillaFirefox/MozillaFirefox.changes Mon Jul 20 11:11:23 2015 +0200 @@ -2,9 +2,12 @@ Sat Jul 18 12:47:47 UTC 2015 - wr@rosenauer.org - update to Firefox 40.0b5 -- remove obsolete patch +- added mozilla-no-stdcxx-check.patch +- removed obsolete patches * mozilla-add-glibcxx_use_cxx11_abi.patch + * firefox-multilocale-chrome.patch - rebased patches +- requires version 40 of the branding package ------------------------------------------------------------------- Wed Jul 1 06:43:02 UTC 2015 - wr@rosenauer.org diff -r 284da266ec46 -r 0dd25a92df97 MozillaFirefox/MozillaFirefox.spec --- a/MozillaFirefox/MozillaFirefox.spec Sat Jul 18 15:01:59 2015 +0200 +++ b/MozillaFirefox/MozillaFirefox.spec Mon Jul 20 11:11:23 2015 +0200 @@ -146,18 +146,17 @@ Patch12: mozilla-openaes-decl.patch Patch14: mozilla-skia-be-le.patch Patch15: mozilla-bmo1005535.patch -Patch16: mozilla-add-glibcxx_use_cxx11_abi.patch -Patch17: mozilla-arm64-libjpeg-turbo.patch +Patch16: mozilla-arm64-libjpeg-turbo.patch +Patch17: mozilla-no-stdcxx-check.patch # Firefox/browser Patch101: firefox-kde.patch Patch102: firefox-no-default-ualocale.patch -Patch103: firefox-multilocale-chrome.patch -Patch104: firefox-branded-icons.patch +Patch103: firefox-branded-icons.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires(post): coreutils shared-mime-info desktop-file-utils Requires(postun): shared-mime-info desktop-file-utils %if %branding -Requires: %{name}-branding > 20.0 +Requires: %{name}-branding > 39.0 %endif Requires: mozilla-nspr >= %(rpm -q --queryformat '%{VERSION}' mozilla-nspr) Requires: mozilla-nss >= %(rpm -q --queryformat '%{VERSION}' mozilla-nss) @@ -267,7 +266,6 @@ %patch101 -p1 %patch102 -p1 %patch103 -p1 -%patch104 -p1 %build # no need to add build time to binaries diff -r 284da266ec46 -r 0dd25a92df97 MozillaFirefox/firefox-multilocale-chrome.patch --- a/MozillaFirefox/firefox-multilocale-chrome.patch Sat Jul 18 15:01:59 2015 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -../firefox-multilocale-chrome.patch \ No newline at end of file diff -r 284da266ec46 -r 0dd25a92df97 MozillaFirefox/mozilla-no-stdcxx-check.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/MozillaFirefox/mozilla-no-stdcxx-check.patch Mon Jul 20 11:11:23 2015 +0200 @@ -0,0 +1,1 @@ +../mozilla-no-stdcxx-check.patch \ No newline at end of file diff -r 284da266ec46 -r 0dd25a92df97 firefox-branded-icons.patch --- a/firefox-branded-icons.patch Sat Jul 18 15:01:59 2015 +0200 +++ b/firefox-branded-icons.patch Mon Jul 20 11:11:23 2015 +0200 @@ -1,6 +1,6 @@ # HG changeset patch # Parent e0751ad74e835e80041a61ea00c2a63bf6fbe2de -# Parent d938107fbc91e13c9cc60be7de200fe891826ca1 +# Parent dbca8a673de340999f67eb321169b44cc4109faf diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in --- a/browser/app/Makefile.in @@ -41,9 +41,9 @@ 'default16.png', + 'default22.png', + 'default24.png', ++ 'default256.png', 'default32.png', 'default48.png', -+ 'default256.png', 'mozicon128.png', ] diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in diff -r 284da266ec46 -r 0dd25a92df97 firefox-kde.patch --- a/firefox-kde.patch Sat Jul 18 15:01:59 2015 +0200 +++ b/firefox-kde.patch Mon Jul 20 11:11:23 2015 +0200 @@ -1,5 +1,5 @@ # HG changeset patch -# Parent 32cde807c82c4420d152346fd441826a1658f27c +# Parent c6048238765dab77cd0c9a45e7afb1157316938b diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul new file mode 100644 diff -r 284da266ec46 -r 0dd25a92df97 firefox-multilocale-chrome.patch --- a/firefox-multilocale-chrome.patch Sat Jul 18 15:01:59 2015 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,123 +0,0 @@ -# HG changeset patch -# Parent 16846914f968944f991c8b12fdc38ce8fc099d73 -# User Wolfgang Rosenauer -# Parent adcf975f1f5a796da0b1926a67beba003fd08b6b -Add searchplugins to chrome packaging for proper localization - -diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js ---- a/browser/app/profile/firefox.js -+++ b/browser/app/profile/firefox.js -@@ -389,16 +389,20 @@ pref("browser.search.searchEnginesURL", - - // Tell the search service to load search plugins from the locale JAR - pref("browser.search.loadFromJars", true); - pref("browser.search.jarURIs", "chrome://browser/locale/searchplugins/"); - - // pointer to the default engine name - pref("browser.search.defaultenginename", "chrome://browser-region/locale/region.properties"); - -+// Tell the search service to load search plugins from the locale JAR -+pref("browser.search.loadFromJars", true); -+pref("browser.search.jarURIs", "chrome://browser/locale/searchplugins/"); -+ - // Ordering of Search Engines in the Engine list. - pref("browser.search.order.1", "chrome://browser-region/locale/region.properties"); - pref("browser.search.order.2", "chrome://browser-region/locale/region.properties"); - pref("browser.search.order.3", "chrome://browser-region/locale/region.properties"); - - // Market-specific search defaults (US market only) - pref("browser.search.geoSpecificDefaults", true); - pref("browser.search.defaultenginename.US", "data:text/plain,browser.search.defaultenginename.US=Yahoo"); -diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in ---- a/browser/locales/Makefile.in -+++ b/browser/locales/Makefile.in -@@ -63,24 +63,27 @@ UNINSTALLER_PACKAGE_HOOK = $(RM) -r $(ST - - STUB_HOOK = $(NSINSTALL) -D '$(_ABS_DIST)/$(PKG_INST_PATH)'; \ - $(RM) '$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_STUB_BASENAME).exe'; \ - cp ../installer/windows/l10ngen/stub.exe '$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_STUB_BASENAME).exe'; \ - chmod 0755 '$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_STUB_BASENAME).exe'; \ - $(NULL) - endif - --SEARCHPLUGINS_NAMES = $(shell cat $(call MERGE_FILE,/searchplugins/list.txt)) ddg -+SEARCHPLUGINS_NAMES = $(shell cat \ -+ $(firstword $(wildcard $(LOCALE_SRCDIR)/searchplugins/list.txt) \ -+ @srcdir@/en-US/searchplugins/list.txt ) ) ddg - SEARCHPLUGINS_PATH := .deps/generated_$(AB_CD) - SEARCHPLUGINS_TARGET := libs searchplugins --SEARCHPLUGINS := $(foreach plugin,$(addsuffix .xml,$(SEARCHPLUGINS_NAMES)),$(or $(wildcard $(call EN_US_OR_L10N_FILE,searchplugins/$(plugin))),$(info Missing searchplugin: $(plugin)))) -+#SEARCHPLUGINS := $(foreach plugin,$(addsuffix .xml,$(SEARCHPLUGINS_NAMES)),$(or $(wildcard $(call EN_US_OR_L10N_FILE,searchplugins/$(plugin))),$(info Missing searchplugin: $(plugin)))) -+SEARCHPLUGINS := $(addsuffix .xml,$(SEARCHPLUGINS_NAMES)) - # Some locale-specific search plugins may have preprocessor directives, but the - # default en-US ones do not. - SEARCHPLUGINS_FLAGS := --silence-missing-directive-warnings --PP_TARGETS += SEARCHPLUGINS -+#PP_TARGETS += SEARCHPLUGINS - - list-txt = $(SEARCHPLUGINS_PATH)/list.txt - GARBAGE += $(list-txt) - - libs:: searchplugins - - # Required for l10n.mk - defines a list of app sub dirs that should - # be included in langpack xpis. -@@ -119,16 +122,39 @@ NO_JA_JP_MAC_AB_CD := $(if $(filter ja-J - libs:: $(FINAL_TARGET)/defaults/profile/bookmarks.html ; - - libs:: $(addprefix generic/profile/,$(PROFILE_FILES)) - $(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/defaults/profile - - libs:: $(call MERGE_FILES,$(addprefix profile/chrome/,$(PROFILE_CHROME))) - $(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/defaults/profile/chrome - -+tmp-search.jar.mn:: -+ printf "$(AB_CD).jar:" > $@ -+ printf "$(foreach plugin,$(SEARCHPLUGINS), \n locale/browser/searchplugins/$(plugin) ($(plugin)))" >> $@ -+ @echo >> $@ -+ -+searchplugins-jar:: $(SEARCHPLUGINS) -+ for SEARCHPLUGIN in $^; do \ -+ $(call py_action,preprocessor,$(DEFINES) $(ACDEFINES) \ -+ $$SEARCHPLUGIN > $$SEARCHPLUGIN-new) ; \ -+ mv $$SEARCHPLUGIN-new $$SEARCHPLUGIN ; \ -+ done -+ -+searchplugins-jar:: tmp-search.jar.mn -+ $(call py_action,jar_maker,\ -+ $(QUIET) -j $(FINAL_TARGET)/chrome \ -+ -s $(topsrcdir)/$(relativesrcdir)/en-US/searchplugins \ -+ -s $(LOCALE_SRCDIR)/searchplugins \ -+ $(MAKE_JARS_FLAGS) tmp-search.jar.mn) -+ -+libs:: searchplugins-jar -+ -+GARBAGE += tmp-search.jar.mn -+ - libs-%: - $(NSINSTALL) -D $(DIST)/install - @$(MAKE) -C ../../toolkit/locales libs-$* - @$(MAKE) -C ../../services/sync/locales AB_CD=$* XPI_NAME=locale-$* - ifdef MOZ_WEBAPP_RUNTIME - @$(MAKE) -C ../../webapprt/locales AB_CD=$* XPI_NAME=locale-$* - endif - @$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* -diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn ---- a/browser/locales/jar.mn -+++ b/browser/locales/jar.mn -@@ -152,14 +152,15 @@ - locale/browser/searchplugins/list.txt (.deps/generated_@AB_CD@/list.txt) - locale/browser/searchplugins/ (.deps/generated_@AB_CD@/*.xml) - % locale browser-region @AB_CD@ %locale/browser-region/ - locale/browser-region/region.properties (%chrome/browser-region/region.properties) - # the following files are browser-specific overrides - locale/browser/netError.dtd (%chrome/overrides/netError.dtd) - locale/browser/appstrings.properties (%chrome/overrides/appstrings.properties) - locale/browser/downloads/settingsChange.dtd (%chrome/overrides/settingsChange.dtd) -+ locale/browser/searchplugins/list.txt (%searchplugins/list.txt) - % override chrome://global/locale/netError.dtd chrome://browser/locale/netError.dtd - % override chrome://global/locale/appstrings.properties chrome://browser/locale/appstrings.properties - % override chrome://mozapps/locale/downloads/settingsChange.dtd chrome://browser/locale/downloads/settingsChange.dtd - % locale pdf.js @AB_CD@ %locale/pdfviewer/ - locale/pdfviewer/viewer.properties (%pdfviewer/viewer.properties) - locale/pdfviewer/chrome.properties (%pdfviewer/chrome.properties) diff -r 284da266ec46 -r 0dd25a92df97 firefox-no-default-ualocale.patch --- a/firefox-no-default-ualocale.patch Sat Jul 18 15:01:59 2015 +0200 +++ b/firefox-no-default-ualocale.patch Mon Jul 20 11:11:23 2015 +0200 @@ -1,7 +1,7 @@ # HG changeset patch # User Wolfgang Rosenauer # Parent 099312626f5f7c9cb5573a61d0230574ee12a660 -# Parent 970a562bc8bcf10cdcb0ae5b6f0f8b360bb2f241 +# Parent ab1135c098843a4a4c5153bd361b964986fccefa Do not overwrite the locale dynamic pref from xulrunner's all.js with a wrong default value diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js diff -r 284da266ec46 -r 0dd25a92df97 mozilla-arm-disable-edsp.patch --- a/mozilla-arm-disable-edsp.patch Sat Jul 18 15:01:59 2015 +0200 +++ b/mozilla-arm-disable-edsp.patch Mon Jul 20 11:11:23 2015 +0200 @@ -1,6 +1,7 @@ # HG changeset patch # User Adrian Schröter # Parent b945e0c3b145b6b2245f42bab52f911c2d1f6759 +# Parent 4ecf304db9dc3ea6259b6f16ed5af1022ff1034c disable ESDP support (no BNC or BMO reference yet :-() diff --git a/mozglue/build/arm.h b/mozglue/build/arm.h diff -r 284da266ec46 -r 0dd25a92df97 mozilla-arm64-libjpeg-turbo.patch --- a/mozilla-arm64-libjpeg-turbo.patch Sat Jul 18 15:01:59 2015 +0200 +++ b/mozilla-arm64-libjpeg-turbo.patch Mon Jul 20 11:11:23 2015 +0200 @@ -1,8 +1,15 @@ -Index: mozilla/configure.in -=================================================================== ---- mozilla.orig/configure.in -+++ mozilla/configure.in -@@ -6241,7 +6241,7 @@ fi +# HG changeset patch +# Parent af95b352f0be4eb2e337867450f25f4c2456a47f + +diff --git a/configure.in b/configure.in +--- a/configure.in ++++ b/configure.in +@@ -6202,27 +6202,29 @@ if test -n "$LIBJPEG_TURBO_X86_ASM" -o - + if test "$_YASM_MAJOR_VERSION" -lt "1" -o \( "$_YASM_MAJOR_VERSION" -eq "1" -a "$_YASM_MINOR_VERSION" -lt "1" \) ; then + AC_MSG_ERROR([Yasm 1.1 or greater is required to build with libjpeg-turbo's optimized JPEG decoding routines, but you appear to have version $_YASM_MAJOR_VERSION.$_YASM_MINOR_VERSION. Upgrade to the newest version or configure with --disable-libjpeg-turbo to use the pure C JPEG decoder. See https://developer.mozilla.org/en/YASM for more details.]) + fi + fi + fi dnl If we're on an ARM system which supports libjpeg-turbo's asm routines and dnl --disable-libjpeg-turbo wasn't passed, use the C compiler as the assembler. @@ -11,7 +18,10 @@ echo "Using $AS as the assembler for ARM code." LIBJPEG_TURBO_AS=$AS fi -@@ -6252,6 +6252,8 @@ elif test -n "$LIBJPEG_TURBO_X64_ASM"; t + + if test -n "$LIBJPEG_TURBO_X86_ASM"; then + AC_DEFINE(LIBJPEG_TURBO_X86_ASM) + elif test -n "$LIBJPEG_TURBO_X64_ASM"; then AC_DEFINE(LIBJPEG_TURBO_X64_ASM) elif test -n "$LIBJPEG_TURBO_ARM_ASM"; then AC_DEFINE(LIBJPEG_TURBO_ARM_ASM) @@ -20,3 +30,8 @@ elif test -n "$MOZ_LIBJPEG_TURBO"; then dnl Warn if we're not building the optimized routines, even though the user dnl didn't specify --disable-libjpeg-turbo. + AC_MSG_WARN([No assembler or assembly support for libjpeg-turbo. Using unoptimized C routines.]) + fi + + dnl ======================================================== + dnl = Enable compilation of specific extension modules diff -r 284da266ec46 -r 0dd25a92df97 mozilla-bmo1005535.patch --- a/mozilla-bmo1005535.patch Sat Jul 18 15:01:59 2015 +0200 +++ b/mozilla-bmo1005535.patch Mon Jul 20 11:11:23 2015 +0200 @@ -1,13 +1,13 @@ # HG changeset patch # Parent b7eb1ce0237d6125b75bc8ff1cb3afc328d6e78c # User Steve Singer -# Parent d7af74fb513bcca581012f17ea248b1692db5d97 +# Parent 4e6bb9847daccf128ad3eab9be087ef63f9b974c Bug 1005535 - Get skia GPU building on big endian. diff --git a/configure.in b/configure.in --- a/configure.in +++ b/configure.in -@@ -8198,21 +8198,21 @@ dnl Skia +@@ -8208,21 +8208,21 @@ dnl Skia dnl ======================================================== if test "$MOZ_ENABLE_SKIA"; then AC_DEFINE(MOZ_ENABLE_SKIA) diff -r 284da266ec46 -r 0dd25a92df97 mozilla-icu-strncat.patch --- a/mozilla-icu-strncat.patch Sat Jul 18 15:01:59 2015 +0200 +++ b/mozilla-icu-strncat.patch Mon Jul 20 11:11:23 2015 +0200 @@ -1,6 +1,7 @@ # HG changeset patch # Parent 29be2a4daa0f512d22bde85b97b5460839026571 # User Wolfgang Rosenauer +# Parent a7d16f0faf5d4881dbea524340f881d5850710e4 From: Jan Engelhardt Reference: http://bugs.icu-project.org/trac/ticket/7808 diff -r 284da266ec46 -r 0dd25a92df97 mozilla-idldir.patch --- a/mozilla-idldir.patch Sat Jul 18 15:01:59 2015 +0200 +++ b/mozilla-idldir.patch Mon Jul 20 11:11:23 2015 +0200 @@ -1,6 +1,7 @@ # HG changeset patch # Parent 1cd1e78dfe63c1a7bcfc0707697bb99bcfea19c4 # User Wolfgang Rosenauer +# Parent 015730e17931512895a5ad4d5130eff4258cf03e Install IDL files to includedir instead of /usr/share/idl diff --git a/config/baseconfig.mk b/config/baseconfig.mk diff -r 284da266ec46 -r 0dd25a92df97 mozilla-kde.patch --- a/mozilla-kde.patch Sat Jul 18 15:01:59 2015 +0200 +++ b/mozilla-kde.patch Mon Jul 20 11:11:23 2015 +0200 @@ -1,5 +1,5 @@ # HG changeset patch -# Parent 372d46509a8899feb3473becff869159d01f1f4c +# Parent 5f8cbb078ab0d5696255c2f514c6333666b47da9 Description: Add KDE integration to Firefox (toolkit parts) Author: Wolfgang Rosenauer Author: Lubos Lunak @@ -2136,7 +2136,7 @@ diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp --- a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp +++ b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp -@@ -14,16 +14,18 @@ +@@ -14,16 +14,17 @@ #include "prenv.h" #include "nsPrintfCString.h" #include "nsNetUtil.h" @@ -2145,7 +2145,6 @@ #include "nsInterfaceHashtable.h" #include "mozilla/Attributes.h" #include "nsIURI.h" -+#include "nsVoidArray.h" +#include "nsKDEUtils.h" class nsUnixSystemProxySettings final : public nsISystemProxySettings { @@ -2155,7 +2154,7 @@ nsUnixSystemProxySettings() : mSchemeProxySettings(4) -@@ -38,16 +40,17 @@ private: +@@ -38,16 +39,17 @@ private: nsCOMPtr mGSettings; nsCOMPtr mProxySettings; nsInterfaceHashtable mSchemeProxySettings; @@ -2173,7 +2172,7 @@ nsUnixSystemProxySettings::GetMainThreadOnly(bool *aMainThreadOnly) { // dbus prevents us from being threadsafe, but this routine should not block anyhow -@@ -504,16 +507,19 @@ nsUnixSystemProxySettings::GetProxyFromG +@@ -504,16 +506,19 @@ nsUnixSystemProxySettings::GetProxyFromG nsresult nsUnixSystemProxySettings::GetProxyForURI(const nsACString & aSpec, @@ -2193,7 +2192,7 @@ if (mGConf) return GetProxyFromGConf(aScheme, aHost, aPort, aResult); -@@ -539,8 +545,34 @@ static const mozilla::Module::ContractID +@@ -539,8 +544,34 @@ static const mozilla::Module::ContractID static const mozilla::Module kUnixProxyModule = { mozilla::Module::kVersion, @@ -2693,7 +2692,7 @@ new file mode 100644 --- /dev/null +++ b/uriloader/exthandler/unix/nsCommonRegistry.cpp -@@ -0,0 +1,54 @@ +@@ -0,0 +1,53 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -2704,7 +2703,6 @@ +#include "nsGNOMERegistry.h" +#include "nsKDERegistry.h" +#include "nsString.h" -+#include "nsVoidArray.h" +#include "nsKDEUtils.h" + +/* static */ bool diff -r 284da266ec46 -r 0dd25a92df97 mozilla-language.patch --- a/mozilla-language.patch Sat Jul 18 15:01:59 2015 +0200 +++ b/mozilla-language.patch Mon Jul 20 11:11:23 2015 +0200 @@ -1,6 +1,7 @@ # HG changeset patch # User Wolfgang Rosenauer # Parent 5a29924228527f8882c83cf62d470963ea1ce62e +# Parent 228ea0669fa8cc78532b71d7bdc4bad5477f246e Bug 583793 - Firefox interface language set to LANG, ignores LANGUAGE diff --git a/intl/locale/nsLocaleService.cpp b/intl/locale/nsLocaleService.cpp @@ -24,7 +25,7 @@ for( i = 0; i < LocaleListLength; i++ ) { nsresult result; -@@ -150,16 +151,21 @@ nsLocaleService::nsLocaleService(void) +@@ -158,16 +159,21 @@ nsLocaleService::nsLocaleService(void) } else { CopyASCIItoUTF16(lang, platformLocale); result = nsPosixLocale::GetXPLocale(lang, xpLocale); diff -r 284da266ec46 -r 0dd25a92df97 mozilla-no-stdcxx-check.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mozilla-no-stdcxx-check.patch Mon Jul 20 11:11:23 2015 +0200 @@ -0,0 +1,43 @@ +# HG changeset patch +# User Wolfgang Rosenauer +# Parent 7b3798afc391847b7eec89b3714b54f1bbbaa0a1 + +diff --git a/config/config.mk b/config/config.mk +--- a/config/config.mk ++++ b/config/config.mk +@@ -623,34 +623,33 @@ EXPAND_LD = $(EXPAND_LIBS_EXEC) --uselis + EXPAND_MKSHLIB_ARGS = --uselist + ifdef SYMBOL_ORDER + EXPAND_MKSHLIB_ARGS += --symbol-order $(SYMBOL_ORDER) + endif + EXPAND_MKSHLIB = $(EXPAND_LIBS_EXEC) $(EXPAND_MKSHLIB_ARGS) -- $(MKSHLIB) + + ifneq (,$(MOZ_LIBSTDCXX_TARGET_VERSION)$(MOZ_LIBSTDCXX_HOST_VERSION)) + ifneq ($(OS_ARCH),Darwin) +-CHECK_STDCXX = @$(TOOLCHAIN_PREFIX)objdump -p $(1) | grep -e 'GLIBCXX_3\.4\.\(9\|[1-9][0-9]\)' > /dev/null && echo 'TEST-UNEXPECTED-FAIL | check_stdcxx | We do not want these libstdc++ symbols to be used:' && $(TOOLCHAIN_PREFIX)objdump -T $(1) | grep -e 'GLIBCXX_3\.4\.\(9\|[1-9][0-9]\)' && exit 1 || true ++#CHECK_STDCXX = @$(TOOLCHAIN_PREFIX)objdump -p $(1) | grep -e 'GLIBCXX_3\.4\.\(9\|[1-9][0-9]\)' > /dev/null && echo 'TEST-UNEXPECTED-FAIL | check_stdcxx | We do not want these libstdc++ symbols to be used:' && $(TOOLCHAIN_PREFIX)objdump -T $(1) | grep -e 'GLIBCXX_3\.4\.\(9\|[1-9][0-9]\)' && exit 1 || true + endif + endif + + ifeq (,$(filter $(OS_TARGET),WINNT Darwin)) + CHECK_TEXTREL = @$(TOOLCHAIN_PREFIX)readelf -d $(1) | grep TEXTREL > /dev/null && echo 'TEST-UNEXPECTED-FAIL | check_textrel | We do not want text relocations in libraries and programs' || true + endif + + ifeq ($(MOZ_WIDGET_TOOLKIT),android) + # While this is very unlikely (libc being added by the compiler at the end + # of the linker command line), if libmozglue.so ends up after libc.so, all + # hell breaks loose, so better safe than sorry, and check it's actually the + # case. + CHECK_MOZGLUE_ORDER = @$(TOOLCHAIN_PREFIX)readelf -d $(1) | grep NEEDED | awk '{ libs[$$NF] = ++n } END { if (libs["[libmozglue.so]"] && libs["[libc.so]"] < libs["[libmozglue.so]"]) { print "libmozglue.so must be linked before libc.so"; exit 1 } }' + endif + + define CHECK_BINARY +-$(call CHECK_STDCXX,$(1)) + $(call CHECK_TEXTREL,$(1)) + $(call LOCAL_CHECKS,$(1)) + $(call CHECK_MOZGLUE_ORDER,$(1)) + endef + + # autoconf.mk sets OBJ_SUFFIX to an error to avoid use before including + # this file + OBJ_SUFFIX := $(_OBJ_SUFFIX) diff -r 284da266ec46 -r 0dd25a92df97 mozilla-ntlm-full-path.patch --- a/mozilla-ntlm-full-path.patch Sat Jul 18 15:01:59 2015 +0200 +++ b/mozilla-ntlm-full-path.patch Mon Jul 20 11:11:23 2015 +0200 @@ -1,12 +1,13 @@ # HG changeset patch # User Petr Cerny # Parent 7308e4a7c1f769f4bbbc90870b849cadd99495a6 +# Parent 03565086f1e230cf6f0f6c01bf9a792c732de50b Bug 634334 - call to the ntlm_auth helper fails diff --git a/extensions/auth/nsAuthSambaNTLM.cpp b/extensions/auth/nsAuthSambaNTLM.cpp --- a/extensions/auth/nsAuthSambaNTLM.cpp +++ b/extensions/auth/nsAuthSambaNTLM.cpp -@@ -168,17 +168,17 @@ static uint8_t* ExtractMessage(const nsA +@@ -169,17 +169,17 @@ static uint8_t* ExtractMessage(const nsA nsresult nsAuthSambaNTLM::SpawnNTLMAuthHelper() { diff -r 284da266ec46 -r 0dd25a92df97 mozilla-openaes-decl.patch --- a/mozilla-openaes-decl.patch Sat Jul 18 15:01:59 2015 +0200 +++ b/mozilla-openaes-decl.patch Mon Jul 20 11:11:23 2015 +0200 @@ -1,7 +1,7 @@ # HG changeset patch # Parent 33024abb3c58dab7239e32388df58e14f99defd5 # User Wolfgang Rosenauer -# Parent 12305a99d90ce098f8f11f5609571cd709b6e2de +# Parent 776cb894347a5ce8f03cd7344dca83b345e93d5f diff --git a/media/gmp-clearkey/0.1/openaes/oaes_lib.c b/media/gmp-clearkey/0.1/openaes/oaes_lib.c --- a/media/gmp-clearkey/0.1/openaes/oaes_lib.c diff -r 284da266ec46 -r 0dd25a92df97 mozilla-pkgconfig.patch --- a/mozilla-pkgconfig.patch Sat Jul 18 15:01:59 2015 +0200 +++ b/mozilla-pkgconfig.patch Mon Jul 20 11:11:23 2015 +0200 @@ -4,7 +4,7 @@ diff --git a/xulrunner/installer/Makefile.in b/xulrunner/installer/Makefile.in --- a/xulrunner/installer/Makefile.in +++ b/xulrunner/installer/Makefile.in -@@ -32,16 +32,19 @@ include $(topsrcdir)/config/rules.mk +@@ -33,16 +33,19 @@ include $(topsrcdir)/config/rules.mk INSTALL_SDK = 1 @@ -24,7 +24,7 @@ $(NULL) ifdef MOZ_NATIVE_NSPR -@@ -69,16 +72,17 @@ pkg_config_files += mozilla-nss.pc +@@ -70,16 +73,17 @@ pkg_config_files += mozilla-nss.pc endif %.pc: $(srcdir)/%.pc.in $(GLOBAL_DEPS) diff -r 284da266ec46 -r 0dd25a92df97 mozilla-preferences.patch --- a/mozilla-preferences.patch Sat Jul 18 15:01:59 2015 +0200 +++ b/mozilla-preferences.patch Mon Jul 20 11:11:23 2015 +0200 @@ -6,11 +6,12 @@ # HG changeset patch # Parent 8c1bfc96b05ef1836aad6e9f2af323f63ed1b69c +# Parent 3de9f5c9ca0d23956f2580ad534ac139a63527a5 diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js -@@ -1503,17 +1503,17 @@ pref("converter.html2txt.header_strategy +@@ -1770,17 +1770,17 @@ pref("converter.html2txt.always_include_ pref("intl.accept_languages", "chrome://global/locale/intl.properties"); pref("intl.menuitems.alwaysappendaccesskeys","chrome://global/locale/intl.properties"); diff -r 284da266ec46 -r 0dd25a92df97 mozilla-repo.patch --- a/mozilla-repo.patch Sat Jul 18 15:01:59 2015 +0200 +++ b/mozilla-repo.patch Mon Jul 20 11:11:23 2015 +0200 @@ -1,6 +1,6 @@ # HG changeset patch # Parent 80b6464bd883864fce57e8748010869af1be69e9 -# Parent af6547866a1a2fe0a3a84064f77d8693bff5becc +# Parent 57bb5e3ab77acbff5414d4dbce35a38f21d39276 diff --git a/toolkit/mozapps/installer/package-name.mk b/toolkit/mozapps/installer/package-name.mk --- a/toolkit/mozapps/installer/package-name.mk diff -r 284da266ec46 -r 0dd25a92df97 mozilla-skia-be-le.patch --- a/mozilla-skia-be-le.patch Sat Jul 18 15:01:59 2015 +0200 +++ b/mozilla-skia-be-le.patch Mon Jul 20 11:11:23 2015 +0200 @@ -1,5 +1,5 @@ # HG changeset patch -# Parent c5d7373760d7abbd34f89cb60d4a45cba2c05379 +# Parent 2cf5e1715c64a30c340872b58816c3a329bd12dc Part 2 of Bug 1136958 - gfx/layers/basic/BasicCompositor.cpp:20:56: fatal error: skia/SkCanvas.h: No such file or directory when skia is disabled diff -r 284da266ec46 -r 0dd25a92df97 series --- a/series Sat Jul 18 15:01:59 2015 +0200 +++ b/series Mon Jul 20 11:11:23 2015 +0200 @@ -15,9 +15,9 @@ mozilla-skia-be-le.patch mozilla-bmo1005535.patch mozilla-arm64-libjpeg-turbo.patch +mozilla-no-stdcxx-check.patch # Firefox patches firefox-kde.patch firefox-no-default-ualocale.patch -firefox-multilocale-chrome.patch firefox-branded-icons.patch diff -r 284da266ec46 -r 0dd25a92df97 toolkit-download-folder.patch --- a/toolkit-download-folder.patch Sat Jul 18 15:01:59 2015 +0200 +++ b/toolkit-download-folder.patch Mon Jul 20 11:11:23 2015 +0200 @@ -6,7 +6,7 @@ diff --git a/browser/components/preferences/main.js b/browser/components/preferences/main.js --- a/browser/components/preferences/main.js +++ b/browser/components/preferences/main.js -@@ -408,17 +408,17 @@ var gMainPane = { +@@ -383,17 +383,17 @@ var gMainPane = { // and was available as an option in the 1.5 drop down. On XP this // was in My Documents, on OSX it was in User Docs. In 2.0, we did // away with the drop down option, although the special label was @@ -28,7 +28,7 @@ diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/components/downloads/nsDownloadManager.cpp --- a/toolkit/components/downloads/nsDownloadManager.cpp +++ b/toolkit/components/downloads/nsDownloadManager.cpp -@@ -1361,18 +1361,20 @@ nsDownloadManager::GetDefaultDownloadsDi +@@ -1356,18 +1356,20 @@ nsDownloadManager::GetDefaultDownloadsDi // Vista: // Downloads // XP/2K: