From 8f76c773fd9de5a7454e6075a7261db2aeb44b18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B7=D0=B8=D0=BC?= <a.zimin@rosalinux.ru>
Date: Tue, 28 May 2019 17:24:37 +0300
Subject: [PATCH] add patch mozilla-1005640-accept-lang to try to fix mga#24875

---
 .abf.yml                          |  2 +-
 firefox.spec                      |  8 ++++++--
 mozilla-1005640-accept-lang.patch | 30 ++++++++++++++++++++++++++++++
 3 files changed, 37 insertions(+), 3 deletions(-)
 create mode 100644 mozilla-1005640-accept-lang.patch

diff --git a/.abf.yml b/.abf.yml
index e8440c8..1116a4a 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,4 +1,4 @@
 sources:
-  cbindgen-vendor.tar.xz: 5ed5e4744f281d217e56035036af4cef24a29935
+  cbindgen-vendor.tar.xz: 7efa6255e73d8e3c9dc674822d2e29ebc0e3391b
   firefox-67.0.source.tar.xz: c7a5f3182999e5efed5c714653adc538bb75aa53
   firefox-dictionary-61.0.2.tar.bz2: 25929c585dc8568a32d5be49aacc672f0ed2202f
diff --git a/firefox.spec b/firefox.spec
index 65fd374..e307252 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -37,7 +37,7 @@ Summary:	Next generation web browser
 Name:		firefox
 Version:	%{major}
 Epoch:		%{ff_epoch}
-Release:	1
+Release:	2
 License:	MPLv1+
 Group:		Networking/WWW
 Url:		http://www.mozilla.com/firefox/
@@ -66,6 +66,9 @@ Patch35:	firefox-37-build-with-time-independent-uuids.patch
 Patch215:	firefox-enable-addons.patch
 
 Patch219:	mozilla-ntlm-full-path.patch
+# add patch mozilla-1005640-accept-lang to try to fix mga#24875
+# https://bugs.mageia.org/show_bug.cgi?id=24875
+Patch225:	mozilla-1005640-accept-lang.patch
 
 Patch300:	firefox-56.0-build-error.patch
 
@@ -202,7 +205,7 @@ Files and macros mainly for building Firefox extensions.
 ## KDE INTEGRATION
 %patch11 -p1 -b .kdepatch
 %patch12 -p1 -b .kdemoz
-%patch13 -p1 -b .kdebackground #No work in 60.0
+%patch13 -p1 -b .kdebackground
 
 %patch35 -p1
 
@@ -210,6 +213,7 @@ Files and macros mainly for building Firefox extensions.
 %patch215 -p1 -b .addons
 
 %patch219 -p1 -b .ntlm
+%patch225 -p1 -b .1005640-accept-lang
 
 %patch300 -p1
 %patch302 -p1
diff --git a/mozilla-1005640-accept-lang.patch b/mozilla-1005640-accept-lang.patch
new file mode 100644
index 0000000..a8120b9
--- /dev/null
+++ b/mozilla-1005640-accept-lang.patch
@@ -0,0 +1,30 @@
+diff -up firefox-67.0/toolkit/mozapps/extensions/internal/XPIProvider.jsm.1005640-accept-lang firefox-67.0/toolkit/mozapps/extensions/internal/XPIProvider.jsm
+--- firefox-67.0/toolkit/mozapps/extensions/internal/XPIProvider.jsm.1005640-accept-lang	2017-01-16 17:16:52.000000000 +0100
++++ firefox-67.0/toolkit/mozapps/extensions/internal/XPIProvider.jsm	2017-01-18 12:35:29.380394216 +0100
+@@ -2255,6 +2255,11 @@ this.XPIProvider = {
+         logger.error("private browsing migration failed", e);
+       }
+ 
++      // Save locale settings to compare it later to check whenever some addon
++      // changed it.
++      var previousLocale = Cc["@mozilla.org/chrome/chrome-registry;1"]
++                          .getService(Ci.nsIXULChromeRegistry).getSelectedLocale("global");
++
+       try {
+         AddonManagerPrivate.recordTimestamp("XPI_bootstrap_addons_begin");
+ 
+@@ -2284,6 +2289,14 @@ var XPIProvider = {
+         AddonManagerPrivate.recordException("XPI-BOOTSTRAP", "startup failed", e);
+       }
+ 
++      var currentLocale = Cc["@mozilla.org/chrome/chrome-registry;1"]
++                         .getService(Ci.nsIXULChromeRegistry).getSelectedLocale("global");
++      if (currentLocale != previousLocale) {
++        // We have to flush string cache if the locale was changed during loading
++        // of addons
++        Services.obs.notifyObservers(null, "chrome-flush-caches", null);
++      }
++
+       // Let these shutdown a little earlier when they still have access to most
+       // of XPCOM
+       AsyncShutdown.quitApplicationGranted.addBlocker(