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>
This commit is contained in:
parent
32b7b30323
commit
2d96820389
|
@ -1,45 +0,0 @@
|
|||
Allow the backend directory to be specified from the environment. This is
|
||||
required so we can relocate gconf-native to different paths and still
|
||||
allow it to work.
|
||||
|
||||
Bug filed upstream with patch: https://bugzilla.gnome.org/show_bug.cgi?id=664650
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
RP 2011/11/23
|
||||
|
||||
Index: GConf-3.2.3/gconf/gconf-backend.c
|
||||
===================================================================
|
||||
--- GConf-3.2.3.orig/gconf/gconf-backend.c 2011-07-01 14:01:20.000000000 +0100
|
||||
+++ GConf-3.2.3/gconf/gconf-backend.c 2011-11-23 14:56:37.141293320 +0000
|
||||
@@ -21,6 +21,7 @@
|
||||
#include <config.h>
|
||||
#include "gconf-backend.h"
|
||||
#include "gconf-internals.h"
|
||||
+#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <sys/stat.h>
|
||||
@@ -171,6 +172,7 @@
|
||||
gchar* back;
|
||||
gchar* file;
|
||||
gchar* retval;
|
||||
+ const gchar* backenddir;
|
||||
|
||||
g_return_val_if_fail(address != NULL, NULL);
|
||||
|
||||
@@ -179,9 +181,13 @@
|
||||
if (back == NULL)
|
||||
return NULL;
|
||||
|
||||
+ backenddir = getenv("GCONF_BACKEND_DIR");
|
||||
+ if (backenddir == NULL)
|
||||
+ backenddir = GCONF_BACKEND_DIR;
|
||||
+
|
||||
file = g_strconcat("gconfbackend-", back, NULL);
|
||||
|
||||
- retval = g_module_build_path(GCONF_BACKEND_DIR, file);
|
||||
+ retval = g_module_build_path(backenddir, file);
|
||||
|
||||
g_free(back);
|
||||
|
|
@ -13,14 +13,13 @@ PR = "r13"
|
|||
|
||||
inherit gnomebase gtk-doc
|
||||
|
||||
SRC_URI = "${GNOME_MIRROR}/GConf/${@gnome_verdir("${PV}")}/GConf-${PV}.tar.bz2;name=archive \
|
||||
file://backenddir.patch"
|
||||
|
||||
SRC_URI[archive.md5sum] = "f80329173cd9d134ad07e36002dd2a15"
|
||||
SRC_URI[archive.sha256sum] = "52008a82a847527877d9e1e549a351c86cc53cada4733b8a70a1123925d6aff4"
|
||||
SRC_URI = "${GNOME_MIRROR}/GConf/${@gnome_verdir("${PV}")}/GConf-${PV}.tar.xz;name=archive"
|
||||
|
||||
S = "${WORKDIR}/GConf-${PV}"
|
||||
|
||||
SRC_URI[archive.md5sum] = "1b803eb4f8576c572d072692cf40c9d8"
|
||||
SRC_URI[archive.sha256sum] = "4ddea9503a212ee126c5b46a0a958fd5484574c3cb6ef2baf38db02e819e58c6"
|
||||
|
||||
POLKIT_OECONF = "--enable-defaults-service"
|
||||
POLKIT_OECONF_class-native = "--disable-defaults-service"
|
||||
POLKIT_OECONF_libc-uclibc = "--disable-default-service"
|
Loading…
Reference in New Issue