| Message ID | 20230920100440.966479-1-f_l_k@t-online.de |
|---|---|
| State | New |
| Headers | show |
| Series | [PATCHv5] vte: upgrade 2.72.2 -> 2.74.0 | expand |
Hello, This fails in oe-core: https://autobuilder.yoctoproject.org/typhoon/#/builders/47/builds/7808/steps/11/logs/stdio ERROR: Nothing PROVIDES 'gtk4' (but /home/pokybuild/yocto-worker/qemuarm-oecore/build/meta/recipes-support/vte/vte_0.74.0.bb DEPENDS on or otherwise requires it) On 20/09/2023 12:04:38+0200, Markus Volk wrote: > 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 dependency > - install systemd support files depending on DISTRO_FEATURE > - update 0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch > > Signed-off-by: Markus Volk <f_l_k@t-online.de> > --- > ...EXITCODE-macro-for-non-glibc-systems.patch | 35 ++++++++----------- > .../vte/{vte_0.72.2.bb => vte_0.74.0.bb} | 26 ++++---------- > 2 files changed, 21 insertions(+), 40 deletions(-) > rename meta/recipes-support/vte/{vte_0.72.2.bb => vte_0.74.0.bb} (62%) > > 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 b4100fc381..8934d5f80a 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 <schnitzeltony@gmail.com> > > [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 <https://www.gnu.org/licenses/>. > + */ > > +#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 <sys/wait.h> // for W_EXITCODE > -+#include "missing.hh" // for W_EXITCODE on non-glibc systems > + #include "config.h" > > - #include <exception> > - #include <new> > + #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 62% > rename from meta/recipes-support/vte/vte_0.72.2.bb > rename to meta/recipes-support/vte/vte_0.74.0.bb > index 4249b75ac0..cfb232ce98 100644 > --- a/meta/recipes-support/vte/vte_0.72.2.bb > +++ b/meta/recipes-support/vte/vte_0.74.0.bb > @@ -11,38 +11,28 @@ LIC_FILES_CHKSUM = " \ > file://COPYING.XTERM;md5=d7fc3a23c16c039afafe2e042030f057 \ > " > > -DEPENDS = "glib-2.0 glib-2.0-native gtk+3 libpcre2 libxml2-native gperf-native icu" > +DEPENDS = "glib-2.0 glib-2.0-native gtk+3 gtk4 libpcre2 libxml2-native gperf-native icu" > > 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] = "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)}" > 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 \ > @@ -50,5 +40,3 @@ FILES:${PN}-prompt = " \ > " > > FILES:${PN}-dev += "${datadir}/glade/" > - > -BBCLASSEXTEND = "native nativesdk" > -- > 2.42.0 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#187914): https://lists.openembedded.org/g/openembedded-core/message/187914 > Mute This Topic: https://lists.openembedded.org/mt/101475208/3617179 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alexandre.belloni@bootlin.com] > -=-=-=-=-=-=-=-=-=-=-=- >
I think the vte recipe needs REQUIRED_DISTRO_FEATURES = "opengl" Alex On Wed, 20 Sept 2023 at 18:40, Alexandre Belloni via lists.openembedded.org <alexandre.belloni=bootlin.com@lists.openembedded.org> wrote: > > Hello, > > This fails in oe-core: > > https://autobuilder.yoctoproject.org/typhoon/#/builders/47/builds/7808/steps/11/logs/stdio > > ERROR: Nothing PROVIDES 'gtk4' (but /home/pokybuild/yocto-worker/qemuarm-oecore/build/meta/recipes-support/vte/vte_0.74.0.bb DEPENDS on or otherwise requires it) > > On 20/09/2023 12:04:38+0200, Markus Volk wrote: > > 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 dependency > > - install systemd support files depending on DISTRO_FEATURE > > - update 0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch > > > > Signed-off-by: Markus Volk <f_l_k@t-online.de> > > --- > > ...EXITCODE-macro-for-non-glibc-systems.patch | 35 ++++++++----------- > > .../vte/{vte_0.72.2.bb => vte_0.74.0.bb} | 26 ++++---------- > > 2 files changed, 21 insertions(+), 40 deletions(-) > > rename meta/recipes-support/vte/{vte_0.72.2.bb => vte_0.74.0.bb} (62%) > > > > 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 b4100fc381..8934d5f80a 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 <schnitzeltony@gmail.com> > > > > [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 <https://www.gnu.org/licenses/>. > > + */ > > > > +#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 <sys/wait.h> // for W_EXITCODE > > -+#include "missing.hh" // for W_EXITCODE on non-glibc systems > > + #include "config.h" > > > > - #include <exception> > > - #include <new> > > + #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 62% > > rename from meta/recipes-support/vte/vte_0.72.2.bb > > rename to meta/recipes-support/vte/vte_0.74.0.bb > > index 4249b75ac0..cfb232ce98 100644 > > --- a/meta/recipes-support/vte/vte_0.72.2.bb > > +++ b/meta/recipes-support/vte/vte_0.74.0.bb > > @@ -11,38 +11,28 @@ LIC_FILES_CHKSUM = " \ > > file://COPYING.XTERM;md5=d7fc3a23c16c039afafe2e042030f057 \ > > " > > > > -DEPENDS = "glib-2.0 glib-2.0-native gtk+3 libpcre2 libxml2-native gperf-native icu" > > +DEPENDS = "glib-2.0 glib-2.0-native gtk+3 gtk4 libpcre2 libxml2-native gperf-native icu" > > > > 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] = "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)}" > > 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 \ > > @@ -50,5 +40,3 @@ FILES:${PN}-prompt = " \ > > " > > > > FILES:${PN}-dev += "${datadir}/glade/" > > - > > -BBCLASSEXTEND = "native nativesdk" > > -- > > 2.42.0 > > > > > > > > > > > > -- > Alexandre Belloni, co-owner and COO, Bootlin > Embedded Linux and Kernel engineering > https://bootlin.com > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#187933): https://lists.openembedded.org/g/openembedded-core/message/187933 > Mute This Topic: https://lists.openembedded.org/mt/101475208/1686489 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alex.kanavin@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- >
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 b4100fc381..8934d5f80a 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 <schnitzeltony@gmail.com> [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 <https://www.gnu.org/licenses/>. + */ +#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 <sys/wait.h> // for W_EXITCODE -+#include "missing.hh" // for W_EXITCODE on non-glibc systems + #include "config.h" - #include <exception> - #include <new> + #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 62% rename from meta/recipes-support/vte/vte_0.72.2.bb rename to meta/recipes-support/vte/vte_0.74.0.bb index 4249b75ac0..cfb232ce98 100644 --- a/meta/recipes-support/vte/vte_0.72.2.bb +++ b/meta/recipes-support/vte/vte_0.74.0.bb @@ -11,38 +11,28 @@ LIC_FILES_CHKSUM = " \ file://COPYING.XTERM;md5=d7fc3a23c16c039afafe2e042030f057 \ " -DEPENDS = "glib-2.0 glib-2.0-native gtk+3 libpcre2 libxml2-native gperf-native icu" +DEPENDS = "glib-2.0 glib-2.0-native gtk+3 gtk4 libpcre2 libxml2-native gperf-native icu" 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] = "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)}" 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 \ @@ -50,5 +40,3 @@ FILES:${PN}-prompt = " \ " FILES:${PN}-dev += "${datadir}/glade/" - -BBCLASSEXTEND = "native nativesdk"
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 dependency - install systemd support files depending on DISTRO_FEATURE - update 0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch Signed-off-by: Markus Volk <f_l_k@t-online.de> --- ...EXITCODE-macro-for-non-glibc-systems.patch | 35 ++++++++----------- .../vte/{vte_0.72.2.bb => vte_0.74.0.bb} | 26 ++++---------- 2 files changed, 21 insertions(+), 40 deletions(-) rename meta/recipes-support/vte/{vte_0.72.2.bb => vte_0.74.0.bb} (62%)