From 71e83ce29f09678ed5aa67c5edf88e0f24f754f8 Mon Sep 17 00:00:00 2001 From: Cristian Iorga <cristian.iorga@intel.com> Date: Thu, 9 May 2013 11:09:51 +0300 Subject: glib-2.0: upgrade to 2.36.1 Signed-off-by: Cristian Iorga <cristian.iorga@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> --- meta/recipes-core/glib-2.0/glib-2.0_2.36.0.bb | 63 --------------------------- meta/recipes-core/glib-2.0/glib-2.0_2.36.1.bb | 63 +++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 63 deletions(-) delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0_2.36.0.bb create mode 100644 meta/recipes-core/glib-2.0/glib-2.0_2.36.1.bb (limited to 'meta') diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.36.0.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.36.0.bb deleted file mode 100644 index a042972bd5..0000000000 --- a/meta/recipes-core/glib-2.0/glib-2.0_2.36.0.bb +++ /dev/null @@ -1,63 +0,0 @@ -require glib.inc - -PE = "1" - -DEPENDS += "libffi python-argparse-native zlib" -DEPENDS_class-native += "libffi-native python-argparse-native" -DEPENDS_class-nativesdk += "nativesdk-libffi python-argparse-native nativesdk-zlib ${BPN}-native" - -SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}" - -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://run-ptest \ - " - -SRC_URI_append_class-native = " file://glib-gettextize-dir.patch" - -SRC_URI[md5sum] = "2047dff287473450593edecb18f79c17" -SRC_URI[sha256sum] = "455a8abe8692c5174bcc7ffa15b96a7521a2f2f9fb47594405927c35cb9bb227" - -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.1.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.36.1.bb new file mode 100644 index 0000000000..74370048a9 --- /dev/null +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.36.1.bb @@ -0,0 +1,63 @@ +require glib.inc + +PE = "1" + +DEPENDS += "libffi python-argparse-native zlib" +DEPENDS_class-native += "libffi-native python-argparse-native" +DEPENDS_class-nativesdk += "nativesdk-libffi python-argparse-native nativesdk-zlib ${BPN}-native" + +SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}" + +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://run-ptest \ + " + +SRC_URI_append_class-native = " file://glib-gettextize-dir.patch" + +SRC_URI[md5sum] = "a3bbee44a13facb5a3cab18be5ece14c" +SRC_URI[sha256sum] = "7de37586794e92c024feebe5d306bf5f245fef4803c3666af1ae8dac6ee10b24" + +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 v1.2.3