rpms/gnome-settings-daemon/devel xrandr-missingok.patch, NONE, 1.1 gnome-settings-daemon.spec, 1.22, 1.23
Matthias Clasen (mclasen)
fedora-extras-commits at redhat.com
Tue Apr 22 17:54:56 UTC 2008
Author: mclasen
Update of /cvs/extras/rpms/gnome-settings-daemon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1554
Modified Files:
gnome-settings-daemon.spec
Added Files:
xrandr-missingok.patch
Log Message:
Fix xrandr absence bringing down g-s-d
xrandr-missingok.patch:
--- NEW FILE xrandr-missingok.patch ---
diff -up gnome-settings-daemon-2.22.1/plugins/xrandr/gsd-xrandr-manager.c.xrandr-missingok gnome-settings-daemon-2.22.1/plugins/xrandr/gsd-xrandr-manager.c
--- gnome-settings-daemon-2.22.1/plugins/xrandr/gsd-xrandr-manager.c.xrandr-missingok 2008-04-22 13:39:45.000000000 -0400
+++ gnome-settings-daemon-2.22.1/plugins/xrandr/gsd-xrandr-manager.c 2008-04-22 13:39:50.000000000 -0400
@@ -146,6 +146,11 @@ gsd_xrandr_manager_start (GsdXrandrManag
{
g_debug ("Starting xrandr manager");
+ if (manager->priv->rw_screen == NULL) {
+ g_set_error (error, 0, 0, "Failed to initialize XRandr extension");
+ return FALSE;
+ }
+
manager->priv->running = TRUE;
if (manager->priv->keycode) {
Index: gnome-settings-daemon.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-settings-daemon/devel/gnome-settings-daemon.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- gnome-settings-daemon.spec 5 Apr 2008 17:46:30 -0000 1.22
+++ gnome-settings-daemon.spec 22 Apr 2008 17:54:20 -0000 1.23
@@ -1,6 +1,6 @@
Name: gnome-settings-daemon
Version: 2.22.1
-Release: 0.2008.03.26.5%{?dist}
+Release: 0.2008.03.26.6%{?dist}
Summary: The daemon sharing settings from GNOME to GTK+/KDE applications
Group: System Environment/Daemons
@@ -34,6 +34,8 @@
# http://bugzilla.gnome.org/show_bug.cgi?id=524499
Patch3: gsd-mouse-too-much-grab.patch
Patch4: gnome-settings-daemon-2.22.1-hide-white-screen.patch
+# survive xrandr being absent (such as on Xnest in sabayon)
+Patch5: xrandr-missingok.patch
%description
A daemon to share settings from GNOME to other applications. It also
@@ -59,6 +61,7 @@
%patch3 -p0 -b .no-eat-keys
popd
%patch4 -p1 -b .hide-white-screen
+%patch5 -p1 -b .xrandr-missingok
%build
%configure --enable-static=no --enable-profiling
@@ -140,6 +143,9 @@
%{_libdir}/pkgconfig/gnome-settings-daemon.pc
%changelog
+* Tue Apr 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.22.1-2008.03.26.6
+- Make the xrandr plugin survive the absence of Xrandr
+
* Sat Apr 5 2008 - Soren Sandmann <sandmann at redhat.com> - 2.22.1-2008.03.26.5
- Update randr plugin
More information about the scm-commits
mailing list