From patchwork Thu Feb 23 22:44:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Volk X-Patchwork-Id: 20070 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 196C9C61DA4 for ; Thu, 23 Feb 2023 22:44:25 +0000 (UTC) Received: from mailout10.t-online.de (mailout10.t-online.de [194.25.134.21]) by mx.groups.io with SMTP id smtpd.web11.3853.1677192262015211963 for ; Thu, 23 Feb 2023 14:44:22 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=SPF record not found (domain: t-online.de, ip: 194.25.134.21, mailfrom: f_l_k@t-online.de) Received: from fwd76.dcpf.telekom.de (fwd76.aul.t-online.de [10.223.144.102]) by mailout10.t-online.de (Postfix) with SMTP id 6739D1D7F5 for ; Thu, 23 Feb 2023 23:44:19 +0100 (CET) Received: from flk-MS-7C91.fritz.box ([79.219.239.43]) by fwd76.t-online.de with (TLSv1.3:TLS_AES_256_GCM_SHA384 encrypted) esmtp id 1pVKK2-29hcMT0; Thu, 23 Feb 2023 23:44:18 +0100 From: Markus Volk To: openembedded-core@lists.openembedded.org Cc: Markus Volk Subject: [oe-core][PATCHv5] vte: update 0.70.2 -> 0.70.3 Date: Thu, 23 Feb 2023 23:44:11 +0100 Message-Id: <20230223224411.4043797-1-f_l_k@t-online.de> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1677192258-E4D742C2-9AAEE086/0/0 CLEAN NORMAL X-TOI-MSGID: ceeced58-91d6-4f5a-99d3-ed64d1660663 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 23 Feb 2023 22:44:25 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177636 - Allow to build the gtk4 widget and vapi This is needed to build gtk4 based terminals like blackbox - Update dependencies - Cleanup recipe Signed-off-by: Markus Volk --- .../vte/{vte_0.70.2.bb => vte_0.70.3.bb} | 24 +++++++++---------- 1 file changed, 11 insertions(+), 13 deletions(-) rename meta/recipes-support/vte/{vte_0.70.2.bb => vte_0.70.3.bb} (70%) diff --git a/meta/recipes-support/vte/vte_0.70.2.bb b/meta/recipes-support/vte/vte_0.70.3.bb similarity index 70% rename from meta/recipes-support/vte/vte_0.70.2.bb rename to meta/recipes-support/vte/vte_0.70.3.bb index ec2fb1f522..a194b4067f 100644 --- a/meta/recipes-support/vte/vte_0.70.2.bb +++ b/meta/recipes-support/vte/vte_0.70.3.bb @@ -11,34 +11,32 @@ LIC_FILES_CHKSUM = " \ file://COPYING.XTERM;md5=d7fc3a23c16c039afafe2e042030f057 \ " -DEPENDS = "glib-2.0 gtk+3 libpcre2 libxml2-native gperf-native icu" +DEPENDS = "fribidi glib-2.0 gtk+3 libpcre2 libxml2-native gperf-native icu pango zlib" GNOMEBASEBUILDCLASS = "meson" GIR_MESON_OPTION = 'gir' GIDOCGEN_MESON_OPTION = "docs" -inherit gnomebase gi-docgen features_check upstream-version-is-even gobject-introspection +inherit gnomebase gi-docgen features_check upstream-version-is-even gobject-introspection vala -# vapigen.m4 is required when vala is not present (but the one from vala should be used normally) SRC_URI += "file://0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch" -SRC_URI[archive.sha256sum] = "4d15b4380de3f564d57eabd006389c407c705df5b0c70030fdcc24971a334d80" +SRC_URI[archive.sha256sum] = "9457134a02f3157fca04f7e0d39bdb0f3099be0a3ce82b7139d0c98a80748f23" ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" -# Help g-ir-scanner find the .so for linking -do_compile:prepend() { - export GIR_EXTRA_LIBS_PATH="${B}/src/.libs" -} - # Package additional files FILES:${PN}-dev += "${datadir}/vala/vapi/*" -PACKAGECONFIG ??= "gnutls" -PACKAGECONFIG[vala] = "-Dvapi=true,-Dvapi=false,vala-native vala" +PACKAGECONFIG:class-target ??= " \ + gnutls \ + ${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'gir vala', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gtk4', '', d)} \ +" +PACKAGECONFIG[gtk4] = "-Dgtk4=true,-Dgtk4=false,gtk4" +PACKAGECONFIG[gir] = "-Dgir=true,-Dgir=false" +PACKAGECONFIG[vala] = "-Dvapi=true,-Dvapi=false" PACKAGECONFIG[gnutls] = "-Dgnutls=true,-Dgnutls=false,gnutls" PACKAGECONFIG[systemd] = "-D_systemd=true,-D_systemd=false,systemd" -# vala requires gir -PACKAGECONFIG:remove:class-native = "vala" CFLAGS += "-D_GNU_SOURCE"