From 86d764b24bf43293304f09ca03fed007214bd6f8 Mon Sep 17 00:00:00 2001 From: Tomas Bzatek Date: Wed, 11 May 2011 17:44:26 +0200 Subject: [PATCH] Update to 3.1.1 --- .gitignore | 1 + ...atetime-Fix-setting-NTP-on-Fedora-15.patch | 27 ------------ ...ys-Fix-crash-when-keybindings-change.patch | 28 ------------ ...h-absence-of-gnome-session-gracefull.patch | 44 ------------------- gnome-settings-daemon.spec | 20 ++++----- sources | 2 +- 6 files changed, 11 insertions(+), 111 deletions(-) delete mode 100644 0001-datetime-Fix-setting-NTP-on-Fedora-15.patch delete mode 100644 0001-media-keys-Fix-crash-when-keybindings-change.patch delete mode 100644 0001-updates-deal-with-absence-of-gnome-session-gracefull.patch diff --git a/.gitignore b/.gitignore index c51c3a2..2be3298 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ gnome-settings-daemon-2.31.6.tar.bz2 /gnome-settings-daemon-3.0.0.tar.bz2 /gnome-settings-daemon-3.0.0.1.tar.bz2 /gnome-settings-daemon-3.0.1.tar.bz2 +/gnome-settings-daemon-3.1.1.tar.bz2 diff --git a/0001-datetime-Fix-setting-NTP-on-Fedora-15.patch b/0001-datetime-Fix-setting-NTP-on-Fedora-15.patch deleted file mode 100644 index d78e1eb..0000000 --- a/0001-datetime-Fix-setting-NTP-on-Fedora-15.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 2c748a6d841dc2b673df975b28ebffcbe76b4bce Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Thu, 28 Apr 2011 15:51:13 +0100 -Subject: [PATCH] datetime: Fix setting NTP on Fedora 15 - -https://bugzilla.gnome.org/show_bug.cgi?id=648556 ---- - plugins/datetime/gsd-datetime-mechanism.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -diff --git a/plugins/datetime/gsd-datetime-mechanism.c b/plugins/datetime/gsd-datetime-mechanism.c -index 2c43a4a..6ea8d83 100644 ---- a/plugins/datetime/gsd-datetime-mechanism.c -+++ b/plugins/datetime/gsd-datetime-mechanism.c -@@ -745,7 +745,8 @@ gsd_datetime_mechanism_set_using_ntp (GsdDatetimeMechanism *mechanism, - return FALSE; - - if (g_file_test ("/sbin/chkconfig", G_FILE_TEST_EXISTS)) /* Fedora */ -- cmd = g_strconcat ("/sbin/chkconfig --level 2345 ntpd ", using_ntp ? "on" : "off", NULL); -+ /* We omit --level 2345 so that systemd doesn't try to use the SysV init scripts */ -+ cmd = g_strconcat ("/sbin/chkconfig ntpd ", using_ntp ? "on" : "off", NULL); - else if (g_file_test ("/usr/sbin/update-rc.d", G_FILE_TEST_EXISTS)) /* Debian */ - cmd = g_strconcat ("/usr/sbin/update-rc.d ntp ", using_ntp ? "enable" : "disable", NULL); - else { --- -1.7.4.4 - diff --git a/0001-media-keys-Fix-crash-when-keybindings-change.patch b/0001-media-keys-Fix-crash-when-keybindings-change.patch deleted file mode 100644 index 4c6742c..0000000 --- a/0001-media-keys-Fix-crash-when-keybindings-change.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 89b4b516edfd5ec19f8987d63624c28fc2f30f8f Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Wed, 16 Feb 2011 16:26:45 +0000 -Subject: [PATCH] media-keys: Fix crash when keybindings change - -We need to skip over hard-coded keys which don't have a -key name. ---- - plugins/media-keys/gsd-media-keys-manager.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c -index 1c1b2cf..7d42f49 100644 ---- a/plugins/media-keys/gsd-media-keys-manager.c -+++ b/plugins/media-keys/gsd-media-keys-manager.c -@@ -292,6 +292,9 @@ update_kbd_cb (GSettings *settings, - - /* Find the key that was modified */ - for (i = 0; i < HANDLED_KEYS; i++) { -+ /* Skip over hard-coded keys */ -+ if (keys[i].settings_key == NULL) -+ continue; - if (strcmp (key, keys[i].settings_key) == 0) { - char *tmp; - Key *key; --- -1.7.4 - diff --git a/0001-updates-deal-with-absence-of-gnome-session-gracefull.patch b/0001-updates-deal-with-absence-of-gnome-session-gracefull.patch deleted file mode 100644 index 6d4347c..0000000 --- a/0001-updates-deal-with-absence-of-gnome-session-gracefull.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 5de806c640d812041d0174307c628e0385c81561 Mon Sep 17 00:00:00 2001 -From: Matthias Clasen -Date: Mon, 2 May 2011 14:23:53 -0400 -Subject: [PATCH] updates: deal with absence of gnome-session gracefully - -This was leading to crashes when g-s-d got started under xfce. ---- - plugins/updates/gsd-updates-refresh.c | 13 +++++++++---- - 1 files changed, 9 insertions(+), 4 deletions(-) - -diff --git a/plugins/updates/gsd-updates-refresh.c b/plugins/updates/gsd-updates-refresh.c -index 15e6917..60d5f80 100644 ---- a/plugins/updates/gsd-updates-refresh.c -+++ b/plugins/updates/gsd-updates-refresh.c -@@ -560,7 +560,7 @@ gsd_updates_refresh_init (GsdUpdatesRefresh *refresh) - /* use gnome-session for the idle detection */ - refresh->priv->proxy_session = - g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION, -- G_DBUS_PROXY_FLAGS_NONE, -+ G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START, - NULL, /* GDBusInterfaceInfo */ - "org.gnome.SessionManager", - "/org/gnome/SessionManager/Presence", -@@ -578,9 +578,14 @@ gsd_updates_refresh_init (GsdUpdatesRefresh *refresh) - refresh); - status = g_dbus_proxy_get_cached_property (refresh->priv->proxy_session, - "status"); -- g_variant_get (status, "u", &status_code); -- refresh->priv->session_idle = (status_code == PRESENCE_STATUS_IDLE); -- g_variant_unref (status); -+ if (status) { -+ g_variant_get (status, "u", &status_code); -+ refresh->priv->session_idle = (status_code == PRESENCE_STATUS_IDLE); -+ g_variant_unref (status); -+ } -+ else { -+ refresh->priv->session_idle = FALSE; -+ } - } - - /* we check this in case we miss one of the async signals */ --- -1.7.5 - diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec index 7cefdb1..fd51f13 100644 --- a/gnome-settings-daemon.spec +++ b/gnome-settings-daemon.spec @@ -1,13 +1,13 @@ Name: gnome-settings-daemon -Version: 3.0.1 -Release: 5%{?dist} +Version: 3.1.1 +Release: 1%{?dist} Summary: The daemon sharing settings from GNOME to GTK+/KDE applications Group: System Environment/Daemons License: GPLv2+ URL: http://download.gnome.org/sources/%{name} #VCS: git:git://git.gnome.org/gnome-settings-daemon -Source: http://download.gnome.org/sources/%{name}/3.0/%{name}-%{version}.tar.bz2 +Source: http://download.gnome.org/sources/%{name}/3.1/%{name}-%{version}.tar.bz2 Requires(pre): GConf2 >= 2.14 Requires(preun): GConf2 >= 2.14 @@ -18,7 +18,7 @@ Requires: system-config-printer-udev BuildRequires: dbus-glib-devel BuildRequires: GConf2-devel -BuildRequires: gtk3-devel >= 2.99.0 +BuildRequires: gtk3-devel >= 2.99.3 BuildRequires: gnome-desktop3-devel BuildRequires: xorg-x11-proto-devel libXxf86misc-devel BuildRequires: gstreamer-devel @@ -30,7 +30,7 @@ BuildRequires: gettext intltool BuildRequires: fontconfig-devel BuildRequires: libcanberra-devel BuildRequires: polkit-devel -BuildRequires: autoconf automake libtool +# BuildRequires: autoconf automake libtool BuildRequires: libxklavier-devel BuildRequires: gsettings-desktop-schemas-devel >= 0.1.7 BuildRequires: PackageKit-glib-devel @@ -39,9 +39,6 @@ BuildRequires: upower-devel BuildRequires: libgudev1-devel BuildRequires: nss-devel -Patch0: 0001-datetime-Fix-setting-NTP-on-Fedora-15.patch -Patch1: 0001-updates-deal-with-absence-of-gnome-session-gracefull.patch - %description A daemon to share settings from GNOME to other applications. It also handles global keybindings, as well as a number of desktop-wide settings. @@ -58,10 +55,8 @@ developing applications that use %{name}. %prep %setup -q -%patch0 -p1 -b .sysv -%patch1 -p1 -b .updates-crash -autoreconf -i -f +# autoreconf -i -f %build # https://fedoraproject.org/wiki/Features/ChangeInImplicitDSOLinking @@ -202,6 +197,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_datadir}/gnome-settings-daemon-3.0/input-device-example.sh %changelog +* Wed May 11 2011 Tomas Bzatek - 3.1.1-1 +- Update to 3.1.1 + * Sat May 07 2011 Christopher Aillon - 3.0.1-5 - Update gsettings schema scriptlet diff --git a/sources b/sources index 5bba4a6..4978d73 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6407fa30e1f36481d3fe7de50f61d535 gnome-settings-daemon-3.0.1.tar.bz2 +58b33c712ae530c143434c0222efdc74 gnome-settings-daemon-3.1.1.tar.bz2