From 0d13d9947262b09cd69bc526ea2738e50c658744 Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Sun, 21 Apr 2013 14:37:16 -0700 Subject: glib-2.0: Update to 2.36 Remove automake patch that is now correctly supported upstream Codegen files have moved to glib-2.0, so correct packaging and removal. Signed-off-by: Saul Wold --- .../glib-2.0/obsolete_automake_macros.patch | 13 ----- meta/recipes-core/glib-2.0/glib-2.0_2.34.3.bb | 63 ---------------------- meta/recipes-core/glib-2.0/glib-2.0_2.36.0.bb | 63 ++++++++++++++++++++++ meta/recipes-core/glib-2.0/glib.inc | 2 +- 4 files changed, 64 insertions(+), 77 deletions(-) delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/obsolete_automake_macros.patch delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0_2.34.3.bb create mode 100644 meta/recipes-core/glib-2.0/glib-2.0_2.36.0.bb (limited to 'meta') diff --git a/meta/recipes-core/glib-2.0/glib-2.0/obsolete_automake_macros.patch b/meta/recipes-core/glib-2.0/glib-2.0/obsolete_automake_macros.patch deleted file mode 100644 index 2fc4e75e78..0000000000 --- a/meta/recipes-core/glib-2.0/glib-2.0/obsolete_automake_macros.patch +++ /dev/null @@ -1,13 +0,0 @@ -Upstream-Status: Accepted [https://bugzilla.gnome.org/show_bug.cgi?id=691011] - -Signed-off-by: Marko Lindqvist -diff -Nurd glib-2.34.3/configure.ac glib-2.34.3/configure.ac ---- glib-2.34.3/configure.ac 2012-11-26 19:10:04.000000000 +0200 -+++ glib-2.34.3/configure.ac 2013-01-02 15:49:27.832183712 +0200 -@@ -291,7 +291,6 @@ - AM_CONDITIONAL(HAVE_CXX, [test "$CXX" != ""]) - AC_LANG_RESTORE - --AM_PROG_CC_STDC - AM_PROG_CC_C_O - AC_PROG_INSTALL diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.34.3.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.34.3.bb deleted file mode 100644 index 779552470c..0000000000 --- a/meta/recipes-core/glib-2.0/glib-2.0_2.34.3.bb +++ /dev/null @@ -1,63 +0,0 @@ -require glib.inc - -PR = "r2" -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://obsolete_automake_macros.patch \ - file://fix-conflicting-rand.patch \ - file://Makefile-ptest.patch \ - file://run-ptest \ - " -SRC_URI[md5sum] = "a4ca31e258273c3761e3de2edd607661" -SRC_URI[sha256sum] = "855fcbf87cb93065b488358e351774d8a39177281023bae58c286f41612658a7" - -SRC_URI_append_class-native = " file://glib-gettextize-dir.patch" -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}${libdir}/gdbus-2.0/codegen/*.pyc - rm -f ${D}${libdir}/gdbus-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.0.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.36.0.bb new file mode 100644 index 0000000000..a042972bd5 --- /dev/null +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.36.0.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] = "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.inc b/meta/recipes-core/glib-2.0/glib.inc index d5fa0a30d5..aa1d4007bd 100644 --- a/meta/recipes-core/glib-2.0/glib.inc +++ b/meta/recipes-core/glib-2.0/glib.inc @@ -38,7 +38,7 @@ FILES_${PN}-dev += "${libdir}/glib-2.0/include \ ${libdir}/gio/modules/*.la" FILES_${PN}-dbg += "${datadir}/glib-2.0/gdb ${datadir}/gdb \ ${libdir}/gio/modules/.debug" -FILES_${PN}-codegen = "${libdir}/gdbus-2.0/codegen/*.py" +FILES_${PN}-codegen = "${datadir}/glib-2.0/codegen/*.py" FILES_${PN}-bash-completion = "${sysconfdir}/bash_completion.d \ ${datadir}/bash-completion" -- cgit 1.2.3-korg