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

Package-Manager: portage-2.2.0_alpha80/cvs/Linux x86_64

6 files changed, 94 insertions, 34 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/Manifest b/gnome-base/gnome-settings-daemon/Manifest
index 206d01e51c4b..c73c0f36d6e2 100644
--- a/gnome-base/gnome-settings-daemon/Manifest
+++ b/gnome-base/gnome-settings-daemon/Manifest
@@ -9,21 +9,21 @@ AUX gnome-settings-daemon-2.32.1-netfs-monitor.patch 1753 RMD160 af98d9b35a2f974
 AUX gnome-settings-daemon-2.32.1-syndaemon-mode.patch 1612 RMD160 1ec1582c3e1565e128c8124510a0d9f10432a9fc SHA1 10c05a986f34147d2b17c2c20a5910ac13633c0e SHA256 1ac8939aa161c9a9737f5bdf68ccfdc923944802a864cd76dcc8655fa5b129e0
 AUX gnome-settings-daemon-3.0.2-short-touchpad-timeout.patch 519 RMD160 a1f9801351d469aed5f626787c1ce1917468fda7 SHA1 4100b4d7c0e4f3fd85afe3eb4b0fc4e258e7edea SHA256 94c82c7f1b213af232bd1a401ddcaef1578dc7cc70ce3258e73887e438532133
 AUX gnome-settings-daemon-3.2.0-color-unbreak-loading-profiles.patch 1595 RMD160 70df7f86b947ed569307ac8df8ec73f0b224cef0 SHA1 0e86ec669d19597c7b36fa76cc383dfadafcb0e6 SHA256 14a6f7e5593186a41f8e0a391708b433367e9d86015f559f28a87fd39a8f3195
-AUX gnome-settings-daemon-3.2.1-WEXITSTATUS.patch 667 RMD160 7360ac29861f96fc198d47967d370062639d22ef SHA1 6ccefe15ece8970661a8e09bdac2706bb1190329 SHA256 cdbae4bc1ed795e014aa03dd59dd00971d3ae5fecfc926af31318a6889c403db
 AUX gnome-settings-daemon-3.2.1-optional-colord.patch 2934 RMD160 cefc964b1c6449807043977b81ac4f593f37b7e3 SHA1 e1fa059374a429fe532af88f3a490d0ad5a2153a SHA256 2eb0e6cffd2fc579ece5cbe36950a28e9831d63764d8b5fae89df711ead4bf52
+AUX gnome-settings-daemon-3.2.2-color-unavailable-edid.patch 1311 RMD160 76d5fca7a75fc2fdcf7bc023f6a05280cfe3e1eb SHA1 d98b53d0909a9d3b14a1bf3678808547701e7869 SHA256 363257a18536cf1de0f28e2659649d40cf8c0de5d2de4dde25407b4b3b53d510
+AUX gnome-settings-daemon-3.2.2-print-notifications-malformed-dbus.patch 1361 RMD160 f81bea3a3121f0bcc3f6952fbf1f90521ebfcd3e SHA1 45c86a6348232363f35335a77cb431064eb8cffa SHA256 fca67486fe20bbc37e65d8e14fe1fae9c5b9677f9788e764f7634a28b04c3b1b
 DIST gnome-settings-daemon-2.32.1-gst-vol-control-support.patch 26788 RMD160 059f8e3e69990cf7f6f3e63159ab8d43f2f4f78a SHA1 5a734843d2094dccdb17014485ac20171193e130 SHA256 689f6152d6e27ddc0b8080d5c8c1644b6116075ff505951631af9b7289d2f933
 DIST gnome-settings-daemon-2.32.1.tar.bz2 1331850 RMD160 71aef9419eeca5f9fa59bb55990327c307f9ca31 SHA1 f2550acb4a9fd8f96ead1263ba5739915c303f6e SHA256 0074b3fec3ad6e3ab91a05dc20906b06101ea8bca0cd2caf394a5cc141b05e86
-DIST gnome-settings-daemon-3.2.1.tar.xz 1418420 RMD160 ce15088f308ae96fb10975a66bcb55bea68d6eab SHA1 1526741dbdcf20a20aa4e78df483e6df881b52b5 SHA256 1015b8a12483e91ddc67e891b66207a70339a341a051507aad9a6a15fbfcb78d
 DIST gnome-settings-daemon-3.2.2.tar.xz 1417364 RMD160 89b5fe84d337fb241a26f658e6daa35faf1fddc1 SHA1 fd79b7f8d28a5d448839e11960c9e07f0cef6ae5 SHA256 d91cac869e23f36942720485f04c3029fd5286fafb6ad12b07377e527b1f6884
 EBUILD gnome-settings-daemon-2.32.1-r2.ebuild 3945 RMD160 7b1a2738bfb1f3aa93beb2dd491d7a9d6baa4c85 SHA1 00d4145ea4860302867b95ee084214eb63461117 SHA256 bc133cd3e553fdda97e52479efdf29a100ae5941e8c39fb11bd36161af993c05
-EBUILD gnome-settings-daemon-3.2.1.ebuild 3995 RMD160 286e899fe4310424c20637730b473ba901716c77 SHA1 f13d080d1cb856436451970edb3debeb2bc92c4f SHA256 5df33b8a8835fb48acac5d40d4522f5b6684ae7690e1f241c61b0458bb0a0968
+EBUILD gnome-settings-daemon-3.2.2-r1.ebuild 4135 RMD160 47e19dfc6c5949b4e2066ab47586c6b97a605f34 SHA1 3e1c3247b24a94fa180fdc8347b8e6c3270b1af5 SHA256 75d044c6b516843a42644e79554b0ca524e6ab57c7955a53b495cdaaf8412fd2
 EBUILD gnome-settings-daemon-3.2.2.ebuild 3883 RMD160 1a869ae34e0e0c90270180bd812d499334bf0ca5 SHA1 0d8ee66f897be99a27f623d489426162dab375fa SHA256 400f6d0b3c20e3e328b8b3871fbed93a1c850cc30ef49a6f4c8473dd4a044862
-MISC ChangeLog 19440 RMD160 1ded3d5531722371649e9cca4f16541be5e6d745 SHA1 e4e9a26a2b14271fba06c4829077d4edc7ad54ff SHA256 84b26b56d3fbc513afc288ce85e8baf33acef5841213a725f6c063a05bac5748
+MISC ChangeLog 19946 RMD160 147a6a2594ebfdb08a2c5f2138bcf2b48efd394c SHA1 9e6116bfb958a7bfa9dc4f3721282aec2a0c77af SHA256 b06c644b9c78d6d612073bdb5b93e29d04ba83f34f1663348a381f090df47cf5
 MISC metadata.xml 507 RMD160 da190ee6888fff3a8db0629c5c45ebd2235bf3fe SHA1 f7e7d8aa01ccdb946e6f7055992ac7f1da807815 SHA256 095c7487bf2ebadd2b70038c9f65724c2c4c6860a5b0da0096264e50a4e36480
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk7T0osACgkQdjK8w9WeBnD/6AD/R3v87HXyB0DV7MXCtQ95SPAV
-FkvjAbn8j1xPXLsuQNkA/1jCEkFKEgAKZJmX0GHFN2fJTmvuu0u9SNZIULYD5mut
-=PD2H
+iF4EAREIAAYFAk7lTNUACgkQdjK8w9WeBnAxKwEAtJJqh6SEbALRKqwg/P2bmmJ+
+hXCwDoyD+A9dpVkRGBIA/2Fc6OgEvB1NJ2g6jDRcOnvAU2ONtTnQEIlxM/7Ak/YM
+=riIB
 -----END PGP SIGNATURE-----
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