summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2013-02-25 16:09:36 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-28 23:15:52 +0000
commitf83ac67e33b4a81d8d6ec9f0683a6b39b46dd733 (patch)
tree9e4177405b14d05979a30615214af4b42a88b48c
parente4b7b10372ce0b5613e1034abe3a73b4033ea1f8 (diff)
downloadpoky-f83ac67e33b4a81d8d6ec9f0683a6b39b46dd733.tar.gz
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>
-rw-r--r--meta/recipes-gnome/gnome/gconf-3.2.5/obsolete_automake_macros.patch14
-rw-r--r--meta/recipes-gnome/gnome/gconf/remove_plus_from_invalid_characters_list.patch (renamed from meta/recipes-gnome/gnome/gconf-3.2.5/remove_plus_from_invalid_characters_list.patch)0
-rw-r--r--meta/recipes-gnome/gnome/gconf_3.2.6.bb (renamed from meta/recipes-gnome/gnome/gconf_3.2.5.bb)9
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 @@
1Upstream-Status: Accepted [https://bugzilla.gnome.org/show_bug.cgi?id=691264]
2
3Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
4diff -Nurd GConf-3.2.5/configure.in GConf-3.2.5/configure.in
5--- GConf-3.2.5/configure.in 2012-03-11 00:53:29.000000000 +0200
6+++ GConf-3.2.5/configure.in 2013-01-07 03:42:11.254087899 +0200
7@@ -39,7 +39,6 @@
8 AC_PROG_CC
9 AC_PROG_CXX
10 AC_ISC_POSIX
11-AM_PROG_CC_STDC
12 AC_HEADER_STDC
13 AC_LIBTOOL_WIN32_DLL
14 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 = ""
9DEPENDS = "glib-2.0 dbus dbus-glib libxml2 intltool-native ${POLKIT} gobject-introspection-stub" 9DEPENDS = "glib-2.0 dbus dbus-glib libxml2 intltool-native ${POLKIT} gobject-introspection-stub"
10DEPENDS_class-native = "glib-2.0-native dbus-native dbus-glib-native libxml2-native intltool-native gnome-common-native gobject-introspection-stub-native" 10DEPENDS_class-native = "glib-2.0-native dbus-native dbus-glib-native libxml2-native intltool-native gnome-common-native gobject-introspection-stub-native"
11 11
12PR = "r14" 12PR = "r0"
13 13
14inherit gnomebase gtk-doc 14inherit gnomebase gtk-doc
15 15
16SRC_URI = "${GNOME_MIRROR}/GConf/${@gnome_verdir("${PV}")}/GConf-${PV}.tar.xz;name=archive \ 16SRC_URI = "${GNOME_MIRROR}/GConf/${@gnome_verdir("${PV}")}/GConf-${PV}.tar.xz;name=archive \
17 file://obsolete_automake_macros.patch \
18 file://remove_plus_from_invalid_characters_list.patch \ 17 file://remove_plus_from_invalid_characters_list.patch \
19" 18"
20 19
21S = "${WORKDIR}/GConf-${PV}" 20SRC_URI[archive.md5sum] = "2b16996d0e4b112856ee5c59130e822c"
21SRC_URI[archive.sha256sum] = "1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c"
22 22
23SRC_URI[archive.md5sum] = "1b803eb4f8576c572d072692cf40c9d8" 23S = "${WORKDIR}/GConf-${PV}"
24SRC_URI[archive.sha256sum] = "4ddea9503a212ee126c5b46a0a958fd5484574c3cb6ef2baf38db02e819e58c6"
25 24
26POLKIT_OECONF = "--enable-defaults-service" 25POLKIT_OECONF = "--enable-defaults-service"
27POLKIT_OECONF_class-native = "--disable-defaults-service" 26POLKIT_OECONF_class-native = "--disable-defaults-service"