r51942 - in /desktop/unstable/libwnck3/debian: changelog patches/screen-Check-for-Wayland-display.patch patches/series

[smcv at users.alioth.debian.org]

Author: smcv
Date: Wed Jan 25 11:23:06 2017
New Revision: 51942

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=51942
Log:
* Team upload
* Add patch from upstream to not segfault when attempting to use this
  library under Wayland or Mir, for example running d-feet
  (Closes: #852538)
  - Please note that this library will never be functional in non-X11;
    this change only fixes the crash

Added:
    desktop/unstable/libwnck3/debian/patches/screen-Check-for-Wayland-display.patch
Modified:
    desktop/unstable/libwnck3/debian/changelog
    desktop/unstable/libwnck3/debian/patches/series

Modified: desktop/unstable/libwnck3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libwnck3/debian/changelog?rev=51942&op=diff
==============================================================================
--- desktop/unstable/libwnck3/debian/changelog	[utf-8] (original)
+++ desktop/unstable/libwnck3/debian/changelog	[utf-8] Wed Jan 25 11:23:06 2017
@@ -1,3 +1,14 @@
+libwnck3 (3.20.1-3) unstable; urgency=medium
+
+  * Team upload
+  * Add patch from upstream to not segfault when attempting to use this
+    library under Wayland or Mir, for example running d-feet
+    (Closes: #852538)
+    - Please note that this library will never be functional in non-X11;
+      this change only fixes the crash
+
+ -- Simon McVittie <smcv at debian.org>  Wed, 25 Jan 2017 11:22:51 +0000
+
 libwnck3 (3.20.1-2) unstable; urgency=medium
 
   * Bump dh compat to 10 (automatic dh-autoreconf)

Added: desktop/unstable/libwnck3/debian/patches/screen-Check-for-Wayland-display.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libwnck3/debian/patches/screen-Check-for-Wayland-display.patch?rev=51942&op=file
==============================================================================
--- desktop/unstable/libwnck3/debian/patches/screen-Check-for-Wayland-display.patch	(added)
+++ desktop/unstable/libwnck3/debian/patches/screen-Check-for-Wayland-display.patch	[utf-8] Wed Jan 25 11:23:06 2017
@@ -0,0 +1,63 @@
+From 40856004e394305c880124f3d3b5f08fc1e9a16d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete at collabora.com>
+Date: Fri, 25 Nov 2016 15:25:40 -0500
+Subject: screen: Check for Wayland display
+
+The current code doesn't check hard enough and segfaults when
+starting d-feet.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=775116
+---
+ libwnck/screen.c | 11 ++++++++---
+ libwnck/util.c   |  5 ++++-
+ 2 files changed, 12 insertions(+), 4 deletions(-)
+
+diff --git a/libwnck/screen.c b/libwnck/screen.c
+index 1814ec0..4977017 100644
+--- a/libwnck/screen.c
++++ b/libwnck/screen.c
+@@ -625,15 +625,20 @@ _wnck_screen_get_existing (int number)
+  *
+  * Gets the default #WnckScreen on the default display.
+  *
+- * Return value: (transfer none): the default #WnckScreen. The returned
+- * #WnckScreen is owned by libwnck and must not be referenced or unreferenced.
++ * Return value: (transfer none) (nullable): the default #WnckScreen. The returned
++ * #WnckScreen is owned by libwnck and must not be referenced or unreferenced. This
++ * can return %NULL if not on X11.
+  **/
+ WnckScreen*
+ wnck_screen_get_default (void)
+ {
+   int default_screen;
++  Display *default_display = _wnck_get_default_display ();
+ 
+-  default_screen = DefaultScreen (_wnck_get_default_display ());
++  if (default_display == NULL)
++    return NULL;
++
++  default_screen = DefaultScreen (default_display);
+ 
+   return wnck_screen_get (default_screen);
+ }
+diff --git a/libwnck/util.c b/libwnck/util.c
+index 01901b7..bc235bb 100644
+--- a/libwnck/util.c
++++ b/libwnck/util.c
+@@ -808,9 +808,12 @@ _wnck_init (void)
+ Display *
+ _wnck_get_default_display (void)
+ {
++  GdkDisplay *display = gdk_display_get_default ();
+   /* FIXME: when we fix libwnck to not use the GDK default display, we will
+    * need to fix wnckprop accordingly. */
+-  return GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
++  if (!GDK_IS_X11_DISPLAY (display))
++    return NULL;
++  return GDK_DISPLAY_XDISPLAY (display);
+ }
+ 
+ /**
+-- 
+cgit v0.12
+

Modified: desktop/unstable/libwnck3/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libwnck3/debian/patches/series?rev=51942&op=diff
==============================================================================
--- desktop/unstable/libwnck3/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/libwnck3/debian/patches/series	[utf-8] Wed Jan 25 11:23:06 2017
@@ -1 +1,2 @@
 #02_moveresize_static_gravity.patch
+screen-Check-for-Wayland-display.patch