diff --git a/detect-monitors-dammit.patch b/detect-monitors-dammit.patch new file mode 100644 index 0000000..793225a --- /dev/null +++ b/detect-monitors-dammit.patch @@ -0,0 +1,15 @@ +diff -up gnome-desktop-2.25.91/libgnome-desktop/gnome-rr.c.detect-monitors-dammit gnome-desktop-2.25.91/libgnome-desktop/gnome-rr.c +--- gnome-desktop-2.25.91/libgnome-desktop/gnome-rr.c.detect-monitors-dammit 2009-02-19 22:28:03.396165019 -0500 ++++ gnome-desktop-2.25.91/libgnome-desktop/gnome-rr.c 2009-02-19 22:28:12.504914496 -0500 +@@ -362,11 +362,7 @@ fill_out_screen_info (Display *xdisplay, + screen->min_height, screen->max_height); + #endif + +-#if (RANDR_MAJOR == 1 && RANDR_MINOR >= 3) +- resources = XRRGetScreenResourcesCurrent (xdisplay, xroot); +-#else + resources = XRRGetScreenResources (xdisplay, xroot); +-#endif + + if (resources) + { diff --git a/gnome-desktop.spec b/gnome-desktop.spec index 07b029a..9170e3d 100644 --- a/gnome-desktop.spec +++ b/gnome-desktop.spec @@ -12,7 +12,7 @@ Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc Name: gnome-desktop Version: 2.25.91 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://www.gnome.org Source0: http://download.gnome.org/sources/gnome-desktop/2.25/%{name}-%{version}.tar.bz2 License: GPLv2+ and LGPLv2+ @@ -43,6 +43,9 @@ BuildRequires: gettext BuildRequires: gtk-doc >= %{gtk_doc_version} BuildRequires: automake autoconf libtool intltool +# http://bugzilla.gnome.org/show_bug.cgi?id=568160 +Patch0: detect-monitors-dammit.patch + %description The gnome-desktop package contains an internal library @@ -72,8 +75,7 @@ libgnomedesktop. %prep %setup -q - -autoreconf -i -f +%patch -p0 -b .detect-monitors-dammit %build %configure --with-gnome-distributor="Red Hat, Inc" --disable-scrollkeeper @@ -119,6 +121,9 @@ rm -rf $RPM_BUILD_ROOT %doc %{_datadir}/gtk-doc/html/gnome-desktop/ %changelog +* Thu Feb 19 2009 Matthias Clasen - 2.25.91-2 +- Fix the Detect Monitors button + * Thu Feb 19 2009 Matthias Clasen - 2.25.91-1 - Update to 2.25.91