settings-daemon: submit addsoundkeys.patch upstream and update to a revision that has it

(From OE-Core rev: ab532f6010a671e622a9451f6a5d2fe31dbc2f32)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 0d56c7b444d94778808cce8ede3374b8212b22a7)
Signed-off-by: Steve Sakoman <steve@sakoman.com>

2 files changed, 4 insertions, 53 deletions

diff --git a/meta/recipes-sato/settings-daemon/files/addsoundkeys.patch b/meta/recipes-sato/settings-daemon/files/addsoundkeys.patch
deleted file mode 100644
index baf06d6b84..0000000000
--- a/meta/recipes-sato/settings-daemon/files/addsoundkeys.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Upstream-Status: Pending
-
-Index: settings-daemon/settings-daemon.c
-===================================================================
---- settings-daemon.orig/settings-daemon.c      2009-05-22 14:57:05.000000000 +0100
-+++ settings-daemon/settings-daemon.c   2009-05-22 14:58:22.000000000 +0100
-@@ -187,6 +187,10 @@
-     GCONF_VALUE_STRING, translate_string_string },
-   { "/desktop/poky/interface/gtk_color_scheme", "Gtk/ColorScheme",
-     GCONF_VALUE_STRING, translate_string_string },
-+  { "/desktop/gnome/sound/theme_name", "Net/SoundThemeName",
-+    GCONF_VALUE_STRING,   translate_string_string },
-+  { "/desktop/gnome/sound/event_sounds", "Net/EnableEventSounds" ,
-+    GCONF_VALUE_BOOL,     translate_bool_int },
- };
- 
- static const TranslationEntry*
-Index: settings-daemon/settings-daemon.schemas
-===================================================================
---- settings-daemon.orig/settings-daemon.schemas        2009-05-22 15:49:17.000000000 +0100
-+++ settings-daemon/settings-daemon.schemas     2009-05-22 15:51:31.000000000 +0100
-@@ -196,6 +196,27 @@
-     </locale>
-   </schema>
- 
-+  <schema>
-+    <key>/schemas/desktop/gnome/sound/theme_name</key>
-+    <applyto>/desktop/gnome/sound/theme_name</applyto>
-+    <owner>gnome</owner>
-+    <type>string</type>
-+    <default>freedesktop</default>
-+    <locale name="C">
-+      <short>Sound Theme Name</short>
-+    </locale>
-+  </schema>
-+
-+  <schema>
-+    <key>/schemas/desktop/gnome/sound/event_sounds</key>
-+    <applyto>/desktop/gnome/sound/event_sounds</applyto>
-+    <owner>gnome</owner>
-+    <type>bool</type>
-+    <default>true</default>
-+    <locale name="C">
-+      <short>Enable Sound Events</short>
-+    </locale>
-+  </schema>
- 
- </schemalist>
- </gconfschemafile>
diff --git a/meta/recipes-sato/settings-daemon/settings-daemon_0.0.2.bb b/meta/recipes-sato/settings-daemon/settings-daemon_0.0.2.bb
index 4bdbefcb75..d38cd4e2dd 100644
--- a/meta/recipes-sato/settings-daemon/settings-daemon_0.0.2.bb
+++ b/meta/recipes-sato/settings-daemon/settings-daemon_0.0.2.bb
@@ -7,10 +7,10 @@ LIC_FILES_CHKSUM = "file://xsettings-manager.h;endline=22;md5=7cfac9d2d4dc3694cc
 DEPENDS = "gconf glib-2.0 gtk+3"
 SECTION = "x11"
 
-# SRCREV tagged 0.0.2
-SRCREV = "b2e5da502f8c5ff75e9e6da771372ef8e40fd9a2"
+PV .= "+git"
+# SRCREV tagged 0.0.2 + one patch
+SRCREV = "df669c6579a6ac7e1ef56be66617f35ae7d33d68"
 SRC_URI = "git://git.yoctoproject.org/xsettings-daemon;branch=master;protocol=https \
-           file://addsoundkeys.patch \
            file://70settings-daemon.sh \
            "
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))"
@@ -19,7 +19,7 @@ S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig gconf features_check
 
-FILES:${PN} =   "${bindir}/* ${sysconfdir}"
+FILES:${PN} = "${bindir}/* ${sysconfdir}"
 
 # Requires gdk-x11-2.0 which is provided by gtk when x11 in DISTRO_FEATURES
 REQUIRED_DISTRO_FEATURES = "x11"