From patchwork Thu Feb 23 19:19:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Volk X-Patchwork-Id: 20057 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 2D00EC61DA4 for ; Thu, 23 Feb 2023 19:19:58 +0000 (UTC) Received: from mailout02.t-online.de (mailout02.t-online.de [194.25.134.17]) by mx.groups.io with SMTP id smtpd.web11.67.1677179994576751159 for ; Thu, 23 Feb 2023 11:19:54 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=SPF record not found (domain: t-online.de, ip: 194.25.134.17, mailfrom: f_l_k@t-online.de) Received: from fwd77.dcpf.telekom.de (fwd77.aul.t-online.de [10.223.144.103]) by mailout02.t-online.de (Postfix) with SMTP id 6B228B658 for ; Thu, 23 Feb 2023 20:19:52 +0100 (CET) Received: from flk-MS-7C91.fritz.box ([79.219.239.43]) by fwd77.t-online.de with (TLSv1.3:TLS_AES_256_GCM_SHA384 encrypted) esmtp id 1pVH8B-0zdylN0; Thu, 23 Feb 2023 20:19:51 +0100 From: Markus Volk To: openembedded-core@lists.openembedded.org Cc: Markus Volk Subject: [oe-core][PATCHv4] vte: update 0.70.2 -> 0.70.3 Date: Thu, 23 Feb 2023 20:19:37 +0100 Message-Id: <20230223191937.1215699-1-f_l_k@t-online.de> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1677179991-E955437F-02D1F90A/0/0 CLEAN NORMAL X-TOI-MSGID: 412ccf87-6e98-4241-9e0d-94dfeebc93ba 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 19:19:58 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177623 - 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} | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) rename meta/recipes-support/vte/{vte_0.70.2.bb => vte_0.70.3.bb} (69%) diff --git a/meta/recipes-support/vte/vte_0.70.2.bb b/meta/recipes-support/vte/vte_0.70.3.bb similarity index 69% rename from meta/recipes-support/vte/vte_0.70.2.bb rename to meta/recipes-support/vte/vte_0.70.3.bb index ec2fb1f522..0c782b8c2f 100644 --- a/meta/recipes-support/vte/vte_0.70.2.bb +++ b/meta/recipes-support/vte/vte_0.70.3.bb @@ -11,34 +11,37 @@ 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 ??= " \ + gnutls \ + ${@bb.utils.contains('DISTRO_FEATURES', 'gobject-introspection-data', 'vala', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gtk4', '', d)} \ +" +PACKAGECONFIG[gtk4] = "-Dgtk4=true,-Dgtk4=false,gtk4" +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:x86-x32 = "vala" PACKAGECONFIG:remove:class-native = "vala" +PACKAGECONFIG:remove:class-nativesdk = "vala gtk4" CFLAGS += "-D_GNU_SOURCE"