vte: upgrade 0.72.2 -> 0.74.0
PATCH v10 1/3 vte: upgrade 0.72.2 -> 0.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
(From OE-Core rev: f9ddacafbdcf0539a8d5eecfa981194b401f1062)
(From OE-Core rev: ac1c6649a3ebdd24835ac2b0bba433e8e6fb54b7)
---
v9: Rebased
v10: Correct version in subject
...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.43.0
PATCH v10 2/3 vte: Upgrade to 0.74.1
* Inherit systemd class
* Add packageconfig for fribidi support
(From OE-Core rev: 6c952b332cc07aa0babec8bc2839b3701f308d54)
(From OE-Core rev: a936ac8079e468b0349079b11df41295c82f7f97)
---
v9: Rebased
v10: Rebased
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.43.0
PATCH v10 3/3 vte: Separate out gtk4 pieces of vte into individual packages
In reply to Khem RajThis avoids adding gtk4 dependencies when image may only desire the gtk3 pieces of vte.
---
v10: Added new
meta/recipes-support/vte/vte_0.74.1.bb | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
meta/recipes-support/vte/vte_0.74.1.bb +9 -1
@@ -36,7 +36,15 @@ PACKAGECONFIG[gtk4] = "-Dgtk4=true,-Dgtk4=false,gtk4" PACKAGECONFIG[gnutls] = "-Dgnutls=true,-Dgnutls=false,gnutls" PACKAGECONFIG[systemd] = "-D_systemd=true,-D_systemd=false,systemd" -PACKAGES =+ "libvte ${PN}-prompt" +PACKAGES =+ "libvte-gtk4 ${PN}-gtk4 ${PN}-gtk4-dev libvte ${PN}-prompt" +FILES:libvte-gtk4 = "${libdir}/lib*gtk4.so.* ${libdir}/girepository-1.0/Vte-3.91.typelib" +FILES:${PN}-gtk4 ="${bindir}/vte-2.91-gtk4" +FILES:${PN}-gtk4-dev = "${libdir}/lib*gtk4.so \ + ${libdir}/pkgconfig/vte-2.91-gtk4.pc \ + ${datadir}/vala/vapi/vte-2.91-gtk4.deps \ + ${datadir}/vala/vapi/vte-2.91-gtk4.vapi \ + ${includedir}/vte-2.91-gtk4 \ + " FILES:${PN} +="${systemd_user_unitdir}" FILES:libvte = "${libdir}/*.so.* ${libdir}/girepository-1.0/*" FILES:${PN}-prompt = " \
Signature · 1 line
2.43.0
Re: [PATCH v10 3/3] vte: Separate out gtk4 pieces of vte into individual packages
Does this allow installing the gtk4 libraries without gtk3? Looks like the GIR files will mean pulling in both.
Ross
________________________________
From: Khem Raj <[email protected]>
Sent: Saturday, November 25, 2023 7:38:21 AM
To: [email protected] <[email protected]>
Cc: Khem Raj <[email protected]>; Ross Burton <[email protected]>
Subject: [PATCH v10 3/3] vte: Separate out gtk4 pieces of vte into individual packages
This avoids adding gtk4 dependencies when image may only desire the gtk3 pieces of vte.
---
v10: Added new
meta/recipes-support/vte/vte_0.74.1.bb | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
meta/recipes-support/vte/vte_0.74.1.bb +9 -1
@@ -36,7 +36,15 @@ PACKAGECONFIG[gtk4] = "-Dgtk4=true,-Dgtk4=false,gtk4" PACKAGECONFIG[gnutls] = "-Dgnutls=true,-Dgnutls=false,gnutls" PACKAGECONFIG[systemd] = "-D_systemd=true,-D_systemd=false,systemd" -PACKAGES =+ "libvte ${PN}-prompt" +PACKAGES =+ "libvte-gtk4 ${PN}-gtk4 ${PN}-gtk4-dev libvte ${PN}-prompt" +FILES:libvte-gtk4 = "${libdir}/lib*gtk4.so.* ${libdir}/girepository-1.0/Vte-3.91.typelib" +FILES:${PN}-gtk4 ="${bindir}/vte-2.91-gtk4" +FILES:${PN}-gtk4-dev = "${libdir}/lib*gtk4.so \ + ${libdir}/pkgconfig/vte-2.91-gtk4.pc \ + ${datadir}/vala/vapi/vte-2.91-gtk4.deps \ + ${datadir}/vala/vapi/vte-2.91-gtk4.vapi \ + ${includedir}/vte-2.91-gtk4 \ + " FILES:${PN} +="${systemd_user_unitdir}" FILES:libvte = "${libdir}/*.so.* ${libdir}/girepository-1.0/*" FILES:${PN}-prompt = " \
--
2.43.0
Re: [PATCH v10 3/3] vte: Separate out gtk4 pieces of vte into individual packages
Seems to do so for the test case and for development or build time it’s fine to have them both be installed since they can live side by side without issues
Quoted 51 lines · Ross Burton
Does this allow installing the gtk4 libraries without gtk3? Looks like the GIR files will mean pulling in both.
Ross
------------------------------
*From:* Khem Raj <[email protected]>
*Sent:* Saturday, November 25, 2023 7:38:21 AM
*To:* [email protected] < [email protected]>
*Cc:* Khem Raj <[email protected]>; Ross Burton <[email protected]> *Subject:* [PATCH v10 3/3] vte: Separate out gtk4 pieces of vte into individual packagesThis avoids adding gtk4 dependencies when image may only desire the gtk3 pieces of vte.
Signed-off-by Khem Raj <[email protected]>Cc Ross Burton <[email protected]>---
v10: Added newmeta/recipes-support/vte/vte_0.74.1.bb | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)meta/recipes-support/vte/vte_0.74.1.bb +2
-1@@ -36,7 +36,15 @@ PACKAGECONFIG[gtk4] = "-Dgtk4=true,-Dgtk4=false,gtk4" PACKAGECONFIG[gnutls] = "-Dgnutls=true,-Dgnutls=false,gnutls" PACKAGECONFIG[systemd] = "-D_systemd=true,-D_systemd=false,systemd" -PACKAGES =+ "libvte ${PN}-prompt" +PACKAGES =+ "libvte-gtk4 ${PN}-gtk4 ${PN}-gtk4-dev libvte ${PN}-prompt" +FILES:libvte-gtk4 = "${libdir}/lib*gtk4.so.*${libdir}/girepository-1.0/Vte-3.91.typelib"
meta/recipes-support/vte/vte_0.74.1.bb +7
-1+FILES:${PN}-gtk4 ="${bindir}/vte-2.91-gtk4" +FILES:${PN}-gtk4-dev = "${libdir}/lib*gtk4.so \ + ${libdir}/pkgconfig/vte-2.91-gtk4.pc \ + ${datadir}/vala/vapi/vte-2.91-gtk4.deps \ + ${datadir}/vala/vapi/vte-2.91-gtk4.vapi \ + ${includedir}/vte-2.91-gtk4 \ + " FILES:${PN} +="${systemd_user_unitdir}" FILES:libvte = "${libdir}/*.so.* ${libdir}/girepository-1.0/*" FILES:${PN}-prompt = " \ --2.43.0
Re: [PATCH v10 3/3] vte: Separate out gtk4 pieces of vte into individual packages
In reply to Ross BurtonQuoted 2 lines · Ross Burton
Does this allow installing the gtk4 libraries without gtk3? Looks like the GIR files will mean pulling in both.
I have sent a v11 where Vte-3.91.gir is packaged into ${PN}-gtk4-dev, that should solve this concern.
Quoted 44 lines
Ross
________________________________
From: Khem Raj <[email protected]>
Sent: Saturday, November 25, 2023 7:38:21 AM
To: [email protected] <[email protected]>
Cc: Khem Raj <[email protected]>; Ross Burton <[email protected]>
Subject: [PATCH v10 3/3] vte: Separate out gtk4 pieces of vte into individual packagesThis avoids adding gtk4 dependencies when image may only desire the gtk3 pieces of vte.
Signed-off-by Khem Raj <[email protected]>Cc Ross Burton <[email protected]>---
v10: Added newmeta/recipes-support/vte/vte_0.74.1.bb | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)meta/recipes-support/vte/vte_0.74.1.bb +9
-2@@ -36,7 +36,15 @@ PACKAGECONFIG[gtk4] = "-Dgtk4=true,-Dgtk4=false,gtk4" PACKAGECONFIG[gnutls] = "-Dgnutls=true,-Dgnutls=false,gnutls" PACKAGECONFIG[systemd] = "-D_systemd=true,-D_systemd=false,systemd" -PACKAGES =+ "libvte ${PN}-prompt" +PACKAGES =+ "libvte-gtk4 ${PN}-gtk4 ${PN}-gtk4-dev libvte ${PN}-prompt" +FILES:libvte-gtk4 = "${libdir}/lib*gtk4.so.* ${libdir}/girepository-1.0/Vte-3.91.typelib" +FILES:${PN}-gtk4 ="${bindir}/vte-2.91-gtk4" +FILES:${PN}-gtk4-dev = "${libdir}/lib*gtk4.so \ + ${libdir}/pkgconfig/vte-2.91-gtk4.pc \ + ${datadir}/vala/vapi/vte-2.91-gtk4.deps \ + ${datadir}/vala/vapi/vte-2.91-gtk4.vapi \ + ${includedir}/vte-2.91-gtk4 \ + " FILES:${PN} +="${systemd_user_unitdir}" FILES:libvte = "${libdir}/*.so.* ${libdir}/girepository-1.0/*" FILES:${PN}-prompt = " \ --2.43.0