tweaks: add gconf-sanity for providing /usr/libexec/gconf-sanity-check-2

This is a workaround for the gconf/gtk2 dependency loop

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
This commit is contained in:
Koen Kooi
2013-05-07 13:47:22 +02:00
parent 5f0ed57ce6
commit 10c2bad032
2 changed files with 80 additions and 0 deletions

View File

@@ -0,0 +1,45 @@
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);

View File

@@ -0,0 +1,35 @@
DESCRIPTION = "GNOME configuration system"
SECTION = "x11/gnome"
LICENSE = "LGPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605"
DEPENDS = "gtk+ glib-2.0 dbus dbus-glib libxml2 polkit intltool-native gobject-introspection-stub"
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"
S = "${WORKDIR}/GConf-${PV}"
POLKIT_OECONF = "--enable-defaults-service"
POLKIT_OECONF_virtclass-native = "--disable-defaults-service"
POLKIT_OECONF_libc-uclibc = "--disable-default-service"
EXTRA_OECONF = "--enable-shared --disable-static --enable-debug=yes \
--disable-introspection --disable-orbit --with-openldap=no ${POLKIT_OECONF} --enable-gtk"
do_install_append() {
rm -rf ${D}${sysconfdir}
rm -rf ${D}${bindir} ${D}${libdir} ${D}${includedir} ${D}${datadir}
rm -f ${D}${libexecdir}/*defaults* rm -f ${D}${libexecdir}/gconfd*
}
# disable dbus-x11 when x11 isn't in DISTRO_FEATURES
RDEPENDS_${PN} += "gconf"
FILES_${PN} += "${libexecdir}/*sanity* \
"