summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Stransky <stransky@redhat.com>2020-11-10 14:48:46 +0100
committerMartin Stransky <stransky@redhat.com>2020-11-10 14:48:46 +0100
commit7d033e0b198780fa1d7b1fee8237f3cd0262be29 (patch)
tree940bb05a527ac9d6fc4175fc7f0ec97408559862
parentchangelog date fix (diff)
downloadlibrewolf-fedora-ff-7d033e0b198780fa1d7b1fee8237f3cd0262be29.tar.gz
librewolf-fedora-ff-7d033e0b198780fa1d7b1fee8237f3cd0262be29.tar.bz2
librewolf-fedora-ff-7d033e0b198780fa1d7b1fee8237f3cd0262be29.zip
Added fix for mozbz#1885133
-rw-r--r--firefox.spec9
-rw-r--r--mozilla-1885133.patch21
2 files changed, 28 insertions, 2 deletions
diff --git a/firefox.spec b/firefox.spec
index f3c56fb..d51010f 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -45,7 +45,7 @@ ExcludeArch: s390x
%global disable_elfhack 1
%global use_bundled_cbindgen 1
%if %{debug_build}
-%global release_build 1
+%global release_build 0
%endif
# Build PGO+LTO on x86_64 and aarch64 only due to build issues
# on other arches.
@@ -122,7 +122,7 @@ ExcludeArch: s390x
Summary: Mozilla Firefox Web browser
Name: firefox
Version: 82.0.3
-Release: 1%{?pre_tag}%{?dist}
+Release: 2%{?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
@@ -192,6 +192,7 @@ Patch415: mozilla-1670333.patch
Patch416: mozilla-1673202.patch
Patch417: mozilla-1673313.patch
Patch418: mozilla-1556931-s390x-hidden-syms.patch
+Patch419: mozilla-1885133.patch
# Wayland specific upstream patches
Patch574: firefox-pipewire-0-2.patch
@@ -406,6 +407,7 @@ This package contains results of tests executed during build.
%endif
%patch417 -p1 -b .1673313
%patch418 -p1 -b .1556931-s390x-hidden-syms
+%patch419 -p1 -b .1885133
# Wayland specific upstream patches
%if 0%{?fedora} > 31 || 0%{?eln}
@@ -982,6 +984,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#---------------------------------------------------------------------
%changelog
+* Mon Tue 10 2020 Martin Stransky <stransky@redhat.com> - 82.0.3-2
+- Added fix for mozbz#1885133
+
* Mon Nov 9 2020 Martin Stransky <stransky@redhat.com> - 82.0.3-1
- Updated to 82.0.3
diff --git a/mozilla-1885133.patch b/mozilla-1885133.patch
new file mode 100644
index 0000000..a73503a
--- /dev/null
+++ b/mozilla-1885133.patch
@@ -0,0 +1,21 @@
+diff --git a/browser/components/shell/nsGNOMEShellDBusHelper.cpp b/browser/components/shell/nsGNOMEShellDBusHelper.cpp
+--- a/browser/components/shell/nsGNOMEShellDBusHelper.cpp
++++ b/browser/components/shell/nsGNOMEShellDBusHelper.cpp
+@@ -29,7 +29,7 @@ static bool GetGnomeSearchTitle(const ch
+ }
+
+ AutoTArray<nsString, 1> formatStrings;
+- CopyASCIItoUTF16(nsCString(aSearchedTerm), *formatStrings.AppendElement());
++ CopyUTF8toUTF16(nsCString(aSearchedTerm), *formatStrings.AppendElement());
+
+ nsAutoString gnomeSearchTitle;
+ bundle->FormatStringFromName("gnomeSearchProviderSearch", formatStrings,
+@@ -41,7 +41,7 @@ static bool GetGnomeSearchTitle(const ch
+ static const char* introspect_template =
+ "<!DOCTYPE node PUBLIC \"-//freedesktop//DTD D-BUS Object Introspection "
+ "1.0//EN\"\n"
+- "\"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd\";>\n"
++ "\"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd\">\n"
+ "<node>\n"
+ " <interface name=\"org.freedesktop.DBus.Introspectable\">\n"
+ " <method name=\"Introspect\">\n"
bgstack15