From patchwork Wed Nov 22 06:31:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 35022 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 B0CCEC61D92 for ; Wed, 22 Nov 2023 06:31:25 +0000 (UTC) Received: from mail-io1-f46.google.com (mail-io1-f46.google.com [209.85.166.46]) by mx.groups.io with SMTP id smtpd.web10.13772.1700634684504901361 for ; Tue, 21 Nov 2023 22:31:24 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=jVCyviaO; spf=pass (domain: gmail.com, ip: 209.85.166.46, mailfrom: raj.khem@gmail.com) Received: by mail-io1-f46.google.com with SMTP id ca18e2360f4ac-7a93b7fedc8so279483939f.1 for ; Tue, 21 Nov 2023 22:31:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1700634683; x=1701239483; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=Bv1Lhee9PGUms+boHeS5DPl02RwXimsv3j3hDIBbaA0=; b=jVCyviaOaQ8ELQI/Q4k1Cr0SaNrTtx9TM36GFUaQwIzznW85q9aWM4SeF2LV8gC86R Q1LIFjI+gQ1I23qISdiQLoOfaJqGYRrUlTLKey8NSsL2Slv0hPLVXgy7U8IlOD0Keumn 4yVMwzOFAX/BmgKzKe6gVRMVt/crtM/zrY3+q2T3qWIMca2FrnMPceTHg3qk/xB4rUjM duiiA88xV/RnntuYihslg1cfIv0iYOOxh5m8jfdRPStiIJbdIKBBg7lYsTUJtpglQj/X McmVSHkFXH+4UA4wCPg7rlm0vG6Ov32gF+xoVq3BNOnCsHk7Dz80IiUaMe2I9J0SMCAf xv3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700634683; x=1701239483; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Bv1Lhee9PGUms+boHeS5DPl02RwXimsv3j3hDIBbaA0=; b=fFSiS+3LcgDb3+nnQasLixu6r5Na9j57PVlMokn/Nx7vZEC6pRF0NQ9EILQMFR/eAn Q0X0JWEXVjCKmsjmYA/V8xpIe1W9XUOikgY0Bju3rOKAyorgkzFbWDvMy0wZvU0GILW+ sElqzBz+0KTFFIPF60CLTVuHX/R+dcShPsRXuDeXAuJe3NwP4oRH3FXq9k2qsGTHsdVF WeAnsoS714/XMc9OPDRYYLNJb0e8JqIbaGl9TQdEcQkg8A0scBiqyyexJqWWatUbW1j9 cGbhKjP885ayGahRUuZ7QCV+Nf8btpcW0gcSblDGmMVLSAJlIXcHtMszZN627gvakpO1 bIhg== X-Gm-Message-State: AOJu0Yyd8x+0SolnZWDFppuod83reO4ffNv9jbrU7LjZNn4KXwpeK7TB bGaljAn/9p/aDwoLIhvENjNHIYUxQYiQ1g== X-Google-Smtp-Source: AGHT+IHEYHgWxIGnXRxJskhHeC/E36dwmHASv9RrfEWD+xmadsBDVK+siQbERcLw6umSRkfAcmgM8Q== X-Received: by 2002:a05:6e02:c6a:b0:35b:7d4:9d5e with SMTP id f10-20020a056e020c6a00b0035b07d49d5emr1476084ilj.23.1700634683305; Tue, 21 Nov 2023 22:31:23 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9100:2cb0::2c3f]) by smtp.gmail.com with ESMTPSA id m12-20020a056a00080c00b006cb6fa32590sm6224874pfk.148.2023.11.21.22.31.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Nov 2023 22:31:22 -0800 (PST) From: Khem Raj To: openembedded-core@lists.openembedded.org Cc: Markus Volk , Khem Raj , Alexandre Belloni Subject: [PATCH v9 1/3] vte: upgrade 2.72.2 -> 2.74.0 Date: Tue, 21 Nov 2023 22:31:16 -0800 Message-ID: <20231122063119.3620722-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 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 ; Wed, 22 Nov 2023 06:31:25 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/191018 From: Markus Volk Rework recipe - remove legacy of the autotools buildsystem - remove BBCLASSEXTEND - build vapi dependent on gi-data - docs require gir, add a EXTRA_OEMESON:append to avoid fail in a combination where docs=true and gir=false - gtk+3 and gtk4 are requested by default-> add gtk4 depending on DISTRO_FEATURE - install systemd support files depending on DISTRO_FEATURE - update 0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch (From OE-Core rev: f9ddacafbdcf0539a8d5eecfa981194b401f1062) Signed-off-by: Markus Volk Signed-off-by: Khem Raj Signed-off-by: Alexandre Belloni --- v9: Rebased ...EXITCODE-macro-for-non-glibc-systems.patch | 35 ++++++++----------- .../vte/{vte_0.72.2.bb => vte_0.74.0.bb} | 29 ++++++--------- 2 files changed, 25 insertions(+), 39 deletions(-) rename meta/recipes-support/vte/{vte_0.72.2.bb => vte_0.74.0.bb} (66%) diff --git a/meta/recipes-support/vte/vte/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch b/meta/recipes-support/vte/vte/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch index b4100fc381e..8934d5f80a6 100644 --- a/meta/recipes-support/vte/vte/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch +++ b/meta/recipes-support/vte/vte/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch @@ -11,32 +11,25 @@ Upstream-Status: Submitted [1] Signed-off-by: Andreas Müller [1] https://gitlab.gnome.org/GNOME/vte/issues/72 - --- - src/missing.hh | 4 ++++ - src/widget.cc | 1 + - 2 files changed, 5 insertions(+) + src/widget.cc | 4 +++ + 1 files changed, 4 insertions(+) ---- a/src/missing.hh -+++ b/src/missing.hh -@@ -24,6 +24,10 @@ - #define NSIG (8 * sizeof(sigset_t)) - #endif +diff --git a/src/widget.cc b/src/widget.cc +index 07f7cabf..31a77f68 100644 +--- a/src/widget.cc ++++ b/src/widget.cc +@@ -16,6 +16,10 @@ + * along with this library. If not, see . + */ +#ifndef W_EXITCODE +#define W_EXITCODE(ret, sig) ((ret) << 8 | (sig)) +#endif + - #ifndef HAVE_FDWALK - int fdwalk(int (*cb)(void* data, int fd), - void* data); ---- a/src/widget.cc -+++ b/src/widget.cc -@@ -21,6 +21,7 @@ - #include "widget.hh" - - #include // for W_EXITCODE -+#include "missing.hh" // for W_EXITCODE on non-glibc systems + #include "config.h" - #include - #include + #include "widget.hh" +-- +2.42.0 + diff --git a/meta/recipes-support/vte/vte_0.72.2.bb b/meta/recipes-support/vte/vte_0.74.0.bb similarity index 66% rename from meta/recipes-support/vte/vte_0.72.2.bb rename to meta/recipes-support/vte/vte_0.74.0.bb index 44e71491f62..21203adcf79 100644 --- a/meta/recipes-support/vte/vte_0.72.2.bb +++ b/meta/recipes-support/vte/vte_0.74.0.bb @@ -16,32 +16,27 @@ DEPENDS = "glib-2.0 glib-2.0-native gtk+3 libpcre2 libxml2-native gperf-native i 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] = "f7966fd185a6981f53964162b71cfef7e606495155d6f5827b72aa0dd6741c9e" +SRC_URI[archive.sha256sum] = "9ae08f777952ba793221152d360550451580f42d3b570e3341ebb6841984c76b" 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" -} +EXTRA_OEMESON += "${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-Dvapi=true', '-Dvapi=false', d)}" +EXTRA_OEMESON:append = " ${@bb.utils.contains('GI_DATA_ENABLED', 'False', '-Ddocs=false', '', d)}" -# Package additional files -FILES:${PN}-dev += "${datadir}/vala/vapi/*" - -PACKAGECONFIG ??= "gnutls" -PACKAGECONFIG[vala] = "-Dvapi=true,-Dvapi=false,vala-native vala" +PACKAGECONFIG ??= " \ + gnutls \ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gtk4', '', d)} \ +" +PACKAGECONFIG[gtk4] = "-Dgtk4=true,-Dgtk4=false,gtk4" 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" PACKAGES =+ "libvte ${PN}-prompt" +FILES:${PN} +="${systemd_user_unitdir}" FILES:libvte = "${libdir}/*.so.* ${libdir}/girepository-1.0/*" FILES:${PN}-prompt = " \ ${sysconfdir}/profile.d \ @@ -49,5 +44,3 @@ FILES:${PN}-prompt = " \ " FILES:${PN}-dev += "${datadir}/glade/" - -BBCLASSEXTEND = "native nativesdk"