summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2012-12-13 19:02:56 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-19 17:55:04 +0000
commit2d968203896f83109cc6da7676bd90df14e14d2f (patch)
tree26352290aa17caa99e271e01f5ea76d9109e1057 /meta
parent32b7b3032324d4668e9d59ac4803b5e7675681d5 (diff)
downloadpoky-2d968203896f83109cc6da7676bd90df14e14d2f.tar.gz
gconf: Update to 3.2.5
Removed patch as it was incorporated in new version (From OE-Core rev: 5b671669e461a0f61ae178cb1ee2102fdedc13dc) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-gnome/gnome/gconf-3.2.3/backenddir.patch45
-rw-r--r--meta/recipes-gnome/gnome/gconf_3.2.5.bb (renamed from meta/recipes-gnome/gnome/gconf_3.2.3.bb)9
2 files changed, 4 insertions, 50 deletions
diff --git a/meta/recipes-gnome/gnome/gconf-3.2.3/backenddir.patch b/meta/recipes-gnome/gnome/gconf-3.2.3/backenddir.patch
deleted file mode 100644
index d4cdf8b38e..0000000000
--- a/meta/recipes-gnome/gnome/gconf-3.2.3/backenddir.patch
+++ /dev/null
@@ -1,45 +0,0 @@
1Allow the backend directory to be specified from the environment. This is
2required so we can relocate gconf-native to different paths and still
3allow it to work.
4
5Bug filed upstream with patch: https://bugzilla.gnome.org/show_bug.cgi?id=664650
6
7Upstream-Status: Pending
8
9RP 2011/11/23
10
11Index: GConf-3.2.3/gconf/gconf-backend.c
12===================================================================
13--- GConf-3.2.3.orig/gconf/gconf-backend.c 2011-07-01 14:01:20.000000000 +0100
14+++ GConf-3.2.3/gconf/gconf-backend.c 2011-11-23 14:56:37.141293320 +0000
15@@ -21,6 +21,7 @@
16 #include <config.h>
17 #include "gconf-backend.h"
18 #include "gconf-internals.h"
19+#include <stdlib.h>
20 #include <stdio.h>
21 #include <string.h>
22 #include <sys/stat.h>
23@@ -171,6 +172,7 @@
24 gchar* back;
25 gchar* file;
26 gchar* retval;
27+ const gchar* backenddir;
28
29 g_return_val_if_fail(address != NULL, NULL);
30
31@@ -179,9 +181,13 @@
32 if (back == NULL)
33 return NULL;
34
35+ backenddir = getenv("GCONF_BACKEND_DIR");
36+ if (backenddir == NULL)
37+ backenddir = GCONF_BACKEND_DIR;
38+
39 file = g_strconcat("gconfbackend-", back, NULL);
40
41- retval = g_module_build_path(GCONF_BACKEND_DIR, file);
42+ retval = g_module_build_path(backenddir, file);
43
44 g_free(back);
45
diff --git a/meta/recipes-gnome/gnome/gconf_3.2.3.bb b/meta/recipes-gnome/gnome/gconf_3.2.5.bb
index ef21624de1..9e9232269a 100644
--- a/meta/recipes-gnome/gnome/gconf_3.2.3.bb
+++ b/meta/recipes-gnome/gnome/gconf_3.2.5.bb
@@ -13,14 +13,13 @@ PR = "r13"
13 13
14inherit gnomebase gtk-doc 14inherit gnomebase gtk-doc
15 15
16SRC_URI = "${GNOME_MIRROR}/GConf/${@gnome_verdir("${PV}")}/GConf-${PV}.tar.bz2;name=archive \ 16SRC_URI = "${GNOME_MIRROR}/GConf/${@gnome_verdir("${PV}")}/GConf-${PV}.tar.xz;name=archive"
17 file://backenddir.patch"
18
19SRC_URI[archive.md5sum] = "f80329173cd9d134ad07e36002dd2a15"
20SRC_URI[archive.sha256sum] = "52008a82a847527877d9e1e549a351c86cc53cada4733b8a70a1123925d6aff4"
21 17
22S = "${WORKDIR}/GConf-${PV}" 18S = "${WORKDIR}/GConf-${PV}"
23 19
20SRC_URI[archive.md5sum] = "1b803eb4f8576c572d072692cf40c9d8"
21SRC_URI[archive.sha256sum] = "4ddea9503a212ee126c5b46a0a958fd5484574c3cb6ef2baf38db02e819e58c6"
22
24POLKIT_OECONF = "--enable-defaults-service" 23POLKIT_OECONF = "--enable-defaults-service"
25POLKIT_OECONF_class-native = "--disable-defaults-service" 24POLKIT_OECONF_class-native = "--disable-defaults-service"
26POLKIT_OECONF_libc-uclibc = "--disable-default-service" 25POLKIT_OECONF_libc-uclibc = "--disable-default-service"