rpms/gnome-settings-daemon
5
0
Fork 0
Code Issues Pull Requests Releases Activity

2.23.90

Browse Source
This commit is contained in:
Matthias Clasen 2008-08-23 02:35:24 +00:00
parent 756389ea9d
commit 001a4b6786
4 changed files with 7 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

@ -1 +1 @@
gnome-settings-daemon-2.23.6.tar.bz2 gnome-settings-daemon-2.23.90.tar.bz2

11
gnome-settings-daemon.spec
View File

@ -1,6 +1,6 @@
Name: gnome-settings-daemon Name: gnome-settings-daemon
Version: 2.23.6 Version: 2.23.90
Release: 3%{?dist} Release: 1%{?dist}
Summary: The daemon sharing settings from GNOME to GTK+/KDE applications Summary: The daemon sharing settings from GNOME to GTK+/KDE applications
Group: System Environment/Daemons Group: System Environment/Daemons
@ -31,9 +31,6 @@ BuildRequires: perl(XML::Parser)
BuildRequires: intltool BuildRequires: intltool
Patch2: gnome-settings-daemon-2.21.91-ignore-model-if-evdev.patch Patch2: gnome-settings-daemon-2.21.91-ignore-model-if-evdev.patch
# survive xrandr being absent (such as on Xnest in sabayon)
# http://bugzilla.gnome.org/show_bug.cgi?id=546446
Patch5: xrandr-missingok.patch
Patch6: gnome-settings-daemon-2.23.4-drop-sample-cache.patch Patch6: gnome-settings-daemon-2.23.4-drop-sample-cache.patch
%description %description
@ -55,7 +52,6 @@ developing applications that use %{name}.
%setup -q %setup -q
%patch2 -p1 -b .ignore-layout-if-using-evdev %patch2 -p1 -b .ignore-layout-if-using-evdev
%patch5 -p1 -b .xrandr-missingok
%patch6 -p1 -b .drop-sample-cache %patch6 -p1 -b .drop-sample-cache
%build %build
@ -156,6 +152,9 @@ fi
%{_libdir}/pkgconfig/gnome-settings-daemon.pc %{_libdir}/pkgconfig/gnome-settings-daemon.pc
%changelog %changelog
* Fri Aug 22 2008 Matthias Clasen <mclasne@redhat.com> - 2.23.90-1
- Update to 2.23.90
* Thu Aug 14 2008 Lennart Poettering <lpoetter@redhat.com> - 2.23.6-3 * Thu Aug 14 2008 Lennart Poettering <lpoetter@redhat.com> - 2.23.6-3
- Rerun autotools after patching configure.ac - Rerun autotools after patching configure.ac

2
sources
View File

@ -1 +1 @@
0064d0572803c4682733034eadc03d20 gnome-settings-daemon-2.23.6.tar.bz2 fa13f79d1e9adea1e8f3e85107cd045e gnome-settings-daemon-2.23.90.tar.bz2

16
xrandr-missingok.patch
View File

@ -1,16 +0,0 @@
diff -up gnome-settings-daemon-2.23.6/plugins/xrandr/gsd-xrandr-manager.c.xrandr-missingok gnome-settings-daemon-2.23.6/plugins/xrandr/gsd-xrandr-manager.c
--- gnome-settings-daemon-2.23.6/plugins/xrandr/gsd-xrandr-manager.c.xrandr-missingok 2008-08-04 10:25:53.000000000 -0400
+++ gnome-settings-daemon-2.23.6/plugins/xrandr/gsd-xrandr-manager.c 2008-08-05 13:25:25.000000000 -0400
@@ -296,6 +296,12 @@ 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;
manager->priv->client = gconf_client_get_default ();