vte: upgrade 2.72.2 -> 2.74.0
PATCH v8 1/2 vte: upgrade 2.72.2 -> 2.74.0
From: Markus Volk <[email protected]>
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
---
v8: Rebased on latest tip of trunk
...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%)meta/recipes-support/vte/vte/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch +14 -21
@@ -11,32 +11,25 @@ Upstream-Status: Submitted [1] Signed-off-by: Andreas Müller <[email protected]> [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 +
meta/recipes-support/vte/vte_0.74.0.bb renamed from meta/recipes-support/vte/vte_0.72.2.bb +11 -18
@@ -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"
Signature · 1 line
2.42.1
PATCH 2/2 vte: Upgrade to 0.74.1
* Inherit systemd class
* Add packageconfig for fribidi support
---
meta/recipes-support/vte/{vte_0.74.0.bb => vte_0.74.1.bb} | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
rename meta/recipes-support/vte/{vte_0.74.0.bb => vte_0.74.1.bb} (89%)meta/recipes-support/vte/vte_0.74.1.bb renamed from meta/recipes-support/vte/vte_0.74.0.bb +3 -2
@@ -16,10 +16,10 @@ 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 vala +inherit gnomebase gi-docgen features_check upstream-version-is-even gobject-introspection systemd vala SRC_URI += "file://0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch" -SRC_URI[archive.sha256sum] = "9ae08f777952ba793221152d360550451580f42d3b570e3341ebb6841984c76b" +SRC_URI[archive.sha256sum] = "2328c3f1c998350a18e0e513348e9fc581d57ea4e7b89aedf11e0e3c65042b4f" ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
@@ -31,6 +31,7 @@ PACKAGECONFIG ??= " \ ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gtk4', '', d)} \ " +PACKAGECONFIG[fribidi] = "-Dfribidi=true,-Dfribidi=false,fribidi" PACKAGECONFIG[gtk4] = "-Dgtk4=true,-Dgtk4=false,gtk4" PACKAGECONFIG[gnutls] = "-Dgnutls=true,-Dgnutls=false,gnutls" PACKAGECONFIG[systemd] = "-D_systemd=true,-D_systemd=false,systemd"
Signature · 1 line
2.42.1
https://autobuilder.yoctoproject.org/typhoon/#/builders/44/builds/8176/steps/21/logs/stdio
ERROR: core-image-sato-1.0-r0 do_rootfs: Multilib check error: duplicate files /home/pokybuild/yocto-worker/multilib/build/build/tmp/work/qemux86_64-poky-linux/core-image-sato/1.0/multilib/lib32/usr/share/glib-2.0/schemas/gschemas.compiled /home/pokybuild/yocto-worker/multilib/build/build/tmp/work/qemux86_64-poky-linux/core-image-sato/1.0/rootfs/usr/share/glib-2.0/schemas/gschemas.compiled is not the same
Quoted 145 lines · Khem Raj
From: Markus Volk <[email protected]>
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 onDISTRO_FEATURE
- install systemd support files depending onDISTRO_FEATURE
- update 0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patchSigned-off-by Markus Volk <[email protected]>Signed-off-by Khem Raj <[email protected]>---
v8: Rebased on latest tip of trunk...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%)meta/recipes-support/vte/vte/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch +14
-21@@ -11,32 +11,25 @@ Upstream-Status: Submitted [1] Signed-off-by: Andreas M�ller <[email protected]> [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 +meta/recipes-support/vte/vte_0.74.0.bb renamed from meta/recipes-support/vte/vte_0.72.2.bb +11
-18@@ -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"Signature · 11 lines
2.42.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#190739): https://lists.openembedded.org/g/openembedded-core/message/190739 Mute This Topic: https://lists.openembedded.org/mt/102611065/3617179 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
Signature · 3 lines
Alexandre Belloni, co-owner and COO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
Quoted 5 lines · Alexandre Belloni
https://autobuilder.yoctoproject.org/typhoon/#/builders/44/builds/8176/steps/21/logs/stdio
ERROR: core-image-sato-1.0-r0
do_rootfs: Multilib check error: duplicate files/home/pokybuild/yocto-worker/multilib/build/build/tmp/work/qemux86_64-poky-linux/core-image-sato/1.0/multilib/lib32/usr/share/glib-2.0/schemas/gschemas.compiled/home/pokybuild/yocto-worker/multilib/build/build/tmp/work/qemux86_64-poky-linux/core-image-sato/1.0/rootfs/usr/share/glib-2.0/schemas/gschemas.compiledis not the same
This is interesting problem is that we are pulling in gtk4 now as part of vte but it does not get pulled into lib32
runtime like it does for gtk+3 ( it comes via adwaita-icon-theme recipe as dep) and they both install some gschemas
32bit rootfs does not have gtk4 schemas but 64bit does have. gschemas are compiled at the end of do_rootfs
and now we have different final schema files. I think these schemas should be packages into package of its own
perhaps instead of adding them to gtk+3 or gtk4 packages since these are architecture independent xml files.
Quoted 153 lines · Khem Raj
Quoted 137 lines
From: Markus Volk <[email protected]>
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 onDISTRO_FEATURE
- install systemd support files depending onDISTRO_FEATURE
- update 0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patchSigned-off-by Markus Volk <[email protected]>Signed-off-by Khem Raj <[email protected]>---
v8: Rebased on latest tip of trunk...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%)meta/recipes-support/vte/vte/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch +14
-21@@ -11,32 +11,25 @@ Upstream-Status: Submitted [1] Signed-off-by: Andreas Müller <[email protected]> [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 +meta/recipes-support/vte/vte_0.74.0.bb renamed from meta/recipes-support/vte/vte_0.72.2.bb +11
-19@@ -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" --2.42.1
Quoted 8 lines
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#190739): https://lists.openembedded.org/g/openembedded-core/message/190739
Mute This Topic: https://lists.openembedded.org/mt/102611065/3617179
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=---
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com