From 5b671669e461a0f61ae178cb1ee2102fdedc13dc Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Thu, 13 Dec 2012 19:02:56 -0800 Subject: gconf: Update to 3.2.5 Removed patch as it was incorporated in new version Signed-off-by: Saul Wold --- .../gnome/gconf-3.2.3/backenddir.patch | 45 ----------------- meta/recipes-gnome/gnome/gconf_3.2.3.bb | 58 ---------------------- meta/recipes-gnome/gnome/gconf_3.2.5.bb | 57 +++++++++++++++++++++ 3 files changed, 57 insertions(+), 103 deletions(-) delete mode 100644 meta/recipes-gnome/gnome/gconf-3.2.3/backenddir.patch delete mode 100644 meta/recipes-gnome/gnome/gconf_3.2.3.bb create mode 100644 meta/recipes-gnome/gnome/gconf_3.2.5.bb (limited to 'meta') 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 @@ -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 - #include "gconf-backend.h" - #include "gconf-internals.h" -+#include - #include - #include - #include -@@ -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); - diff --git a/meta/recipes-gnome/gnome/gconf_3.2.3.bb b/meta/recipes-gnome/gnome/gconf_3.2.3.bb deleted file mode 100644 index ef21624de1..0000000000 --- a/meta/recipes-gnome/gnome/gconf_3.2.3.bb +++ /dev/null @@ -1,58 +0,0 @@ -DESCRIPTION = "GNOME configuration system" -SECTION = "x11/gnome" -LICENSE = "LGPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605" - -POLKIT = "polkit" -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 = "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" - -S = "${WORKDIR}/GConf-${PV}" - -POLKIT_OECONF = "--enable-defaults-service" -POLKIT_OECONF_class-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} --disable-gtk" - -do_install_append() { - # this directory need to be created to avoid an Error 256 at gdm launch - install -d ${D}${sysconfdir}/gconf/gconf.xml.system - - # this stuff is unusable - rm -f ${D}${libdir}/GConf/*/*.*a - rm -f ${D}${libdir}/gio/*/*.*a -} - -do_install_append_class-native() { - create_wrapper ${D}/${bindir}/gconftool-2 \ - GCONF_BACKEND_DIR=${STAGING_LIBDIR_NATIVE}/GConf/2 -} - -# disable dbus-x11 when x11 isn't in DISTRO_FEATURES -RDEPENDS_${PN} += "${@base_contains('DISTRO_FEATURES', 'x11', 'dbus-x11', '', d)}" -RDEPENDS_${PN}_class-native = "" - -FILES_${PN} += "${libdir}/GConf/* \ - ${libdir}/gio/*/*.so \ - ${datadir}/polkit* \ - ${datadir}/dbus-1/services/*.service \ - ${datadir}/dbus-1/system-services/*.service \ - " -FILES_${PN}-dbg += "${libdir}/*/*/.debug" -FILES_${PN}-dev += "${datadir}/sgml/gconf/gconf-1.0.dtd" - -BBCLASSEXTEND = "native" diff --git a/meta/recipes-gnome/gnome/gconf_3.2.5.bb b/meta/recipes-gnome/gnome/gconf_3.2.5.bb new file mode 100644 index 0000000000..9e9232269a --- /dev/null +++ b/meta/recipes-gnome/gnome/gconf_3.2.5.bb @@ -0,0 +1,57 @@ +DESCRIPTION = "GNOME configuration system" +SECTION = "x11/gnome" +LICENSE = "LGPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605" + +POLKIT = "polkit" +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 = "r13" + +inherit gnomebase gtk-doc + +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" + +EXTRA_OECONF = "--enable-shared --disable-static --enable-debug=yes \ + --disable-introspection --disable-orbit --with-openldap=no ${POLKIT_OECONF} --disable-gtk" + +do_install_append() { + # this directory need to be created to avoid an Error 256 at gdm launch + install -d ${D}${sysconfdir}/gconf/gconf.xml.system + + # this stuff is unusable + rm -f ${D}${libdir}/GConf/*/*.*a + rm -f ${D}${libdir}/gio/*/*.*a +} + +do_install_append_class-native() { + create_wrapper ${D}/${bindir}/gconftool-2 \ + GCONF_BACKEND_DIR=${STAGING_LIBDIR_NATIVE}/GConf/2 +} + +# disable dbus-x11 when x11 isn't in DISTRO_FEATURES +RDEPENDS_${PN} += "${@base_contains('DISTRO_FEATURES', 'x11', 'dbus-x11', '', d)}" +RDEPENDS_${PN}_class-native = "" + +FILES_${PN} += "${libdir}/GConf/* \ + ${libdir}/gio/*/*.so \ + ${datadir}/polkit* \ + ${datadir}/dbus-1/services/*.service \ + ${datadir}/dbus-1/system-services/*.service \ + " +FILES_${PN}-dbg += "${libdir}/*/*/.debug" +FILES_${PN}-dev += "${datadir}/sgml/gconf/gconf-1.0.dtd" + +BBCLASSEXTEND = "native" -- cgit v1.2.3