From 8414bb5a7f2780fc067f1fdc30a56b568cbb7d82 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Fri, 16 Aug 2013 11:07:29 +0300 Subject: glib-2.0: update to upstream version 2.36.4 Signed-off-by: Marko Lindqvist Signed-off-by: Saul Wold --- meta/recipes-core/glib-2.0/glib-2.0_2.36.3.bb | 64 --------------------------- meta/recipes-core/glib-2.0/glib-2.0_2.36.4.bb | 64 +++++++++++++++++++++++++++ 2 files changed, 64 insertions(+), 64 deletions(-) delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0_2.36.3.bb create mode 100644 meta/recipes-core/glib-2.0/glib-2.0_2.36.4.bb (limited to 'meta/recipes-core/glib-2.0') diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.36.3.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.36.3.bb deleted file mode 100644 index 1faa239af2..0000000000 --- a/meta/recipes-core/glib-2.0/glib-2.0_2.36.3.bb +++ /dev/null @@ -1,64 +0,0 @@ -require glib.inc - -PE = "1" - -DEPENDS += "libffi zlib" -DEPENDS_class-native += "libffi-native" -DEPENDS_class-nativesdk += "nativesdk-libffi nativesdk-zlib ${BPN}-native" - -SHRT_VER = "${@oe.utils.trim_version("${PV}", 2)}" - -SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ - file://configure-libtool.patch \ - file://glib-2.0_fix_for_x32.patch \ - file://fix-conflicting-rand.patch \ - file://Makefile-ptest.patch \ - file://add-march-i486-into-CFLAGS-automatically.patch \ - file://run-ptest \ - " - -SRC_URI_append_class-native = " file://glib-gettextize-dir.patch" - -SRC_URI[md5sum] = "89180c7354b0acd3efb0a36ac05ca39c" -SRC_URI[sha256sum] = "5ec433bf6ce02e4c436619c3d0b9cecdd1898469398a636bad27c1f5804c761e" - -BBCLASSEXTEND = "native nativesdk" - -RDEPENDS_${PN}-ptest += "\ - tzdata \ - tzdata-americas \ - tzdata-asia \ - tzdata-europe \ - tzdata-posix \ - python-pygobject \ - python-dbus \ - " - -RDEPENDS_${PN}-ptest_append_libc-glibc = "\ - eglibc-gconv-utf-16 \ - eglibc-charmap-utf-8 \ - eglibc-gconv-cp1255 \ - eglibc-charmap-cp1255 \ - eglibc-gconv-utf-32 \ - eglibc-gconv-utf-7 \ - eglibc-charmap-invariant \ - eglibc-localedata-translit-cjk-variants \ - " - -do_configure_prepend() { - sed -i -e '1s,#!.*,#!${USRBINPATH}/env python,' ${S}/gio/gdbus-2.0/codegen/gdbus-codegen.in -} - -do_install_append() { - # remove some unpackaged files - rm -f ${D}${datadir}/glib-2.0/codegen/*.pyc - rm -f ${D}${datadir}/glib-2.0/codegen/*.pyo - # and empty dirs - rm -rf ${D}${libdir}/gio - - # Some distros have both /bin/perl and /usr/bin/perl, but we set perl location - # for target as /usr/bin/perl, so fix it to /usr/bin/perl. - if [ -f ${D}${bindir}/glib-mkenums ]; then - sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' ${D}${bindir}/glib-mkenums - fi -} diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.36.4.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.36.4.bb new file mode 100644 index 0000000000..3ba49b6da9 --- /dev/null +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.36.4.bb @@ -0,0 +1,64 @@ +require glib.inc + +PE = "1" + +DEPENDS += "libffi zlib" +DEPENDS_class-native += "libffi-native" +DEPENDS_class-nativesdk += "nativesdk-libffi nativesdk-zlib ${BPN}-native" + +SHRT_VER = "${@oe.utils.trim_version("${PV}", 2)}" + +SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ + file://configure-libtool.patch \ + file://glib-2.0_fix_for_x32.patch \ + file://fix-conflicting-rand.patch \ + file://Makefile-ptest.patch \ + file://add-march-i486-into-CFLAGS-automatically.patch \ + file://run-ptest \ + " + +SRC_URI_append_class-native = " file://glib-gettextize-dir.patch" + +SRC_URI[md5sum] = "2f4b15f7ef43d8702d067ab987bf7aba" +SRC_URI[sha256sum] = "f654d2542329012d8475736a165dfbf82fadf3ee940c2e0e6ddd4b2fde5cad7e" + +BBCLASSEXTEND = "native nativesdk" + +RDEPENDS_${PN}-ptest += "\ + tzdata \ + tzdata-americas \ + tzdata-asia \ + tzdata-europe \ + tzdata-posix \ + python-pygobject \ + python-dbus \ + " + +RDEPENDS_${PN}-ptest_append_libc-glibc = "\ + eglibc-gconv-utf-16 \ + eglibc-charmap-utf-8 \ + eglibc-gconv-cp1255 \ + eglibc-charmap-cp1255 \ + eglibc-gconv-utf-32 \ + eglibc-gconv-utf-7 \ + eglibc-charmap-invariant \ + eglibc-localedata-translit-cjk-variants \ + " + +do_configure_prepend() { + sed -i -e '1s,#!.*,#!${USRBINPATH}/env python,' ${S}/gio/gdbus-2.0/codegen/gdbus-codegen.in +} + +do_install_append() { + # remove some unpackaged files + rm -f ${D}${datadir}/glib-2.0/codegen/*.pyc + rm -f ${D}${datadir}/glib-2.0/codegen/*.pyo + # and empty dirs + rm -rf ${D}${libdir}/gio + + # Some distros have both /bin/perl and /usr/bin/perl, but we set perl location + # for target as /usr/bin/perl, so fix it to /usr/bin/perl. + if [ -f ${D}${bindir}/glib-mkenums ]; then + sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' ${D}${bindir}/glib-mkenums + fi +} -- cgit 1.2.3-korg