summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Horak <jhorak@redhat.com>2019-12-18 13:45:51 +0100
committerJan Horak <jhorak@redhat.com>2019-12-18 13:45:51 +0100
commitfe214117e10a900c7404cf49cf25bf8fa97592d9 (patch)
tree40fd12813404541a0e711f9757df26751050be34
parentMerge branch 'master' into f31 (diff)
parentFix for wrong intl.accept_lang when using non en-us langpack (diff)
downloadlibrewolf-fedora-ff-fe214117e10a900c7404cf49cf25bf8fa97592d9.tar.gz
librewolf-fedora-ff-fe214117e10a900c7404cf49cf25bf8fa97592d9.tar.bz2
librewolf-fedora-ff-fe214117e10a900c7404cf49cf25bf8fa97592d9.zip
Merge branch 'master' into f31
-rw-r--r--firefox.spec8
-rw-r--r--mozilla-1603112-accept-lang.patch12
2 files changed, 19 insertions, 1 deletions
diff --git a/firefox.spec b/firefox.spec
index 91a88ba..3e1265b 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -99,7 +99,7 @@ ExcludeArch: s390x
Summary: Mozilla Firefox Web browser
Name: firefox
Version: 71.0
-Release: 16%{?pre_tag}%{?dist}
+Release: 17%{?pre_tag}%{?dist}
URL: https://www.mozilla.org/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+
Source0: https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.xz
@@ -164,6 +164,7 @@ Patch419: mozilla-1568569.patch
Patch422: mozilla-1580174-webrtc-popup.patch
Patch424: D53011-remote-content-disappear-fix.diff
Patch425: D53965-dropdown-missing-on-multimonitor.diff
+Patch426: mozilla-1603112-accept-lang.patch
# Wayland specific upstream patches
Patch574: firefox-pipewire.patch
@@ -367,6 +368,8 @@ This package contains results of tests executed during build.
%patch424 -p1 -b .D53011
# dropdown missing on multimonitor
%patch425 -p1 -b .D53965
+# fix for wrong intl.accept_lang when using non en-us langpack
+%patch426 -p1 -b .1603112-accept-lang
# Wayland specific upstream patches
%patch574 -p1 -b .firefox-pipewire
@@ -935,6 +938,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#---------------------------------------------------------------------
%changelog
+* Wed Dec 18 2019 Jan Horak <jhorak@redhat.com> - 71.0-17.asan
+- Fix for wrong intl.accept_lang when using non en-us langpack
+
* Mon Dec 9 2019 Martin Stransky <stransky@redhat.com> - 71.0-16
- Build with asan
diff --git a/mozilla-1603112-accept-lang.patch b/mozilla-1603112-accept-lang.patch
new file mode 100644
index 0000000..b67b232
--- /dev/null
+++ b/mozilla-1603112-accept-lang.patch
@@ -0,0 +1,12 @@
+diff --git a/intl/strres/nsStringBundle.cpp b/intl/strres/nsStringBundle.cpp
+--- a/intl/strres/nsStringBundle.cpp
++++ b/intl/strres/nsStringBundle.cpp
+@@ -66,7 +66,6 @@
+ "chrome://global/locale/commonDialogs.properties",
+ "chrome://global/locale/css.properties",
+ "chrome://global/locale/dom/dom.properties",
+- "chrome://global/locale/intl.properties",
+ "chrome://global/locale/layout/HtmlForm.properties",
+ "chrome://global/locale/layout/htmlparser.properties",
+ "chrome://global/locale/layout_errors.properties",
+
bgstack15