From 7a80be5c3d9b5755583b7980d578b942351cc0c18330855c779143622ff77aae Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Tue, 18 Oct 2011 07:26:43 +0000 Subject: [PATCH] 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