From 018f56ed1ae69e62c596dee91bc63c50c9b09d9a91f35f39f35bc269ec90601b Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Mon, 17 Oct 2011 21:18:09 +0000 Subject: [PATCH 1/2] Accepting request 88262 from home:dimstar:branches:GNOME:Factory Update to 3.2.1 - bugfixes OBS-URL: https://build.opensuse.org/request/show/88262 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-settings-daemon?expand=0&rev=111 --- gnome-settings-daemon-3.2.0.tar.bz2 | 3 -- gnome-settings-daemon-3.2.1.tar.bz2 | 3 ++ ...aemon-emit-power-signal-to-listeners.patch | 25 --------- gnome-settings-daemon.changes | 53 +++++++++++++++++++ gnome-settings-daemon.spec | 5 +- 5 files changed, 57 insertions(+), 32 deletions(-) delete mode 100644 gnome-settings-daemon-3.2.0.tar.bz2 create mode 100644 gnome-settings-daemon-3.2.1.tar.bz2 delete mode 100644 gnome-settings-daemon-emit-power-signal-to-listeners.patch diff --git a/gnome-settings-daemon-3.2.0.tar.bz2 b/gnome-settings-daemon-3.2.0.tar.bz2 deleted file mode 100644 index 1ebad44..0000000 --- a/gnome-settings-daemon-3.2.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b46161ebd7d194e5a9e3e0e4a4582d13d0d9407f7cd2b9b82a393700e695ac46 -size 1771921 diff --git a/gnome-settings-daemon-3.2.1.tar.bz2 b/gnome-settings-daemon-3.2.1.tar.bz2 new file mode 100644 index 0000000..4a3f9cc --- /dev/null +++ b/gnome-settings-daemon-3.2.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d982dcb144104b9b2ba5bcf0e976e3021ffff760e058cd6ab7a9f4c56afa83be +size 1792146 diff --git a/gnome-settings-daemon-emit-power-signal-to-listeners.patch b/gnome-settings-daemon-emit-power-signal-to-listeners.patch deleted file mode 100644 index e07a8f7..0000000 --- a/gnome-settings-daemon-emit-power-signal-to-listeners.patch +++ /dev/null @@ -1,25 +0,0 @@ -From fffaf9c33100a82a55e8a8b438608347122dba69 Mon Sep 17 00:00:00 2001 -From: Gary Ching-Pang Lin -Date: Fri, 14 Oct 2011 15:58:00 +0800 -Subject: [PATCH] power: Emit 'Changed' signal to all listeners - ---- - plugins/power/gsd-power-manager.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c -index 4072c02..a5fc50d 100644 ---- a/plugins/power/gsd-power-manager.c -+++ b/plugins/power/gsd-power-manager.c -@@ -336,7 +336,7 @@ engine_emit_changed (GsdPowerManager *manager) - if (manager->priv->connection == NULL) - return; - ret = g_dbus_connection_emit_signal (manager->priv->connection, -- GSD_DBUS_SERVICE, -+ NULL, - GSD_POWER_DBUS_PATH, - GSD_POWER_DBUS_INTERFACE, - "Changed", --- -1.7.3.4 - diff --git a/gnome-settings-daemon.changes b/gnome-settings-daemon.changes index 6e88168..22d2cf7 100644 --- a/gnome-settings-daemon.changes +++ b/gnome-settings-daemon.changes @@ -1,3 +1,56 @@ +------------------------------------------------------------------- +Mon Oct 17 18:21:59 CEST 2011 - dimstar@opensuse.org + +- Update to version 3.2.1: + + Common: + - Remove left-over debug (bgo#660073) + + Color: + - Fix a crash if ~/.local is deleted at runtime (bgo#660664) + - Do not load all the color devices twice at startup + - Don't assign the same device more than once at startup + - Fix critical warning if the user disables the internal LCD + screen + - Reset the gamma tables when the screen configuration changes + (bgo#660164) + - Fix 'make check' by including -lm for powf() + + Media keys: + - Use a GCancellable for g_bus_get calls so that they can be + cancelled + - Don't assert if the user sets the 'button-power' action to + 'shutdown' or 'nothing' + - Fix OSD touchpad icon names (bgo#661179) + - Fix suspend button not locking the screen (bgo#660267) + + Power: + - Don't restore the brightness if it's never been set + - Fix two small reference leaks when using the D-Bus interface + - Use a GCancellable for g_bus_get calls so that they can be + cancelled + - Do not sleep-on-idle by default (bgo#660395) + - Do not revert to the pre-idle brightness if idle dimming is + disabled (bgo#660434) + - Ensure the DPMS state is 'on' at startup (bgo#660482) + - Close low-battery notification when plugged in (bgo#660942) + - Don't crash when setting the dim timeout when using NX + (bgo#661000) + - Call XSyncInitialize() in case GTK+ wasn't compiled with + XSync support + - Emit 'Changed' signal to all listeners (bgo#659908) + + Printers: + - Fix build on systems without LC_PAPER (bog#660626) + - Call setlocale() (bgo#660632) + - Exit gsd-printer when session ends (bgo#660158) + - Correct signature when calling PrinterAddOptionDefault + - Don't show "Not connected?" when not needed + - Unown name on the system bus when session goes idle + + Wacom: + - Fix possible crasher (bgo#661170) + + Xrandr: + - Use a GCancellable for g_bus_get calls so that they can be + cancelled + + Updated translations. +- Drop gnome-settings-daemon-emit-power-signal-to-listeners.patch: + fixed upstream. + ------------------------------------------------------------------- Fri Oct 14 08:08:06 UTC 2011 - glin@suse.com diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec index 554ce48..e3ee2a0 100644 --- a/gnome-settings-daemon.spec +++ b/gnome-settings-daemon.spec @@ -18,7 +18,7 @@ Name: gnome-settings-daemon -Version: 3.2.0 +Version: 3.2.1 Release: 1 License: GPLv2+ Summary: Settings daemon for the GNOME desktop @@ -41,8 +41,6 @@ Patch14: gnome-packagekit-fate302445.patch Patch15: gnome-packagekit-BNC383261.patch # PATCH-FIX-OPENSUSE gnome-settings-daemon-stop-reload-proxy-settings.patch bnc689592#c1, bnc#538353 glin@suse.com -- Stop g-s-d poping up the authentication dialog for reloading the proxy settings Patch17: gnome-settings-daemon-stop-reload-proxy-settings.patch -# PATCH-FIX-UPSTREAM gnome-settings-daemon-emit-power-signal-to-listeners.patch bnc#717814, bgo#659908 glin@suse.com -- Emit 'Changed' signal to all power plugin listeners -Patch18: gnome-settings-daemon-emit-power-signal-to-listeners.patch BuildRequires: fdupes BuildRequires: gnome-common # Disabled because of the non-rebased patches @@ -143,7 +141,6 @@ translation-update-upstream # PATCH-NEEDS-REBASE #%%patch15 -p0 %patch17 -p1 -%patch18 -p1 %endif %if 0%{?BUILD_FROM_VCS} From 7a80be5c3d9b5755583b7980d578b942351cc0c18330855c779143622ff77aae Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Tue, 18 Oct 2011 07:26:43 +0000 Subject: [PATCH 2/2] Accepting request 88333 from home:malcolmlewis:branches:GNOME:Factory Add gnome-settings-daemon-fix-missing-wexitstatus.patch. OBS-URL: https://build.opensuse.org/request/show/88333 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-settings-daemon?expand=0&rev=112 --- gnome-settings-daemon-fix-missing-wexitstatus.patch | 10 ++++++++++ gnome-settings-daemon.changes | 7 +++++++ gnome-settings-daemon.spec | 5 ++++- 3 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 gnome-settings-daemon-fix-missing-wexitstatus.patch diff --git a/gnome-settings-daemon-fix-missing-wexitstatus.patch b/gnome-settings-daemon-fix-missing-wexitstatus.patch new file mode 100644 index 0000000..b53e1b9 --- /dev/null +++ b/gnome-settings-daemon-fix-missing-wexitstatus.patch @@ -0,0 +1,10 @@ +--- plugins/power/gsd-power-manager.c 2011-09-26 10:49:43.000000000 -0500 ++++ plugins/power/gsd-power-manager.c.orig 2011-10-17 10:28:30.000000000 -0500 +@@ -24,6 +24,7 @@ + #include + #include + #include ++#include + #include + #include + #include diff --git a/gnome-settings-daemon.changes b/gnome-settings-daemon.changes index 22d2cf7..2c5a58c 100644 --- a/gnome-settings-daemon.changes +++ b/gnome-settings-daemon.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Oct 17 21:37:35 UTC 2011 - malcolmlewis@opensuse.org + +- Add gnome-settings-daemon-fix-missing-wexitstatus.patch: add + missing include that can cause issues at runtime, especially + on 11.4 (bgo#662020). + ------------------------------------------------------------------- Mon Oct 17 18:21:59 CEST 2011 - dimstar@opensuse.org diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec index e3ee2a0..772f677 100644 --- a/gnome-settings-daemon.spec +++ b/gnome-settings-daemon.spec @@ -35,12 +35,14 @@ Patch10: gnome-settings-daemon-bnc462640-mute-action.patch Patch11: gnome-settings-daemon-bnc461755-randr-rotate-wacom.diff # PATCH-NEEDS-REBASE PATCH-FIX-UPSTREAM gnome-settings-daemon-add-layout-switcher.patch bgo603806 vuntz@opensuse.org -- Add a layout switching combo if needed; the real fix implies some API change in libgnomekbd (see upstream bug) Patch13: gnome-settings-daemon-add-layout-switcher.patch -# PATCH-NEEDSREBASE PATCH-FEATURE-OPENSUSE gnome-packagekit-fate302445.patch fate 302445 +# PATCH-NEEDS-REBASE PATCH-FEATURE-OPENSUSE gnome-packagekit-fate302445.patch fate 302445 Patch14: gnome-packagekit-fate302445.patch # PATCH-NEEDSREBASE PATCH-MISSING-TAG -- See http://en.opensuse.org/Packaging/Patches Patch15: gnome-packagekit-BNC383261.patch # PATCH-FIX-OPENSUSE gnome-settings-daemon-stop-reload-proxy-settings.patch bnc689592#c1, bnc#538353 glin@suse.com -- Stop g-s-d poping up the authentication dialog for reloading the proxy settings Patch17: gnome-settings-daemon-stop-reload-proxy-settings.patch +# PATCH-FIX-UPSTREAM gnome-settings-daemon-fix-missing-wexitstatus.patch bgo#662020 malcolmlewis@opensuse.org -- Add missing include that can cause issues at runtime, especially on 11.4. +Patch18: gnome-settings-daemon-fix-missing-wexitstatus.patch BuildRequires: fdupes BuildRequires: gnome-common # Disabled because of the non-rebased patches @@ -142,6 +144,7 @@ translation-update-upstream #%%patch15 -p0 %patch17 -p1 %endif +%patch18 %if 0%{?BUILD_FROM_VCS} NOCONFIGURE=1 /usr/bin/gnome-autogen.sh