svn commit: r454972 - in branches/2017Q4: mail/thunderbird mail/thunderbird/files www/firefox www/firefox-esr www/firefox-esr/files www/firefox/files www/seamonkey www/seamonkey/files
Jan Beich
jbeich at FreeBSD.org
Mon Nov 27 17:24:12 UTC 2017
Author: jbeich
Date: Mon Nov 27 17:24:10 2017
New Revision: 454972
URL: https://svnweb.freebsd.org/changeset/ports/454972
Log:
MFH: r453059
gecko: double-click on tab bar crashfix for some WMs
Obtained from: upstream (Firefox 58)
PR: 222693
Submitted by: tobik
Approved by: ports-secteam (feld)
Added:
branches/2017Q4/mail/thunderbird/files/patch-bug1186967
- copied unchanged from r453059, head/mail/thunderbird/files/patch-bug1186967
branches/2017Q4/www/firefox-esr/files/patch-bug1186967
- copied unchanged from r453059, head/www/firefox-esr/files/patch-bug1186967
branches/2017Q4/www/firefox/files/patch-bug1186967
- copied unchanged from r453059, head/www/firefox/files/patch-bug1186967
branches/2017Q4/www/seamonkey/files/patch-bug1186967
- copied unchanged from r453059, head/www/seamonkey/files/patch-bug1186967
Modified:
branches/2017Q4/mail/thunderbird/Makefile
branches/2017Q4/www/firefox-esr/Makefile
branches/2017Q4/www/firefox/Makefile
branches/2017Q4/www/seamonkey/Makefile
Directory Properties:
branches/2017Q4/ (props changed)
Modified: branches/2017Q4/mail/thunderbird/Makefile
==============================================================================
--- branches/2017Q4/mail/thunderbird/Makefile Mon Nov 27 17:15:17 2017 (r454971)
+++ branches/2017Q4/mail/thunderbird/Makefile Mon Nov 27 17:24:10 2017 (r454972)
@@ -3,6 +3,7 @@
PORTNAME= thunderbird
DISTVERSION= 52.4.0
+PORTREVISION= 1
CATEGORIES= mail news net-im ipv6
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build3/source
Copied: branches/2017Q4/mail/thunderbird/files/patch-bug1186967 (from r453059, head/mail/thunderbird/files/patch-bug1186967)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2017Q4/mail/thunderbird/files/patch-bug1186967 Mon Nov 27 17:24:10 2017 (r454972, copy of r453059, head/mail/thunderbird/files/patch-bug1186967)
@@ -0,0 +1,41 @@
+commit 64bb4e051b50
+Author: Martin Stransky <stransky at redhat.com>
+Date: Tue Oct 17 09:50:18 2017 +0200
+
+ Bug 1186967 - ignore double-click on WM without _NET_WM_MOVERESIZE support, r=jhorak
+
+ MozReview-Commit-ID: 2Vs6i5leero
+
+ --HG--
+ extra : rebase_source : d8f2bbaf9ef9b2025478f029a68ee7e87e07de79
+---
+ widget/gtk/nsWindow.cpp | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
+diff --git widget/gtk/nsWindow.cpp widget/gtk/nsWindow.cpp
+index eb2f0e5e95cd..955327297ac9 100644
+--- mozilla/widget/gtk/nsWindow.cpp
++++ mozilla/widget/gtk/nsWindow.cpp
+@@ -6444,6 +6444,22 @@ nsWindow::GetDragInfo(WidgetMouseEvent* aMouseEvent,
+ return false;
+ }
+
++ if (mIsX11Display) {
++ // Workaround for https://bugzilla.gnome.org/show_bug.cgi?id=789054
++ // To avoid crashes disable double-click on WM without _NET_WM_MOVERESIZE.
++ // See _should_perform_ewmh_drag() at gdkwindow-x11.c
++ GdkScreen* screen = gdk_window_get_screen(gdk_window);
++ GdkAtom atom = gdk_atom_intern("_NET_WM_MOVERESIZE", FALSE);
++ if (!gdk_x11_screen_supports_net_wm_hint(screen, atom)) {
++ static unsigned int lastTimeStamp = 0;
++ if (lastTimeStamp != aMouseEvent->mTime) {
++ lastTimeStamp = aMouseEvent->mTime;
++ } else {
++ return false;
++ }
++ }
++ }
++
+ // FIXME: It would be nice to have the widget position at the time
+ // of the event, but it's relatively unlikely that the widget has
+ // moved since the mousedown. (On the other hand, it's quite likely
Modified: branches/2017Q4/www/firefox-esr/Makefile
==============================================================================
--- branches/2017Q4/www/firefox-esr/Makefile Mon Nov 27 17:15:17 2017 (r454971)
+++ branches/2017Q4/www/firefox-esr/Makefile Mon Nov 27 17:24:10 2017 (r454972)
@@ -4,6 +4,7 @@
PORTNAME= firefox
DISTVERSION= 52.4.1
DISTVERSIONSUFFIX=esr.source
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= www ipv6
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \
Copied: branches/2017Q4/www/firefox-esr/files/patch-bug1186967 (from r453059, head/www/firefox-esr/files/patch-bug1186967)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2017Q4/www/firefox-esr/files/patch-bug1186967 Mon Nov 27 17:24:10 2017 (r454972, copy of r453059, head/www/firefox-esr/files/patch-bug1186967)
@@ -0,0 +1,41 @@
+commit 64bb4e051b50
+Author: Martin Stransky <stransky at redhat.com>
+Date: Tue Oct 17 09:50:18 2017 +0200
+
+ Bug 1186967 - ignore double-click on WM without _NET_WM_MOVERESIZE support, r=jhorak
+
+ MozReview-Commit-ID: 2Vs6i5leero
+
+ --HG--
+ extra : rebase_source : d8f2bbaf9ef9b2025478f029a68ee7e87e07de79
+---
+ widget/gtk/nsWindow.cpp | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
+diff --git widget/gtk/nsWindow.cpp widget/gtk/nsWindow.cpp
+index eb2f0e5e95cd..955327297ac9 100644
+--- widget/gtk/nsWindow.cpp
++++ widget/gtk/nsWindow.cpp
+@@ -6444,6 +6444,22 @@ nsWindow::GetDragInfo(WidgetMouseEvent* aMouseEvent,
+ return false;
+ }
+
++ if (mIsX11Display) {
++ // Workaround for https://bugzilla.gnome.org/show_bug.cgi?id=789054
++ // To avoid crashes disable double-click on WM without _NET_WM_MOVERESIZE.
++ // See _should_perform_ewmh_drag() at gdkwindow-x11.c
++ GdkScreen* screen = gdk_window_get_screen(gdk_window);
++ GdkAtom atom = gdk_atom_intern("_NET_WM_MOVERESIZE", FALSE);
++ if (!gdk_x11_screen_supports_net_wm_hint(screen, atom)) {
++ static unsigned int lastTimeStamp = 0;
++ if (lastTimeStamp != aMouseEvent->mTime) {
++ lastTimeStamp = aMouseEvent->mTime;
++ } else {
++ return false;
++ }
++ }
++ }
++
+ // FIXME: It would be nice to have the widget position at the time
+ // of the event, but it's relatively unlikely that the widget has
+ // moved since the mousedown. (On the other hand, it's quite likely
Modified: branches/2017Q4/www/firefox/Makefile
==============================================================================
--- branches/2017Q4/www/firefox/Makefile Mon Nov 27 17:15:17 2017 (r454971)
+++ branches/2017Q4/www/firefox/Makefile Mon Nov 27 17:24:10 2017 (r454972)
@@ -4,7 +4,7 @@
PORTNAME= firefox
DISTVERSION= 56.0.2
DISTVERSIONSUFFIX=.source
-PORTREVISION= 2
+PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= www ipv6
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
Copied: branches/2017Q4/www/firefox/files/patch-bug1186967 (from r453059, head/www/firefox/files/patch-bug1186967)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2017Q4/www/firefox/files/patch-bug1186967 Mon Nov 27 17:24:10 2017 (r454972, copy of r453059, head/www/firefox/files/patch-bug1186967)
@@ -0,0 +1,41 @@
+commit 64bb4e051b50
+Author: Martin Stransky <stransky at redhat.com>
+Date: Tue Oct 17 09:50:18 2017 +0200
+
+ Bug 1186967 - ignore double-click on WM without _NET_WM_MOVERESIZE support, r=jhorak
+
+ MozReview-Commit-ID: 2Vs6i5leero
+
+ --HG--
+ extra : rebase_source : d8f2bbaf9ef9b2025478f029a68ee7e87e07de79
+---
+ widget/gtk/nsWindow.cpp | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
+diff --git widget/gtk/nsWindow.cpp widget/gtk/nsWindow.cpp
+index eb2f0e5e95cd..955327297ac9 100644
+--- widget/gtk/nsWindow.cpp
++++ widget/gtk/nsWindow.cpp
+@@ -6444,6 +6444,22 @@ nsWindow::GetDragInfo(WidgetMouseEvent* aMouseEvent,
+ return false;
+ }
+
++ if (mIsX11Display) {
++ // Workaround for https://bugzilla.gnome.org/show_bug.cgi?id=789054
++ // To avoid crashes disable double-click on WM without _NET_WM_MOVERESIZE.
++ // See _should_perform_ewmh_drag() at gdkwindow-x11.c
++ GdkScreen* screen = gdk_window_get_screen(gdk_window);
++ GdkAtom atom = gdk_atom_intern("_NET_WM_MOVERESIZE", FALSE);
++ if (!gdk_x11_screen_supports_net_wm_hint(screen, atom)) {
++ static unsigned int lastTimeStamp = 0;
++ if (lastTimeStamp != aMouseEvent->mTime) {
++ lastTimeStamp = aMouseEvent->mTime;
++ } else {
++ return false;
++ }
++ }
++ }
++
+ // FIXME: It would be nice to have the widget position at the time
+ // of the event, but it's relatively unlikely that the widget has
+ // moved since the mousedown. (On the other hand, it's quite likely
Modified: branches/2017Q4/www/seamonkey/Makefile
==============================================================================
--- branches/2017Q4/www/seamonkey/Makefile Mon Nov 27 17:15:17 2017 (r454971)
+++ branches/2017Q4/www/seamonkey/Makefile Mon Nov 27 17:24:10 2017 (r454972)
@@ -3,6 +3,7 @@
PORTNAME= seamonkey
DISTVERSION= 2.49.1
+PORTREVISION= 1
MOZILLA_VER= 52 # above + 3
CATEGORIES?= www mail news editors irc ipv6
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
Copied: branches/2017Q4/www/seamonkey/files/patch-bug1186967 (from r453059, head/www/seamonkey/files/patch-bug1186967)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2017Q4/www/seamonkey/files/patch-bug1186967 Mon Nov 27 17:24:10 2017 (r454972, copy of r453059, head/www/seamonkey/files/patch-bug1186967)
@@ -0,0 +1,41 @@
+commit 64bb4e051b50
+Author: Martin Stransky <stransky at redhat.com>
+Date: Tue Oct 17 09:50:18 2017 +0200
+
+ Bug 1186967 - ignore double-click on WM without _NET_WM_MOVERESIZE support, r=jhorak
+
+ MozReview-Commit-ID: 2Vs6i5leero
+
+ --HG--
+ extra : rebase_source : d8f2bbaf9ef9b2025478f029a68ee7e87e07de79
+---
+ widget/gtk/nsWindow.cpp | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
+diff --git widget/gtk/nsWindow.cpp widget/gtk/nsWindow.cpp
+index eb2f0e5e95cd..955327297ac9 100644
+--- mozilla/widget/gtk/nsWindow.cpp
++++ mozilla/widget/gtk/nsWindow.cpp
+@@ -6444,6 +6444,22 @@ nsWindow::GetDragInfo(WidgetMouseEvent* aMouseEvent,
+ return false;
+ }
+
++ if (mIsX11Display) {
++ // Workaround for https://bugzilla.gnome.org/show_bug.cgi?id=789054
++ // To avoid crashes disable double-click on WM without _NET_WM_MOVERESIZE.
++ // See _should_perform_ewmh_drag() at gdkwindow-x11.c
++ GdkScreen* screen = gdk_window_get_screen(gdk_window);
++ GdkAtom atom = gdk_atom_intern("_NET_WM_MOVERESIZE", FALSE);
++ if (!gdk_x11_screen_supports_net_wm_hint(screen, atom)) {
++ static unsigned int lastTimeStamp = 0;
++ if (lastTimeStamp != aMouseEvent->mTime) {
++ lastTimeStamp = aMouseEvent->mTime;
++ } else {
++ return false;
++ }
++ }
++ }
++
+ // FIXME: It would be nice to have the widget position at the time
+ // of the event, but it's relatively unlikely that the widget has
+ // moved since the mousedown. (On the other hand, it's quite likely
More information about the svn-ports-branches
mailing list