From 85a930188300152bc9a1bbf640a2441f3177e26f Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 16 Jul 2012 18:07:17 +0200 Subject: glib: upgrade to 2.32.4 * it's bugfix release, see http://ftp.gnome.org/pub/gnome/sources/glib/2.32/glib-2.32.4.news for list of fixed bugs Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie --- meta/recipes-core/glib-2.0/glib-2.0/nolibelf.patch | 11 +++-- meta/recipes-core/glib-2.0/glib-2.0_2.32.3.bb | 53 ---------------------- meta/recipes-core/glib-2.0/glib-2.0_2.32.4.bb | 52 +++++++++++++++++++++ 3 files changed, 59 insertions(+), 57 deletions(-) delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0_2.32.3.bb create mode 100644 meta/recipes-core/glib-2.0/glib-2.0_2.32.4.bb (limited to 'meta/recipes-core') diff --git a/meta/recipes-core/glib-2.0/glib-2.0/nolibelf.patch b/meta/recipes-core/glib-2.0/glib-2.0/nolibelf.patch index 0149767a16..d310041165 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/nolibelf.patch +++ b/meta/recipes-core/glib-2.0/glib-2.0/nolibelf.patch @@ -1,9 +1,12 @@ -From 0040842024725c0e74f84c1719ead6c79ba94aba Mon Sep 17 00:00:00 2001 +From e1252cbf65001487ff3b94bbc141acacf6e528b6 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 16 May 2012 20:03:34 +0200 Subject: [PATCH] configure: add option to disable libelf support -Upstream-Status: Pending +Upstream-Status: Backport +Applied in master +http://git.gnome.org/browse/glib/commit/?id=9e1d4da14d8e69fb60da1a9733ac1d58d0dcd8b2 +can be dropped when upgrading to 2.34.* or newer Signed-off-by: Martin Jansa --- @@ -11,7 +14,7 @@ Signed-off-by: Martin Jansa 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/configure.ac b/configure.ac -index aa65648..1bb49bf 100644 +index ed4c10e..210df90 100644 --- a/configure.ac +++ b/configure.ac @@ -1815,6 +1815,9 @@ AC_SUBST(XATTR_LIBS) @@ -22,7 +25,7 @@ index aa65648..1bb49bf 100644 + AC_HELP_STRING([--disable-libelf], [build without libelf support])) +if test "x$enable_libelf" != "xno"; then - PKG_CHECK_MODULES([LIBELF], [libelf], [have_libelf=yes], [have_libelf=maybe]) + PKG_CHECK_MODULES([LIBELF], [libelf >= 0.8.12], [have_libelf=yes], [have_libelf=maybe]) @@ -1835,6 +1838,7 @@ fi if test $have_libelf = yes; then diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.32.3.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.32.3.bb deleted file mode 100644 index 08aa8978ac..0000000000 --- a/meta/recipes-core/glib-2.0/glib-2.0_2.32.3.bb +++ /dev/null @@ -1,53 +0,0 @@ -require glib.inc - -PR = "r2" -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://glib-2.0_fix_for_x32.patch \ - file://nodbus.patch \ - file://nolibelf.patch \ - " -SRC_URI[md5sum] = "9bd3ac535c24b6c162be13b2c43c5adc" -SRC_URI[sha256sum] = "b65ceb462807e4a2f91c95e4293ce6bbefca308cb44a1407bcfdd9e40363ff4d" - -SRC_URI_append_virtclass-native = " file://glib-gettextize-dir.patch" -BBCLASSEXTEND = "native nativesdk" - -PERLPATH = "${bindir}/env perl" -PERLPATH_virtclass-native = "/usr/bin/env perl" -PERLPATH_virtclass-nativesdk = "/usr/bin/env perl" - -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/ - - # 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,#! ${PERLPATH},' ${D}${bindir}/glib-mkenums - fi -} - -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.32.4.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.32.4.bb new file mode 100644 index 0000000000..fca5f8d029 --- /dev/null +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.32.4.bb @@ -0,0 +1,52 @@ +require glib.inc + +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://glib-2.0_fix_for_x32.patch \ + file://nodbus.patch \ + file://nolibelf.patch \ + " +SRC_URI[md5sum] = "bf84fefd9c1a5b5a7a38736f4ddd674a" +SRC_URI[sha256sum] = "a5d742a4fda22fb6975a8c0cfcd2499dd1c809b8afd4ef709bda4d11b167fae2" + +SRC_URI_append_virtclass-native = " file://glib-gettextize-dir.patch" +BBCLASSEXTEND = "native nativesdk" + +PERLPATH = "${bindir}/env perl" +PERLPATH_virtclass-native = "/usr/bin/env perl" +PERLPATH_virtclass-nativesdk = "/usr/bin/env perl" + +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/ + + # 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,#! ${PERLPATH},' ${D}${bindir}/glib-mkenums + fi +} + +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