Add patches to prevent crash with cups-1.5 and to properly detect display devices without EDID data. Drop old.

(Portage version: 2.2.0_alpha80/cvs/Linux x86_64)

5 files changed, 87 insertions, 27 deletions

diff --git a/gnome-base/gnome-settings-daemon/ChangeLog b/gnome-base/gnome-settings-daemon/ChangeLog
index b4c70fbd49dd..aa05a0d0d6f4 100644
--- a/gnome-base/gnome-settings-daemon/ChangeLog
+++ b/gnome-base/gnome-settings-daemon/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for gnome-base/gnome-settings-daemon
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v 1.99 2011/11/28 18:27:18 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v 1.100 2011/12/12 00:37:28 tetromino Exp $
+
+*gnome-settings-daemon-3.2.2-r1 (12 Dec 2011)
+
+  12 Dec 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -gnome-settings-daemon-3.2.1.ebuild,
+  -files/gnome-settings-daemon-3.2.1-WEXITSTATUS.patch,
+  +gnome-settings-daemon-3.2.2-r1.ebuild,
+  +files/gnome-settings-daemon-3.2.2-color-unavailable-edid.patch,
+  +files/gnome-settings-daemon-3.2.2-print-notifications-malformed-dbus.patch:
+  Add patches to prevent crash with cups-1.5 and to properly detect display
+  devices without EDID data. Drop old.
 
   28 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
   gnome-settings-daemon-2.32.1-r2.ebuild:
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.2.1-WEXITSTATUS.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.2.1-WEXITSTATUS.patch
deleted file mode 100644
index 2c3e59f67a91..000000000000
--- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.2.1-WEXITSTATUS.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 9b141728c889a6d2f88767655661318e3d8d82da Mon Sep 17 00:00:00 2001
-From: Malcolm Lewis <malcolmlewis@opensuse.org>
-Date: Mon, 17 Oct 2011 16:43:06 +0000
-Subject: power: Fix "undefined symbol: WEXITSTATUS" error.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=662020
----
-diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c
-index 010d14a..3f10c22 100644
---- a/plugins/power/gsd-power-manager.c
-+++ b/plugins/power/gsd-power-manager.c
-@@ -24,6 +24,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <stdio.h>
-+#include <sys/wait.h>
- #include <glib/gi18n.h>
- #include <gtk/gtk.h>
- #include <libupower-glib/upower.h>
---
-cgit v0.9.0.2
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.2.2-color-unavailable-edid.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.2.2-color-unavailable-edid.patch
new file mode 100644
index 000000000000..dbfc8f1c8ecd
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.2.2-color-unavailable-edid.patch
@@ -0,0 +1,35 @@
+From 8cd361027c86a37c73eb8f787a88eda701d0fa4d Mon Sep 17 00:00:00 2001
+From: Richard Hughes <richard@hughsie.com>
+Date: Wed, 2 Nov 2011 16:49:07 +0000
+Subject: [PATCH] color: Set model and vendor to 'unknown' if not specified or
+ unavailable
+
+If the user has connected a device without the ability to get the EDID (e.g.
+composite TV connection) then don't show a critical warning and fail to add
+the device.
+
+Resolves https://bugzilla.redhat.com/show_bug.cgi?id=749504
+---
+ plugins/color/gsd-color-manager.c |    6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+diff --git a/plugins/color/gsd-color-manager.c b/plugins/color/gsd-color-manager.c
+index 01b20c0..2474040 100644
+--- a/plugins/color/gsd-color-manager.c
++++ b/plugins/color/gsd-color-manager.c
+@@ -1263,6 +1263,12 @@ gcm_session_add_x11_output (GsdColorManager *manager, GnomeRROutput *output)
+         if (serial == NULL)
+                 serial = "unknown";
+ 
++        /* ensure mandatory fields are set */
++        if (model == NULL)
++                model = "unknown";
++        if (vendor == NULL)
++                vendor = "unknown";
++
+         device_id = gcm_session_get_output_id (manager, output);
+         g_debug ("output %s added", device_id);
+         device_props = g_hash_table_new_full (g_str_hash, g_str_equal,
+-- 
+1.7.8
+
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.2.2-print-notifications-malformed-dbus.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.2.2-print-notifications-malformed-dbus.patch
new file mode 100644
index 000000000000..53c590b75753
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.2.2-print-notifications-malformed-dbus.patch
@@ -0,0 +1,31 @@
+From cbc5ab2ae34643775c980228d56f6b800f606b96 Mon Sep 17 00:00:00 2001
+From: Lars Uebernickel <lars.uebernickel@canonical.com>
+Date: Wed, 7 Dec 2011 16:21:38 +0100
+Subject: [PATCH] print-notifications: detect malformed d-bus signals
+
+Fixes a crash that happens when receiving a d-bus call with an invalid
+number of arguments.  The issue was first reported at lp #893676.  A
+patch to CUPS which makes it stop sending those malformed signals has
+been submitted to cups.org as STR #3984. (#665689)
+---
+ .../gsd-print-notifications-manager.c              |    4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/plugins/print-notifications/gsd-print-notifications-manager.c b/plugins/print-notifications/gsd-print-notifications-manager.c
+index 96285bc..fc557a1 100644
+--- a/plugins/print-notifications/gsd-print-notifications-manager.c
++++ b/plugins/print-notifications/gsd-print-notifications-manager.c
+@@ -405,6 +405,10 @@ on_cups_notification (GDBusConnection *connection,
+                         g_free (job_uri);
+                 }
+         }
++        else {
++                g_warning ("Invalid number of parameters for signal '%s'", signal_name);
++                return;
++        }
+ 
+         if (g_strcmp0 (signal_name, "PrinterAdded") == 0) {
+                 cupsFreeDests (manager->priv->num_dests, manager->priv->dests);
+-- 
+1.7.8
+
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.2.1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.2.2-r1.ebuild
index 768974c652bb..fd0042d995bc 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.2.1.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.2.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.2.1.ebuild,v 1.1 2011/10/29 02:11:41 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.2.2-r1.ebuild,v 1.1 2011/12/12 00:37:28 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.gnome.org"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="+colord +cups debug packagekit policykit short-touchpad-timeout smartcard +udev"
+IUSE="+colord +cups debug packagekit policykit +short-touchpad-timeout smartcard +udev"
 
 # Latest gsettings-desktop-schemas is needed due to commit e8d1de92
 # Latest gnome-desktop needed to fix the DPMS timeout bug #385063
@@ -95,9 +95,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# Upstream patch to fix undefined symbol, will be in next release
-	epatch "${FILESDIR}/${P}-WEXITSTATUS.patch"
-
 	# Backport patch from git master branch (not in gnome-3-2 branch yet)
 	# fixing loading color profiles at startup
 	epatch "${FILESDIR}/${PN}-3.2.0-color-unbreak-loading-profiles.patch"
@@ -111,6 +108,13 @@ src_prepare() {
 
 	# Make colord optional; requires eautoreconf
 	epatch "${FILESDIR}/${PN}-3.2.1-optional-colord.patch"
+
+	# Fix inability to add displays without EDID data; in next release
+	epatch "${FILESDIR}/${P}-color-unavailable-edid.patch"
+
+	# Fix crash with cups-1.5.0; will be in next release
+	epatch "${FILESDIR}/${P}-print-notifications-malformed-dbus.patch"
+
 	eautoreconf
 
 	gnome2_src_prepare