diff --git a/gnome-desktop-2.27.3-edid-prop-name.patch b/gnome-desktop-2.27.3-edid-prop-name.patch new file mode 100644 index 0000000..4f53280 --- /dev/null +++ b/gnome-desktop-2.27.3-edid-prop-name.patch @@ -0,0 +1,38 @@ +commit d9f0cca94f16628cb273cadfe25bd5998ac3c178 +Author: Adam Jackson +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) diff --git a/gnome-desktop.spec b/gnome-desktop.spec index 87b5529..af78b35 100644 --- a/gnome-desktop.spec +++ b/gnome-desktop.spec @@ -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 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 - 2.26.3-1 - Update to 2.26.3 - http://download.gnome.org/sources/gnome-desktop/2.26/gnome-desktop-2.26.3.news