From 451ad6c3b0fec3e8e35ccc28ee9b755ff4102b88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Wed, 14 Mar 2018 23:54:23 +0100 Subject: [PATCH] liblangtag: update 0.6.0 -> 0.6.2 / enable gobject-introspection MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- ...tag_filter_t-after-neum-to-fix-build.patch | 40 ------------------- ...iblangtag_0.6.0.bb => liblangtag_0.6.2.bb} | 16 +++----- 2 files changed, 5 insertions(+), 51 deletions(-) delete mode 100644 recipes-support/liblangtag/files/0003-move-_lt_tag_filter_t-after-neum-to-fix-build.patch rename recipes-support/liblangtag/{liblangtag_0.6.0.bb => liblangtag_0.6.2.bb} (62%) diff --git a/recipes-support/liblangtag/files/0003-move-_lt_tag_filter_t-after-neum-to-fix-build.patch b/recipes-support/liblangtag/files/0003-move-_lt_tag_filter_t-after-neum-to-fix-build.patch deleted file mode 100644 index 78abe42..0000000 --- a/recipes-support/liblangtag/files/0003-move-_lt_tag_filter_t-after-neum-to-fix-build.patch +++ /dev/null @@ -1,40 +0,0 @@ -From f82fc1451c10d93be031e18935e5ea7589e3f602 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Sun, 31 Jul 2016 16:09:00 +0200 -Subject: [PATCH] move _lt_tag_filter_t after neum to fix build -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Pending - -Signed-off-by: Andreas Müller ---- - liblangtag/lt-tag.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/liblangtag/lt-tag.h b/liblangtag/lt-tag.h -index 939acf5..2cc3028 100644 ---- a/liblangtag/lt-tag.h -+++ b/liblangtag/lt-tag.h -@@ -53,8 +53,6 @@ typedef struct _lt_tag_t lt_tag_t; - * This is used as a binary count sequence with lt_tag_get_string_with_filter() - * to allow only given tags to be the outcome. - */ --typedef enum _lt_tag_filter_t lt_tag_filter_t; -- - enum _lt_tag_filter_t { - LT_TAG_FILTER_NONE = 0, - LT_TAG_FILTER_LANGUAGE = 1 << 0, -@@ -68,6 +66,8 @@ enum _lt_tag_filter_t { - LT_TAG_FILTER_ALL = -1 - }; - -+typedef enum _lt_tag_filter_t lt_tag_filter_t; -+ - lt_tag_t *lt_tag_new (void); - lt_tag_t *lt_tag_ref (lt_tag_t *tag); - void lt_tag_unref (lt_tag_t *tag); --- -2.5.5 - diff --git a/recipes-support/liblangtag/liblangtag_0.6.0.bb b/recipes-support/liblangtag/liblangtag_0.6.2.bb similarity index 62% rename from recipes-support/liblangtag/liblangtag_0.6.0.bb rename to recipes-support/liblangtag/liblangtag_0.6.2.bb index f8c9292..2fbd953 100644 --- a/recipes-support/liblangtag/liblangtag_0.6.0.bb +++ b/recipes-support/liblangtag/liblangtag_0.6.2.bb @@ -11,19 +11,11 @@ SRC_URI = " \ https://bitbucket.org/tagoh/${BPN}/downloads/${BPN}-${PV}.tar.bz2 \ file://0001-configure.ac-add-missing-HAVE_INTROSPECTION-check.patch \ file://0002-configure.ac-remove-untranslated-AX_CHECK_ENABLE_DEB.patch \ - file://0003-move-_lt_tag_filter_t-after-neum-to-fix-build.patch \ " -SRC_URI[md5sum] = "dcd7a845a8a9b57ca96eb04a29083246" -SRC_URI[sha256sum] = "df84efd7e3e67cc8a38ece1e23f080c70ea29b26590ee324d03f1df37bf46576" +SRC_URI[md5sum] = "284f120247323a35122ab32b4b359c45" +SRC_URI[sha256sum] = "d6242790324f1432fb0a6fae71b6851f520b2c5a87675497cf8ea14c2924d52e" -inherit autotools pkgconfig - -# broken -EXTRA_OECONF += "--disable-introspection" - -# Even though introspection is disabled , gobject-introspection package is still -# needed for m4 macros. -DEPENDS += "gobject-introspection" +inherit autotools pkgconfig gobject-introspection do_configure_prepend() { if ! grep -q ${HOST_SYS}-libtool ${S}/configure.ac; then @@ -32,4 +24,6 @@ do_configure_prepend() { fi } +export GIR_EXTRA_LIBS_PATH="${B}/liblangtag/.libs" + BBCLASSEXTEND = "native"