rpms/gnome-desktop/F-11 gnome-desktop-2.27.3-edid-prop-name.patch, NONE, 1.1 gnome-desktop.spec, 1.216, 1.217

[Adam Jackson]

Author: ajax

Update of /cvs/pkgs/rpms/gnome-desktop/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7762

Modified Files:
	gnome-desktop.spec 
Added Files:
	gnome-desktop-2.27.3-edid-prop-name.patch 
Log Message:
* Tue Jul 07 2009 Adam Jackson <ajax at redhat.com> 2.26.3-2
- gnome-desktop-2.27.3-edid-prop-name.patch: Adapt to RANDR 1.3's name for the
  EDID property.


gnome-desktop-2.27.3-edid-prop-name.patch:

--- NEW FILE gnome-desktop-2.27.3-edid-prop-name.patch ---
commit d9f0cca94f16628cb273cadfe25bd5998ac3c178
Author: Adam Jackson <ajax at redhat.com>
Date:   Tue Jul 7 18:20:12 2009 -0400

    Adapt to RANDR 1.3's name for the EDID property.
    
    1.2 calls it EDID_DATA, 1.3 calls it EDID.  Try the 1.3 name first since
    1.2 will eventually be rare.

diff --git a/libgnome-desktop/gnome-rr.c b/libgnome-desktop/gnome-rr.c
index a3a8b2c..b788600 100644
--- a/libgnome-desktop/gnome-rr.c
+++ b/libgnome-desktop/gnome-rr.c
@@ -866,13 +866,21 @@ get_property (Display *dpy,
 static guint8 *
 read_edid_data (GnomeRROutput *output)
 {
-    Atom edid_atom = XInternAtom (DISPLAY (output), "EDID_DATA", FALSE);
+    Atom edid_atom;
     guint8 *result;
     int len;
-    
+
+    edid_atom = XInternAtom (DISPLAY (output), "EDID", FALSE);
     result = get_property (DISPLAY (output),
 			   output->id, edid_atom, &len);
-    
+
+    if (!result)
+    {
+	edid_atom = XInternAtom (DISPLAY (output), "EDID_DATA", FALSE);
+	result = get_property (DISPLAY (output),
+			       output->id, edid_atom, &len);
+    }
+
     if (result)
     {
 	if (len % 128 == 0)


Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/F-11/gnome-desktop.spec,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -p -r1.216 -r1.217
--- gnome-desktop.spec	1 Jul 2009 15:57:19 -0000	1.216
+++ gnome-desktop.spec	7 Jul 2009 22:31:07 -0000	1.217
@@ -12,11 +12,13 @@
 Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc
 Name: gnome-desktop
 Version: 2.26.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-desktop/2.26/%{name}-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=581621
 Patch2: pnpids.patch
+# Backport from 2.27.4
+Patch3: gnome-desktop-2.27.3-edid-prop-name.patch
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -75,6 +77,7 @@ libgnomedesktop.
 %prep
 %setup -q
 %patch2 -p1 -b .pnpids.patch
+%patch3 -p1 -b .edid-prop
 
 %build
 %configure --with-gnome-distributor="Red Hat, Inc" --disable-scrollkeeper
@@ -120,6 +123,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_datadir}/gtk-doc/html/gnome-desktop/
 
 %changelog
+* Tue Jul 07 2009 Adam Jackson <ajax at redhat.com> 2.26.3-2
+- gnome-desktop-2.27.3-edid-prop-name.patch: Adapt to RANDR 1.3's name for the
+  EDID property.
+
 * Wed Jul  1 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.3-1
 - Update to 2.26.3
 - http://download.gnome.org/sources/gnome-desktop/2.26/gnome-desktop-2.26.3.news