gconf: update to 3.2.6

remove automake patch as it been fixed upstream

(From OE-Core rev: e2a404f3263337e505b60acd6c7d10be2c915ac9)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

3 files changed, 4 insertions, 19 deletions

diff --git a/meta/recipes-gnome/gnome/gconf-3.2.5/obsolete_automake_macros.patch b/meta/recipes-gnome/gnome/gconf-3.2.5/obsolete_automake_macros.patch
deleted file mode 100644
index 7dd4ee87b1..0000000000
--- a/meta/recipes-gnome/gnome/gconf-3.2.5/obsolete_automake_macros.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Upstream-Status: Accepted [https://bugzilla.gnome.org/show_bug.cgi?id=691264]
-
-Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
-diff -Nurd GConf-3.2.5/configure.in GConf-3.2.5/configure.in
---- GConf-3.2.5/configure.in    2012-03-11 00:53:29.000000000 +0200
-+++ GConf-3.2.5/configure.in    2013-01-07 03:42:11.254087899 +0200
-@@ -39,7 +39,6 @@
- AC_PROG_CC
- AC_PROG_CXX
- AC_ISC_POSIX
--AM_PROG_CC_STDC
- AC_HEADER_STDC
- AC_LIBTOOL_WIN32_DLL
- AM_PROG_LIBTOOL
diff --git a/meta/recipes-gnome/gnome/gconf-3.2.5/remove_plus_from_invalid_characters_list.patch b/meta/recipes-gnome/gnome/gconf/remove_plus_from_invalid_characters_list.patch
index 59a7ca7802..59a7ca7802 100644
--- a/meta/recipes-gnome/gnome/gconf-3.2.5/remove_plus_from_invalid_characters_list.patch
+++ b/meta/recipes-gnome/gnome/gconf/remove_plus_from_invalid_characters_list.patch
diff --git a/meta/recipes-gnome/gnome/gconf_3.2.5.bb b/meta/recipes-gnome/gnome/gconf_3.2.6.bb
index abdf15169a..a37bd009a4 100644
--- a/meta/recipes-gnome/gnome/gconf_3.2.5.bb
+++ b/meta/recipes-gnome/gnome/gconf_3.2.6.bb
@@ -9,19 +9,18 @@ POLKIT_libc-uclibc = ""
 DEPENDS = "glib-2.0 dbus dbus-glib libxml2 intltool-native ${POLKIT} gobject-introspection-stub"
 DEPENDS_class-native = "glib-2.0-native dbus-native dbus-glib-native libxml2-native intltool-native gnome-common-native gobject-introspection-stub-native"
 
-PR = "r14"
+PR = "r0"
 
 inherit gnomebase gtk-doc
 
 SRC_URI = "${GNOME_MIRROR}/GConf/${@gnome_verdir("${PV}")}/GConf-${PV}.tar.xz;name=archive \
-           file://obsolete_automake_macros.patch \
            file://remove_plus_from_invalid_characters_list.patch \
 "
 
-S = "${WORKDIR}/GConf-${PV}"
+SRC_URI[archive.md5sum] = "2b16996d0e4b112856ee5c59130e822c"
+SRC_URI[archive.sha256sum] = "1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c"
 
-SRC_URI[archive.md5sum] = "1b803eb4f8576c572d072692cf40c9d8"
-SRC_URI[archive.sha256sum] = "4ddea9503a212ee126c5b46a0a958fd5484574c3cb6ef2baf38db02e819e58c6"
+S = "${WORKDIR}/GConf-${PV}"
 
 POLKIT_OECONF = "--enable-defaults-service"
 POLKIT_OECONF_class-native = "--disable-defaults-service"