From 5a7665317bbcfaf3a413fc5ef2a585fbdccbf176 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Wed, 9 Jun 2021 08:38:09 +0200 Subject: [PATCH] glibmm: upgrade 2.62.0 -> 2.66.1 / build with meson / cleanup recipe MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 2.66.1 is the version GNOME 40.2 release suggests. There are 2.68 versions but these are for mm-bindings compatible with gtk4. Signed-off-by: Andreas Müller Signed-off-by: Khem Raj --- .../{glibmm_2.62.0.bb => glibmm_2.66.1.bb} | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) rename meta-oe/recipes-core/glib-2.0/{glibmm_2.62.0.bb => glibmm_2.66.1.bb} (62%) diff --git a/meta-oe/recipes-core/glib-2.0/glibmm_2.62.0.bb b/meta-oe/recipes-core/glib-2.0/glibmm_2.66.1.bb similarity index 62% rename from meta-oe/recipes-core/glib-2.0/glibmm_2.62.0.bb rename to meta-oe/recipes-core/glib-2.0/glibmm_2.66.1.bb index 75eea4e589b..a4056113863 100644 --- a/meta-oe/recipes-core/glib-2.0/glibmm_2.62.0.bb +++ b/meta-oe/recipes-core/glib-2.0/glibmm_2.66.1.bb @@ -6,23 +6,16 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=42dfffebc56fec7527aac53b7a89d1d8 \ file://COPYING.tools;md5=751419260aa954499f7abaabaa882bbe" DEPENDS = "mm-common glib-2.0 libsigc++-2.0 glib-2.0-native" + +GNOMEBASEBUILDCLASS = "meson" + inherit gnomebase SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" -SRC_URI += " \ - file://remove-examples.patch \ -" -SRC_URI[archive.md5sum] = "7da228e3f0c6a10024b9a7708c53691e" -SRC_URI[archive.sha256sum] = "36659f13cc73282392d1305858f3bbca46fbd1ce2f078cc9db8b9f79b2e93cfe" +SRC_URI[archive.sha256sum] = "69bd6b5327716ca2f511ab580a969fd7bf0cd2c24ce15e1d0e530592d3ff209c" do_install_append() { - install -d ${D}${datadir}/glibmm-2.4 - install -d ${D}${datadir}/aclocal - - install -m 0644 glib/glibmmconfig.h ${D}${datadir}/glibmm-2.4/ - install -m 0644 scripts/glibmm_check_perl.m4 ${D}${datadir}/aclocal/ || true - for i in generate_wrap_init.pl gmmproc; do sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${libdir}/glibmm-2.4/proc/$i done @@ -32,4 +25,3 @@ FILES_${PN} = "${libdir}/lib*.so.*" FILES_${PN}-dev += "${datadir}/glibmm-* ${libdir}/glibmm-2.4/include/ ${libdir}/glibmm-2.4/proc/ ${libdir}/giomm-2.4/include/" RDEPENDS_${PN}-dev = "perl" -SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}"