summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Stransky <stransky@redhat.com>2018-02-01 14:20:12 +0100
committerMartin Stransky <stransky@redhat.com>2018-02-01 14:20:12 +0100
commitc8311c34d1f514d8e7a255ad4ba8381cd7fafbf5 (patch)
treee60f281affb0b1ceb2423175a2dac15c0451cac5
parentFixed clipboard copy->paste between Firefox windows (mozbz#1434572). (diff)
downloadlibrewolf-fedora-ff-c8311c34d1f514d8e7a255ad4ba8381cd7fafbf5.tar.gz
librewolf-fedora-ff-c8311c34d1f514d8e7a255ad4ba8381cd7fafbf5.tar.bz2
librewolf-fedora-ff-c8311c34d1f514d8e7a255ad4ba8381cd7fafbf5.zip
Fixed remote window focus (mozbz#1434565)
-rw-r--r--firefox.spec7
-rw-r--r--mozilla-1434565.patch16
2 files changed, 22 insertions, 1 deletions
diff --git a/firefox.spec b/firefox.spec
index cb2556a..eb01e38 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -98,7 +98,7 @@ ExclusiveArch: x86_64 i686
Summary: Mozilla Firefox Web browser
Name: firefox
Version: 59.0
-Release: 0.5%{?pre_tag}%{?dist}
+Release: 0.6%{?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
@@ -163,6 +163,7 @@ Patch452: mozilla-1434202.patch
Patch453: mozilla-1433081.patch
Patch454: remote-profile.patch
Patch455: mozilla-1434572.patch
+Patch456: mozilla-1434565.patch
# Debian patches
Patch500: mozilla-440908.patch
@@ -333,6 +334,7 @@ This package contains results of tests executed during build.
%patch453 -p1 -b .1433081
%patch454 -p1 -b .remote-profile
%patch455 -p1 -b .1434572
+%patch456 -p1 -b .1434565
# Patch for big endian platforms only
%if 0%{?big_endian}
@@ -866,6 +868,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#---------------------------------------------------------------------
%changelog
+* Thu Feb 1 2018 Martin Stransky <stransky@redhat.com> - 59.0-0.6
+- Fixed remote window focus (mozbz#1434565).
+
* Thu Feb 1 2018 Martin Stransky <stransky@redhat.com> - 59.0-0.5
- Fixed clipboard copy->paste between Firefox windows
(mozbz#1434572).
diff --git a/mozilla-1434565.patch b/mozilla-1434565.patch
new file mode 100644
index 0000000..bb42348
--- /dev/null
+++ b/mozilla-1434565.patch
@@ -0,0 +1,16 @@
+diff -up mozilla-beta-64737c752ac4af4766ad6f82720818521f3aca24/toolkit/components/remote/nsDBusRemoteService.cpp.1434565 mozilla-beta-64737c752ac4af4766ad6f82720818521f3aca24/toolkit/components/remote/nsDBusRemoteService.cpp
+--- mozilla-beta-64737c752ac4af4766ad6f82720818521f3aca24/toolkit/components/remote/nsDBusRemoteService.cpp.1434565 2018-02-01 14:14:38.902873024 +0100
++++ mozilla-beta-64737c752ac4af4766ad6f82720818521f3aca24/toolkit/components/remote/nsDBusRemoteService.cpp 2018-02-01 14:18:02.906281711 +0100
+@@ -89,7 +89,11 @@ nsDBusRemoteService::OpenURL(DBusMessage
+ errorMsg = nsPrintfCString("org.mozilla.%s.Error", mAppName.get());
+ reply = dbus_message_new_error(msg, errorMsg.get(), "Wrong argument");
+ } else {
+- nsRemoteService::HandleCommandLine(commandLine, nullptr, 0);
++ guint32 timestamp = gtk_get_current_event_time();
++ if (timestamp == GDK_CURRENT_TIME) {
++ timestamp = guint32(g_get_monotonic_time() / 1000);
++ }
++ nsRemoteService::HandleCommandLine(commandLine, nullptr, timestamp);
+ reply = dbus_message_new_method_return(msg);
+ }
+
bgstack15