From 668528681150dc47b10d0196527f6093a0e75891 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@fedoraproject.org>
Date: Aug 25 2008 17:52:00 +0000
Subject: - gnome-desktop-2.23.90-eedid.patch: Allow E-EDID blocks.


---

diff --git a/gnome-desktop-2.23.90-eedid.patch b/gnome-desktop-2.23.90-eedid.patch
new file mode 100644
index 0000000..4161fd8
--- /dev/null
+++ b/gnome-desktop-2.23.90-eedid.patch
@@ -0,0 +1,12 @@
+diff -up gnome-desktop-2.23.90/libgnome-desktop/gnome-rr.c.jx gnome-desktop-2.23.90/libgnome-desktop/gnome-rr.c
+--- gnome-desktop-2.23.90/libgnome-desktop/gnome-rr.c.jx	2008-08-18 16:09:40.000000000 -0400
++++ gnome-desktop-2.23.90/libgnome-desktop/gnome-rr.c	2008-08-25 13:49:31.000000000 -0400
+@@ -638,7 +638,7 @@ read_edid_data (GnomeRROutput *output)
+     
+     if (result)
+     {
+-	if (len == 128)
++	if (len % 128 == 0)
+ 	    return result;
+ 	else
+ 	    g_free (result);
diff --git a/gnome-desktop.spec b/gnome-desktop.spec
index 7b151ea..eaea27e 100644
--- a/gnome-desktop.spec
+++ b/gnome-desktop.spec
@@ -12,13 +12,15 @@
 Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc
 Name: gnome-desktop
 Version: 2.23.90
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-desktop/2.23/%{name}-%{version}.tar.bz2
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch0: gnome-desktop-2.23.90-eedid.patch
+
 Requires: redhat-menus
 Requires: pycairo
 Requires: pygtk2
@@ -70,6 +72,7 @@ libgnomedesktop.
 
 %prep
 %setup -q
+%patch0 -p1 -b .eedid
 
 %build
 %configure --with-gnome-distributor="Red Hat, Inc" --disable-scrollkeeper
@@ -115,6 +118,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_datadir}/gtk-doc/html/gnome-desktop/
 
 %changelog
+* Mon Aug 25 2008 Adam Jackson <ajax@redhat.com> 2.23.90-3
+- gnome-desktop-2.23.90-eedid.patch: Allow E-EDID blocks.
+
 * Sat Aug 23 2008 Matthias Clasen <mclasen@redhat.com> - 2.23.90-2
 - Require enough python to make gnome-about work