[SCM] qtbase packaging branch, ubuntu, updated. ubuntu/5.7.1+dfsg-2ubuntu4-1-g0b84de9

[Dmitry Shachnev]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=0b84de9

The following commit has been merged in the ubuntu branch:
commit 0b84de9b864bc2772615d407ca717536e027865f
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Thu Jul 6 23:16:28 2017 +0300

    Import 5.7.1+dfsg-2ubuntu4~2 upload by Jeremy Bicha.
---
 debian/changelog                       |  8 ++++++++
 debian/patches/gtkdialogs_wayland.diff | 27 +++++++++++++++++++++++++++
 debian/patches/series                  |  1 +
 3 files changed, 36 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index d55b105..28581ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+qtbase-opensource-src (5.7.1+dfsg-2ubuntu4~2) artful; urgency=medium
+
+  [ Dmitry Shachnev ]
+  * Backport upstream fix to make QGtk3Dialog not crash on Wayland
+    (gtkdialogs_wayland.diff; closes: #850746) (LP: #1702741)
+
+ -- Jeremy Bicha <jbicha at ubuntu.com>  Thu, 06 Jul 2017 15:42:37 -0400
+
 qtbase-opensource-src (5.7.1+dfsg-2ubuntu4~1) zesty; urgency=medium
 
   [ Marco Trevisan (Treviño) ]
diff --git a/debian/patches/gtkdialogs_wayland.diff b/debian/patches/gtkdialogs_wayland.diff
new file mode 100644
index 0000000..e7d9d2b
--- /dev/null
+++ b/debian/patches/gtkdialogs_wayland.diff
@@ -0,0 +1,27 @@
+Description: QGtk3Dialog: don't crash on Wayland
+ Check if it's an X11 window before calling XSetTransientForHint().
+ No transient parent will be set for GTK+ dialogs on Wayland. That
+ has to be implemented separately.
+Origin: upstream, https://code.qt.io/cgit/qt/qtbase.git/commit/?id=84ea00d47049d882
+Last-Update: 2017-01-06
+
+--- a/src/plugins/platformthemes/gtk3/qgtk3dialoghelpers.cpp
++++ b/src/plugins/platformthemes/gtk3/qgtk3dialoghelpers.cpp
+@@ -129,10 +129,12 @@
+ 
+     GdkWindow *gdkWindow = gtk_widget_get_window(gtkWidget);
+     if (parent) {
+-        GdkDisplay *gdkDisplay = gdk_window_get_display(gdkWindow);
+-        XSetTransientForHint(gdk_x11_display_get_xdisplay(gdkDisplay),
+-                             gdk_x11_window_get_xid(gdkWindow),
+-                             parent->winId());
++        if (GDK_IS_X11_WINDOW(gdkWindow)) {
++            GdkDisplay *gdkDisplay = gdk_window_get_display(gdkWindow);
++            XSetTransientForHint(gdk_x11_display_get_xdisplay(gdkDisplay),
++                                 gdk_x11_window_get_xid(gdkWindow),
++                                 parent->winId());
++        }
+     }
+ 
+     if (modality != Qt::NonModal) {
+
diff --git a/debian/patches/series b/debian/patches/series
index 734a0b7..b15a66d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,6 +10,7 @@ Make-the-bearer-QFactoryLoader-a-member-variable-not.patch
 Stop-unloading-plugins-in-QPluginLoader-and-QFactory.patch
 global_menu_shortcuts.diff
 Add-support-for-selecting-the-printer-plugin-via-the.patch
+gtkdialogs_wayland.diff
 
 # Debian specific.
 no_dbus_dependency.diff

-- 
qtbase packaging