From mboxrd@z Thu Jan 1 00:00:00 1970 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 9E68DC6379F for ; Wed, 22 Feb 2023 11:50:56 +0000 (UTC) Received: from mailout12.t-online.de (mailout12.t-online.de [194.25.134.22]) by mx.groups.io with SMTP id smtpd.web10.6719.1677066646817272065 for ; Wed, 22 Feb 2023 03:50:47 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=SPF record not found (domain: t-online.de, ip: 194.25.134.22, mailfrom: f_l_k@t-online.de) Received: from fwd84.dcpf.telekom.de (fwd84.aul.t-online.de [10.223.144.110]) by mailout12.t-online.de (Postfix) with SMTP id 330A2845C; Wed, 22 Feb 2023 12:50:45 +0100 (CET) Received: from [192.168.178.83] ([79.219.232.91]) by fwd84.t-online.de with (TLSv1.3:TLS_AES_256_GCM_SHA384 encrypted) esmtp id 1pUndw-3B9W1w0; Wed, 22 Feb 2023 12:50:40 +0100 Date: Wed, 22 Feb 2023 12:50:34 +0100 From: Markus Volk Subject: Re: [oe-core][PATCHv2] vte: update 0.70.2 -> 0.70.3 To: alexandre.belloni@bootlin.com Cc: openembedded-core@lists.openembedded.org Message-Id: In-Reply-To: <1746222F36E48AEC.15085@lists.openembedded.org> References: <20230221185231.454421-1-f_l_k@t-online.de> <1746222F36E48AEC.15085@lists.openembedded.org> X-Mailer: geary/40.0 MIME-Version: 1.0 Content-Type: multipart/alternative; boundary="=-405MC9QciAdkqSLuAFum" X-TOI-EXPURGATEID: 150726::1677066640-3BFF6A0B-74A28052/0/0 CLEAN NORMAL X-TOI-MSGID: 72aad646-4dab-4604-8fcd-828f11369910 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 Feb 2023 11:50:56 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177568 --=-405MC9QciAdkqSLuAFum Content-Type: text/plain; charset=iso-8859-1; format=flowed Content-Transfer-Encoding: quoted-printable Verified that both ways would work and sent a patch for the second=20 approach. Looks easier for now Am Mi, 22. Feb 2023 um 12:31:26 +0100 schrieb Markus Volk=20 : > What would be the preferred way to fix it? >=20 > I'd prefer the more progressive way and add BBCLASSEXTEND=20 > +=3D"nativesdk" to gtk.bb > But this would also add the need to build libxkbcommon and=20 > xkeyboard-config for nativesdk >=20 > vte recipe already has a PACKAGECONFIG:remove line, so i guess it=20 > will be less invasive to additionally add: > PACKAGECONFIG:remove:class-nativesdk =3D "gtk4" >=20 > Am Mi, 22. Feb 2023 um 12:08:45 +0100 schrieb Alexandre Belloni via=20 > lists.openembedded.org=20 > : >> Hello, >>=20 >> This causes: >>=20 >> stdio: WARNING: Nothing PROVIDES 'nativesdk-gtk4' (but=20 >> virtual:nativesdk:/home/pokybuild/yocto-worker/a-full/build/meta/recipes= -support/vte/vte_0.70.3.bb=20 >> DEPENDS on or otherwise requires it). Close matches: >> stdio: WARNING: Nothing RPROVIDES 'nativesdk-vte' (but=20 >> virtual:nativesdk:/home/pokybuild/yocto-worker/a-full/build/meta/recipes= -support/vte/vte_0.70.3.bb=20 >> RDEPENDS on or otherwise requires it) >> stdio: WARNING: Nothing RPROVIDES 'nativesdk-vte-dev' (but=20 >> virtual:nativesdk:/home/pokybuild/yocto-worker/a-full/build/meta/recipes= -support/vte/vte_0.70.3.bb=20 >> RDEPENDS on or otherwise requires it) >>=20 >> On 21/02/2023 19:52:31+0100, Markus Volk wrote: >>> - Allow to build the gtk4 widget and vapi >>> This is needed to build gtk4 based terminals like blackbox >>> - Update dependencies >>> - Cleanup recipe and remove unneeded patch >>>=20 >>> Signed-off-by: Markus Volk >> > >>> --- >>> ...EXITCODE-macro-for-non-glibc-systems.patch | 42=20 >>> ------------------- >>> .../vte/{vte_0.70.2.bb =3D> vte_0.70.3.bb} | 22 +++++----- >>> 2 files changed, 10 insertions(+), 54 deletions(-) >>> delete mode 100644=20 >>> meta/recipes-support/vte/vte/0001-Add-W_EXITCODE-macro-for-non-glibc-sy= stems.patch >>> rename meta/recipes-support/vte/{vte_0.70.2.bb =3D> vte_0.70.3.bb}=20 >>> (69%) >>>=20 >>> diff --git=20 >>> a/meta/recipes-support/vte/vte/0001-Add-W_EXITCODE-macro-for-non-glibc-= systems.patch=20 >>> b/meta/recipes-support/vte/vte/0001-Add-W_EXITCODE-macro-for-non-glibc-= systems.patch >>> deleted file mode 100644 >>> index b4100fc381..0000000000 >>> ---=20 >>> a/meta/recipes-support/vte/vte/0001-Add-W_EXITCODE-macro-for-non-glibc-= systems.patch >>> +++ /dev/null >>> @@ -1,42 +0,0 @@ >>> -From de9639baac792327c701e509258b8a13f6959e82 Mon Sep 17 00:00:00=20 >>> 2001 >>> -From: Danilo Spinella >> > >>> -Date: Thu, 21 Mar 2019 14:19:26 +0100 >>> -Subject: [PATCH] Add W_EXITCODE macro for non-glibc systems >>> -MIME-Version: 1.0 >>> -Content-Type: text/plain; charset=3DUTF-8 >>> -Content-Transfer-Encoding: 8bit >>> - >>> -Upstream-Status: Submitted [1] >>> - >>> -Signed-off-by: Andreas M=FCller >> > >>> - >>> -[1] >>> - >>> ---- >>> - src/missing.hh | 4 ++++ >>> - src/widget.cc | 1 + >>> - 2 files changed, 5 insertions(+) >>> - >>> ---- a/src/missing.hh >>> -+++ b/src/missing.hh >>> -@@ -24,6 +24,10 @@ >>> - #define NSIG (8 * sizeof(sigset_t)) >>> - #endif >>> - >>> -+#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 >>> - #include >>> diff --git a/meta/recipes-support/vte/vte_0.70.2.bb=20 >>> 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..a39598216b 100644 >>> --- a/meta/recipes-support/vte/vte_0.70.2.bb >>> +++ b/meta/recipes-support/vte/vte_0.70.3.bb >>> @@ -11,30 +11,28 @@ LIC_FILES_CHKSUM =3D " \ >>> file://COPYING.XTERM;md5=3Dd7fc3a23c16c039afafe2e042030f057=20 >>> \ >>> " >>>=20 >>> -DEPENDS =3D "glib-2.0 gtk+3 libpcre2 libxml2-native gperf-native=20 >>> icu" >>> +DEPENDS =3D "fribidi glib-2.0 gtk+3 libpcre2 libxml2-native=20 >>> gperf-native icu pango zlib" >>>=20 >>> GNOMEBASEBUILDCLASS =3D "meson" >>> GIR_MESON_OPTION =3D 'gir' >>> GIDOCGEN_MESON_OPTION =3D "docs" >>>=20 >>> -inherit gnomebase gi-docgen features_check=20 >>> upstream-version-is-even gobject-introspection >>> +inherit gnomebase gi-docgen features_check=20 >>> upstream-version-is-even gobject-introspection vala >>>=20 >>> -# vapigen.m4 is required when vala is not present (but the one=20 >>> from vala should be used normally) >>> -SRC_URI +=3D=20 >>> "file://0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch"=20 >>> >>> -SRC_URI[archive.sha256sum] =3D=20 >>> "4d15b4380de3f564d57eabd006389c407c705df5b0c70030fdcc24971a334d80" >>> +SRC_URI[archive.sha256sum] =3D=20 >>> "9457134a02f3157fca04f7e0d39bdb0f3099be0a3ce82b7139d0c98a80748f23" >>>=20 >>> ANY_OF_DISTRO_FEATURES =3D "${GTK3DISTROFEATURES}" >>>=20 >>> -# Help g-ir-scanner find the .so for linking >>> -do_compile:prepend() { >>> - export GIR_EXTRA_LIBS_PATH=3D"${B}/src/.libs" >>> -} >>> - >>> # Package additional files >>> FILES:${PN}-dev +=3D "${datadir}/vala/vapi/*" >>>=20 >>> -PACKAGECONFIG ??=3D "gnutls" >>> -PACKAGECONFIG[vala] =3D "-Dvapi=3Dtrue,-Dvapi=3Dfalse,vala-native val= a" >>> +PACKAGECONFIG ??=3D " \ >>> + gnutls \ >>> + ${@bb.utils.contains=20 >>> ('DISTRO_FEATURES',=20 >>> 'gobject-introspection-data', 'vala', '', d)} \ >>> + ${@bb.utils.contains=20 >>> ('DISTRO_FEATURES', 'opengl', 'gtk4',=20 >>> '', d)} \ >>> +" >>> +PACKAGECONFIG[gtk4] =3D "-Dgtk4=3Dtrue,-Dgtk4=3Dfalse,gtk4" >>> +PACKAGECONFIG[vala] =3D "-Dvapi=3Dtrue,-Dvapi=3Dfalse" >>> PACKAGECONFIG[gnutls] =3D "-Dgnutls=3Dtrue,-Dgnutls=3Dfalse,gnutls" >>> PACKAGECONFIG[systemd] =3D=20 >>> "-D_systemd=3Dtrue,-D_systemd=3Dfalse,systemd" >>> # vala requires gir >>> -- >>> 2.34.1 >>>=20 >>=20 >>>=20 >>>=20 >>>=20 >>=20 >>=20 >> -- >> Alexandre Belloni, co-owner and COO, Bootlin >> Embedded Linux and Kernel engineering >> https://bootlin.com >>=20 >>=20 >>=20 --=-405MC9QciAdkqSLuAFum Content-Type: text/html; charset=iso-8859-1 Content-Transfer-Encoding: quoted-printable
Verified that both ways would work= and sent a patch for the second approach. Looks easier for now
=

Am Mi, 22. Feb 2023 um 12:31:26 +0= 100 schrieb Markus Volk <f_l_k@t-online.de>:
What would be the preferred w= ay to fix it?

I'd prefer the more progressive way = and add BBCLASSEXTEND +=3D"nativesdk" to gtk.bb
But this would al= so add the need to build libxkbcommon and xkeyboard-config for nativesdk

vte recipe already has a PACKAGECONFIG:remove line, = so i guess it will be less invasive to additionally add:
PACKAGEC= ONFIG:remove:class-nativesdk =3D "gtk4"

Am Mi, 22. Feb 2023 um 12:08:45 +0100 schrieb Alexandre Be= lloni via lists.openembedded.org <alexandre.belloni=3Dbootlin.com@lists.= openembedded.org>:
Hello, This causes: stdio: WARNING: Nothing PROVIDES 'nativesdk-gtk4' (but virtual:nativesdk:/h= ome/pokybuild/yocto-worker/a-full/build/meta/recipes-support/vte/vte_0.70.3= .bb DEPENDS on or otherwise requires it). Close matches: stdio: WARNING: Nothing RPROVIDES 'nativesdk-vte' (but virtual:nativesdk:/h= ome/pokybuild/yocto-worker/a-full/build/meta/recipes-support/vte/vte_0.70.3= .bb RDEPENDS on or otherwise requires it) stdio: WARNING: Nothing RPROVIDES 'nativesdk-vte-dev' (but virtual:nativesd= k:/home/pokybuild/yocto-worker/a-full/build/meta/recipes-support/vte/vte_0.= 70.3.bb RDEPENDS on or otherwise requires it) On 21/02/2023 19:52:31+0100, Markus Volk wrote:
- Allow to build the gtk4 widget and vapi This is needed to build gtk4 based terminals like blackbox - Update dependencies - Cleanup recipe and remove unneeded patch =20 Signed-off-by: Markus Volk <f_l_k@= t-online.de> --- ...EXITCODE-macro-for-non-glibc-systems.patch | 42 ------------------- .../vte/{vte_0.70.2.bb =3D> vte_0.70.3.bb} | 22 +++++----- 2 files changed, 10 insertions(+), 54 deletions(-) delete mode 100644 meta/recipes-support/vte/vte/0001-Add-W_EXITCODE-macro= -for-non-glibc-systems.patch rename meta/recipes-support/vte/{vte_0.70.2.bb =3D> vte_0.70.3.bb} (69= %) =20 diff --git a/meta/recipes-support/vte/vte/0001-Add-W_EXITCODE-macro-for-no= n-glibc-systems.patch b/meta/recipes-support/vte/vte/0001-Add-W_EXITCODE-ma= cro-for-non-glibc-systems.patch deleted file mode 100644 index b4100fc381..0000000000 --- a/meta/recipes-support/vte/vte/0001-Add-W_EXITCODE-macro-for-non-glibc= -systems.patch +++ /dev/null @@ -1,42 +0,0 @@ -From de9639baac792327c701e509258b8a13f6959e82 Mon Sep 17 00:00:00 2001 -From: Danilo Spinella <da= nyspin97@protonmail.com> -Date: Thu, 21 Mar 2019 14:19:26 +0100 -Subject: [PATCH] Add W_EXITCODE macro for non-glibc systems -MIME-Version: 1.0 -Content-Type: text/plain; charset=3DUTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Submitted [1] - -Signed-off-by: Andreas M=FCller <schnitzeltony@gmail.com> - -[1] https://gitl= ab.gnome.org/GNOME/vte/issues/72 - ---- - src/missing.hh | 4 ++++ - src/widget.cc | 1 + - 2 files changed, 5 insertions(+) - ---- a/src/missing.hh -+++ b/src/missing.hh -@@ -24,6 +24,10 @@ - #define NSIG (8 * sizeof(sigset_t)) - #endif -=20 -+#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" -=20 - #include <sys/wait.h> // for W_EXITCODE -+#include "missing.hh" // for W_EXITCODE on non-glibc systems -=20 - #include <exception> - #include <new> 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..a39598216b 100644 --- a/meta/recipes-support/vte/vte_0.70.2.bb +++ b/meta/recipes-support/vte/vte_0.70.3.bb @@ -11,30 +11,28 @@ LIC_FILES_CHKSUM =3D " \ file://COPYING.XTERM;md5=3Dd7fc3a23c16c039afafe2e042030f057 \ " =20 -DEPENDS =3D "glib-2.0 gtk+3 libpcre2 libxml2-native gperf-native icu" +DEPENDS =3D "fribidi glib-2.0 gtk+3 libpcre2 libxml2-native gperf-native = icu pango zlib" =20 GNOMEBASEBUILDCLASS =3D "meson" GIR_MESON_OPTION =3D 'gir' GIDOCGEN_MESON_OPTION =3D "docs" =20 -inherit gnomebase gi-docgen features_check upstream-version-is-even gobje= ct-introspection +inherit gnomebase gi-docgen features_check upstream-version-is-even gobje= ct-introspection vala =20 -# vapigen.m4 is required when vala is not present (but the one from vala = should be used normally) -SRC_URI +=3D "file://0001-Add-W_EXITCODE-macro-for-non-glibc-systems= .patch" -SRC_URI[archive.sha256sum] =3D "4d15b4380de3f564d57eabd006389c407c705df5b= 0c70030fdcc24971a334d80" +SRC_URI[archive.sha256sum] =3D "9457134a02f3157fca04f7e0d39bdb0f3099be0a3= ce82b7139d0c98a80748f23" =20 ANY_OF_DISTRO_FEATURES =3D "${GTK3DISTROFEATURES}" =20 -# Help g-ir-scanner find the .so for linking -do_compile:prepend() { - export GIR_EXTRA_LIBS_PATH=3D"${B}/src/.libs" -} - # Package additional files FILES:${PN}-dev +=3D "${datadir}/vala/vapi/*" =20 -PACKAGECONFIG ??=3D "gnutls" -PACKAGECONFIG[vala] =3D "-Dvapi=3Dtrue,-Dvapi=3Dfalse,vala-native vala" +PACKAGECONFIG ??=3D " \ + gnutls \ + ${@bb.utils.contains('DIS= TRO_FEATURES', 'gobject-introspection-data', 'vala', '', d)} \ + ${@bb.utils.contains('DIS= TRO_FEATURES', 'opengl', 'gtk4', '', d)} \ +" +PACKAGECONFIG[gtk4] =3D "-Dgtk4=3Dtrue,-Dgtk4=3Dfalse,gtk4" +PACKAGECONFIG[vala] =3D "-Dvapi=3Dtrue,-Dvapi=3Dfalse" PACKAGECONFIG[gnutls] =3D "-Dgnutls=3Dtrue,-Dgnutls=3Dfalse,gnutls" PACKAGECONFIG[systemd] =3D "-D_systemd=3Dtrue,-D_systemd=3Dfalse,systemd" # vala requires gir --=20 2.34.1 =20
=20 =20 =20
--=20
Alexandre Belloni, co-owner and COO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
--=-405MC9QciAdkqSLuAFum--