[SCM] mate-screensaver Debian package branch, master, updated. debian/1.8.0-3-6-g9160c36

[Mike Gabriel]

Gitweb-URL: http://git.debian.org/?p=pkg-mate/mate-screensaver.git;a=commitdiff;h=79ccaa9

The following commit has been merged in the master branch:
commit 79ccaa96efb907f9f47738ba3b7bb79809fcb6e6
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri May 30 15:20:46 2014 +0200

    debian/patches: Add 1002_fix-segfault-if-xrandr-is-unavailable.patch. Fix SegFaults if XRANDR is not available.
---
 .../1002_fix-segfault-if-xrandr-is-unavailable.patch      | 15 +++++++++++++++
 debian/patches/series                                     |  1 +
 2 files changed, 16 insertions(+)

diff --git a/debian/patches/1002_fix-segfault-if-xrandr-is-unavailable.patch b/debian/patches/1002_fix-segfault-if-xrandr-is-unavailable.patch
new file mode 100644
index 0000000..fded836
--- /dev/null
+++ b/debian/patches/1002_fix-segfault-if-xrandr-is-unavailable.patch
@@ -0,0 +1,15 @@
+Description: Fix SegFault if XRANDR is not installed/available
+Author: Steven Chamberlain <steven at pyro.eu.org>
+Forwarded: https://github.com/mate-desktop/mate-screensaver/issues/46
+--- mate-screensaver-1.8.0/src/gs-fade.c.orig	2014-03-01 11:24:28.000000000 +0000
++++ mate-screensaver-1.8.0/src/gs-fade.c	2014-05-28 19:10:03.560688363 +0100
+@@ -916,7 +916,8 @@
+ 	gs_fade_set_alpha (fade, fade->priv->current_alpha);
+ 
+ 	for (i = 0; i < fade->priv->num_screens; i++)
+-		fade->priv->screen_priv[i].fade_finish (fade, i);
++		if (fade->priv->screen_priv[i].fade_type != FADE_TYPE_NONE)
++			fade->priv->screen_priv[i].fade_finish (fade, i);
+ }
+ 
+ static void
diff --git a/debian/patches/series b/debian/patches/series
index bc1e32e..c8b6a22 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 1001_add-keywords-to-desktop-files.patch
+1002_fix-segfault-if-xrandr-is-unavailable.patch

-- 
mate-screensaver Debian package