From 3510a591832c7443c96900063a3c29a78b0011c4 Mon Sep 17 00:00:00 2001 From: Shane Wang Date: Thu, 15 Mar 2012 10:47:24 +0800 Subject: glib-2.0: upgrade to 2.30.3 (From OE-Core rev: 19e041720699776c58280d07d5bf5f18246a42d9) Signed-off-by: Shane Wang Signed-off-by: Richard Purdie --- meta/recipes-core/glib-2.0/glib-2.0_2.30.2.bb | 46 --------------------------- meta/recipes-core/glib-2.0/glib-2.0_2.30.3.bb | 46 +++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 46 deletions(-) delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0_2.30.2.bb create mode 100644 meta/recipes-core/glib-2.0/glib-2.0_2.30.3.bb (limited to 'meta/recipes-core') diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.30.2.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.30.2.bb deleted file mode 100644 index 0e96fc16b9..0000000000 --- a/meta/recipes-core/glib-2.0/glib-2.0_2.30.2.bb +++ /dev/null @@ -1,46 +0,0 @@ -require glib.inc - -PR = "r7" -PE = "1" - -DEPENDS += "libffi python-argparse-native zlib" -DEPENDS_virtclass-native += "libffi-native python-argparse-native" -DEPENDS_virtclass-nativesdk += "libffi-nativesdk python-argparse-native zlib-nativesdk" - -SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}" - -SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.bz2 \ - file://configure-libtool.patch \ - file://60_wait-longer-for-threads-to-die.patch \ - file://g_once_init_enter.patch \ - file://glib-2.0_fix_for_x32.patch \ - file://nodbus.patch \ - " -SRC_URI[md5sum] = "b40f3889e8d24e1b367763673ca6deb5" -SRC_URI[sha256sum] = "94b1f1a1456c67060ca868d299bef3f7268a2c1c5c360aabb7149d4d9b2fdcd3" - -# Only apply this patch for target recipe on uclibc -SRC_URI_append_libc-uclibc = " ${@['', 'file://no-iconv.patch']['${PN}' == '${BPN}']}" - -SRC_URI_append_virtclass-native = " file://glib-gettextize-dir.patch" -BBCLASSEXTEND = "native nativesdk" - -do_configure_prepend() { - # missing ${topdir}/gtk-doc.make and --disable-gtk-doc* is not enough, because it calls gtkdocize (not provided by gtk-doc-native) - sed -i '/^docs/d' ${S}/configure.ac - sed -i 's/SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po docs/SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po/g' ${S}/Makefile.am - sed -i -e "s:TEST_PROGS += gdbus-serialization::g" ${S}/gio/tests/Makefile.am -} - -do_install_append() { - # remove some unpackaged files - rm -f ${D}${libdir}/gdbus-2.0/codegen/*.pyc - rm -f ${D}${libdir}/gdbus-2.0/codegen/*.pyo - # and empty dirs - rmdir ${D}${libdir}/gio/modules/ - rmdir ${D}${libdir}/gio/ -} - -PACKAGES += "${PN}-codegen" -FILES_${PN}-codegen = "${libdir}/gdbus-2.0/codegen/*.py" -FILES_${PN} += "${datadir}/glib-2.0/gettext/mkinstalldirs ${datadir}/glib-2.0/gettext/po/Makefile.in.in" diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.30.3.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.30.3.bb new file mode 100644 index 0000000000..3b9da89f3f --- /dev/null +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.30.3.bb @@ -0,0 +1,46 @@ +require glib.inc + +PR = "r0" +PE = "1" + +DEPENDS += "libffi python-argparse-native zlib" +DEPENDS_virtclass-native += "libffi-native python-argparse-native" +DEPENDS_virtclass-nativesdk += "libffi-nativesdk python-argparse-native zlib-nativesdk" + +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://60_wait-longer-for-threads-to-die.patch \ + file://g_once_init_enter.patch \ + file://glib-2.0_fix_for_x32.patch \ + file://nodbus.patch \ + " +SRC_URI[md5sum] = "0f9fa329c6c1012d0fd861ad3d8a4520" +SRC_URI[sha256sum] = "e6cbb27c71c445993346e785e8609cc75cea2941e32312e544872feba572dd27" + +# Only apply this patch for target recipe on uclibc +SRC_URI_append_libc-uclibc = " ${@['', 'file://no-iconv.patch']['${PN}' == '${BPN}']}" + +SRC_URI_append_virtclass-native = " file://glib-gettextize-dir.patch" +BBCLASSEXTEND = "native nativesdk" + +do_configure_prepend() { + # missing ${topdir}/gtk-doc.make and --disable-gtk-doc* is not enough, because it calls gtkdocize (not provided by gtk-doc-native) + sed -i '/^docs/d' ${S}/configure.ac + sed -i 's/SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po docs/SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po/g' ${S}/Makefile.am + sed -i -e "s:TEST_PROGS += gdbus-serialization::g" ${S}/gio/tests/Makefile.am +} + +do_install_append() { + # remove some unpackaged files + rm -f ${D}${libdir}/gdbus-2.0/codegen/*.pyc + rm -f ${D}${libdir}/gdbus-2.0/codegen/*.pyo + # and empty dirs + rmdir ${D}${libdir}/gio/modules/ + rmdir ${D}${libdir}/gio/ +} + +PACKAGES += "${PN}-codegen" +FILES_${PN}-codegen = "${libdir}/gdbus-2.0/codegen/*.py" +FILES_${PN} += "${datadir}/glib-2.0/gettext/mkinstalldirs ${datadir}/glib-2.0/gettext/po/Makefile.in.in" -- cgit v1.2.3-54-g00ecf