diff --git a/.gitignore b/.gitignore index 47893fe..cb9b62c 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ gnome-settings-daemon-2.31.6.tar.bz2 /gnome-settings-daemon-2.91.2.1.tar.bz2 /gnome-settings-daemon-2.91.3.tar.bz2 /gnome-settings-daemon-2.91.4.tar.bz2 +/gnome-settings-daemon-2.91.5.tar.bz2 diff --git a/0001-daemon-Don-t-pass-NULL-strings-to-g_variant_new.patch b/0001-daemon-Don-t-pass-NULL-strings-to-g_variant_new.patch deleted file mode 100644 index 5ef3b68..0000000 --- a/0001-daemon-Don-t-pass-NULL-strings-to-g_variant_new.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 7738a45499e658cd004ae45a58c2c3e39e3ef812 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Fri, 26 Nov 2010 00:08:21 +0000 -Subject: [PATCH] daemon: Don't pass NULL strings to g_variant_new() - ---- - gnome-settings-daemon/main.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/gnome-settings-daemon/main.c b/gnome-settings-daemon/main.c -index 2391ccf..780f5ca 100644 ---- a/gnome-settings-daemon/main.c -+++ b/gnome-settings-daemon/main.c -@@ -114,7 +114,7 @@ got_session_proxy (GObject *source_object, - startup_id = g_getenv ("DESKTOP_AUTOSTART_ID"); - g_dbus_proxy_call (proxy, - "RegisterClient", -- g_variant_new ("(ss)", "gnome-settings-daemon", startup_id), -+ g_variant_new ("(ss)", "gnome-settings-daemon", startup_id ? startup_id : ""), - G_DBUS_CALL_FLAGS_NONE, - -1, - NULL, --- -1.7.3.2 - diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec index 6518832..837aeea 100644 --- a/gnome-settings-daemon.spec +++ b/gnome-settings-daemon.spec @@ -1,6 +1,6 @@ Name: gnome-settings-daemon -Version: 2.91.4 -Release: 2%{?dist} +Version: 2.91.5 +Release: 1%{?dist} Summary: The daemon sharing settings from GNOME to GTK+/KDE applications Group: System Environment/Daemons @@ -32,8 +32,6 @@ BuildRequires: autoconf automake libtool BuildRequires: libxklavier-devel BuildRequires: gsettings-desktop-schemas-devel >= 0.0.2 -Patch0: 0001-daemon-Don-t-pass-NULL-strings-to-g_variant_new.patch - # change font rendering #Patch3: slight-hinting.patch @@ -53,7 +51,6 @@ developing applications that use %{name}. %prep %setup -q -%patch0 -p1 -b .gvariant #%patch3 -p1 -b .slight-hinting %build @@ -115,6 +112,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || : %{_libdir}/pkgconfig/gnome-settings-daemon.pc %changelog +* Tue Nov 30 2010 Tomas Bzatek 2.91.5-1 +- Update to 2.91.5 + * Fri Nov 26 2010 Bastien Nocera 2.91.4-2 - Fix crasher on startup diff --git a/sources b/sources index b6f0d92..e189ff5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -17c6150e5df1eea28612b99d7a16245f gnome-settings-daemon-2.91.4.tar.bz2 +b21893a7bafd3225912161940cb2455c gnome-settings-daemon-2.91.5.tar.bz2