From e2a404f3263337e505b60acd6c7d10be2c915ac9 Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Mon, 25 Feb 2013 16:09:36 -0800 Subject: gconf: update to 3.2.6 remove automake patch as it been fixed upstream Signed-off-by: Saul Wold --- .../gconf-3.2.5/obsolete_automake_macros.patch | 14 ----- .../remove_plus_from_invalid_characters_list.patch | 19 ------- .../remove_plus_from_invalid_characters_list.patch | 19 +++++++ meta/recipes-gnome/gnome/gconf_3.2.5.bb | 60 ---------------------- meta/recipes-gnome/gnome/gconf_3.2.6.bb | 59 +++++++++++++++++++++ 5 files changed, 78 insertions(+), 93 deletions(-) delete mode 100644 meta/recipes-gnome/gnome/gconf-3.2.5/obsolete_automake_macros.patch delete mode 100644 meta/recipes-gnome/gnome/gconf-3.2.5/remove_plus_from_invalid_characters_list.patch create mode 100644 meta/recipes-gnome/gnome/gconf/remove_plus_from_invalid_characters_list.patch delete mode 100644 meta/recipes-gnome/gnome/gconf_3.2.5.bb create mode 100644 meta/recipes-gnome/gnome/gconf_3.2.6.bb (limited to 'meta/recipes-gnome') 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 @@ -Upstream-Status: Accepted [https://bugzilla.gnome.org/show_bug.cgi?id=691264] - -Signed-off-by: Marko Lindqvist -diff -Nurd GConf-3.2.5/configure.in GConf-3.2.5/configure.in ---- GConf-3.2.5/configure.in 2012-03-11 00:53:29.000000000 +0200 -+++ GConf-3.2.5/configure.in 2013-01-07 03:42:11.254087899 +0200 -@@ -39,7 +39,6 @@ - AC_PROG_CC - AC_PROG_CXX - AC_ISC_POSIX --AM_PROG_CC_STDC - AC_HEADER_STDC - AC_LIBTOOL_WIN32_DLL - 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-3.2.5/remove_plus_from_invalid_characters_list.patch deleted file mode 100644 index 59a7ca7802..0000000000 --- a/meta/recipes-gnome/gnome/gconf-3.2.5/remove_plus_from_invalid_characters_list.patch +++ /dev/null @@ -1,19 +0,0 @@ -Upstream-Status: Pending - -Remove '+' from invalid characters list - -Signed-off-by: Laurentiu Palcu - -Index: GConf-3.2.5/gconf/gconf-backend.c -=================================================================== ---- GConf-3.2.5.orig/gconf/gconf-backend.c -+++ GConf-3.2.5/gconf/gconf-backend.c -@@ -37,7 +37,7 @@ static const char invalid_chars[] = - /* Space is common in user names (and thus home directories) on Windows */ - " " - #endif -- "\t\r\n\"$&<>,+=#!()'|{}[]?~`;%\\"; -+ "\t\r\n\"$&<>,=#!()'|{}[]?~`;%\\"; - - static gboolean - gconf_address_valid (const char *address, diff --git a/meta/recipes-gnome/gnome/gconf/remove_plus_from_invalid_characters_list.patch b/meta/recipes-gnome/gnome/gconf/remove_plus_from_invalid_characters_list.patch new file mode 100644 index 0000000000..59a7ca7802 --- /dev/null +++ b/meta/recipes-gnome/gnome/gconf/remove_plus_from_invalid_characters_list.patch @@ -0,0 +1,19 @@ +Upstream-Status: Pending + +Remove '+' from invalid characters list + +Signed-off-by: Laurentiu Palcu + +Index: GConf-3.2.5/gconf/gconf-backend.c +=================================================================== +--- GConf-3.2.5.orig/gconf/gconf-backend.c ++++ GConf-3.2.5/gconf/gconf-backend.c +@@ -37,7 +37,7 @@ static const char invalid_chars[] = + /* Space is common in user names (and thus home directories) on Windows */ + " " + #endif +- "\t\r\n\"$&<>,+=#!()'|{}[]?~`;%\\"; ++ "\t\r\n\"$&<>,=#!()'|{}[]?~`;%\\"; + + static gboolean + gconf_address_valid (const char *address, diff --git a/meta/recipes-gnome/gnome/gconf_3.2.5.bb b/meta/recipes-gnome/gnome/gconf_3.2.5.bb deleted file mode 100644 index abdf15169a..0000000000 --- a/meta/recipes-gnome/gnome/gconf_3.2.5.bb +++ /dev/null @@ -1,60 +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 = "r14" - -inherit gnomebase gtk-doc - -SRC_URI = "${GNOME_MIRROR}/GConf/${@gnome_verdir("${PV}")}/GConf-${PV}.tar.xz;name=archive \ - file://obsolete_automake_macros.patch \ - file://remove_plus_from_invalid_characters_list.patch \ -" - -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" diff --git a/meta/recipes-gnome/gnome/gconf_3.2.6.bb b/meta/recipes-gnome/gnome/gconf_3.2.6.bb new file mode 100644 index 0000000000..a37bd009a4 --- /dev/null +++ b/meta/recipes-gnome/gnome/gconf_3.2.6.bb @@ -0,0 +1,59 @@ +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 = "r0" + +inherit gnomebase gtk-doc + +SRC_URI = "${GNOME_MIRROR}/GConf/${@gnome_verdir("${PV}")}/GConf-${PV}.tar.xz;name=archive \ + file://remove_plus_from_invalid_characters_list.patch \ +" + +SRC_URI[archive.md5sum] = "2b16996d0e4b112856ee5c59130e822c" +SRC_URI[archive.sha256sum] = "1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c" + +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" -- cgit 1.2.3-korg