diff -Nru gnome-desktop3-3.4.2/debian/changelog gnome-desktop3-3.4.2/debian/changelog --- gnome-desktop3-3.4.2/debian/changelog 2012-07-17 16:10:07.000000000 +0000 +++ gnome-desktop3-3.4.2/debian/changelog 2013-12-05 20:31:24.000000000 +0000 @@ -1,3 +1,10 @@ +gnome-desktop3 (3.4.2-0ubuntu0.2) precise-proposed; urgency=low + + * debian/patches/ignore_errors_with_primary_outputs.patch: + - Ignore failures when setting the primary output (LP: #1224254). + + -- Alberto Milone Tue, 03 Dec 2013 16:30:22 +0100 + gnome-desktop3 (3.4.2-0ubuntu0.1) precise-proposed; urgency=low * New upstream version diff -Nru gnome-desktop3-3.4.2/debian/control gnome-desktop3-3.4.2/debian/control --- gnome-desktop3-3.4.2/debian/control 2012-07-17 16:16:00.000000000 +0000 +++ gnome-desktop3-3.4.2/debian/control 2013-12-05 20:31:28.000000000 +0000 @@ -2,7 +2,6 @@ # # Modifications should be made to debian/control.in instead. # This file is regenerated automatically in the clean target. - Source: gnome-desktop3 Section: gnome Priority: optional diff -Nru gnome-desktop3-3.4.2/debian/patches/ignore_errors_with_primary_outputs.patch gnome-desktop3-3.4.2/debian/patches/ignore_errors_with_primary_outputs.patch --- gnome-desktop3-3.4.2/debian/patches/ignore_errors_with_primary_outputs.patch 1970-01-01 00:00:00.000000000 +0000 +++ gnome-desktop3-3.4.2/debian/patches/ignore_errors_with_primary_outputs.patch 2013-12-03 16:10:30.000000000 +0000 @@ -0,0 +1,38 @@ +From b55e67080d05bd21097f684c91b1e7cbc0a991fc Mon Sep 17 00:00:00 2001 +From: Alberto Milone +Date: Tue, 3 Dec 2013 15:48:04 +0100 +Subject: [PATCH 1/1] gnome-rr.c: ignore the error if setting the primary + output fails + +We already trap and ignore the error when detecting the primary +output, so, according to the same logic, we should do the same +when trying to set the primary output. + +This helps with drivers such as modesetting that do not play +well with primary outputs (LP: #1224254). + +Upstream bug report: https://bugzilla.gnome.org/show_bug.cgi?id=719784 +--- + libgnome-desktop/gnome-rr.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/libgnome-desktop/gnome-rr.c b/libgnome-desktop/gnome-rr.c +index 5ae52b2..09e44cd 100644 +--- a/libgnome-desktop/gnome-rr.c ++++ b/libgnome-desktop/gnome-rr.c +@@ -2148,8 +2148,11 @@ gnome_rr_screen_set_primary_output (GnomeRRScreen *screen, + else + id = None; + +- if (SERVERS_RANDR_IS_AT_LEAST_1_3 (priv)) ++ if (SERVERS_RANDR_IS_AT_LEAST_1_3 (priv)) { ++ gdk_error_trap_push (); + XRRSetOutputPrimary (priv->xdisplay, priv->xroot, id); ++ gdk_error_trap_pop_ignored (); ++ } + } + + /* GnomeRRCrtc */ +-- +1.7.9.5 + diff -Nru gnome-desktop3-3.4.2/debian/patches/series gnome-desktop3-3.4.2/debian/patches/series --- gnome-desktop3-3.4.2/debian/patches/series 2012-07-17 16:05:25.000000000 +0000 +++ gnome-desktop3-3.4.2/debian/patches/series 2013-12-03 15:29:49.000000000 +0000 @@ -3,3 +3,4 @@ tweak_color_computation.patch 04_compute_average_color.patch git_dfp_is_not_laptop_screen.patch +ignore_errors_with_primary_outputs.patch