Skip to contentSkip to conversation

vte: Upgrade to 0.74.1

PATCH In review Khem Raj 3 participants 3 messages Nov 14, 2023 – Nov 15, 2023

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/1 vte: Upgrade to 0.74.1

* Enable systemd knob for distros with systemd in them.
* Add dependency on gtk4 which is needed
* Package systemd unit files
* Add packageconfig for fribidi defaulted to disabled

---
 ...01-Add-W_EXITCODE-macro-for-non-glibc-systems.patch |  4 ++--
 .../vte/{vte_0.72.2.bb => vte_0.74.1.bb}               | 10 ++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)
 rename meta/recipes-support/vte/{vte_0.72.2.bb => vte_0.74.1.bb} (80%)
meta/recipes-support/vte/vte/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch +2 -2
index b4100fc381e..daf07bfd3c9 100644
@@ -19,7 +19,7 @@ Signed-off-by: Andreas Müller <[email protected]>
 
 --- a/src/missing.hh
 +++ b/src/missing.hh
-@@ -24,6 +24,10 @@
+@@ -43,6 +43,10 @@
  #define NSIG (8 * sizeof(sigset_t))
  #endif
  
@@ -27,7 +27,7 @@ Signed-off-by: Andreas Müller <[email protected]>
 +#define W_EXITCODE(ret, sig) ((ret) << 8 | (sig))
 +#endif
 +
- #ifndef HAVE_FDWALK
+ #if !HAVE_FDWALK
  int fdwalk(int (*cb)(void* data, int fd),
             void* data);
 --- a/src/widget.cc
meta/recipes-support/vte/vte_0.74.1.bb renamed from meta/recipes-support/vte/vte_0.72.2.bb +6 -4
similarity index 80%
rename from meta/recipes-support/vte/vte_0.72.2.bb
rename to meta/recipes-support/vte/vte_0.74.1.bb
index 44e71491f62..2f0448edb3c 100644
@@ -11,16 +11,16 @@ 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"
 
 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 systemd
 
 # 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] = "2328c3f1c998350a18e0e513348e9fc581d57ea4e7b89aedf11e0e3c65042b4f"
 
 ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
 
@@ -32,8 +32,9 @@ do_compile:prepend() {
 # Package additional files
 FILES:${PN}-dev += "${datadir}/vala/vapi/*"
 
-PACKAGECONFIG ??= "gnutls"
+PACKAGECONFIG ??= "gnutls ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
 PACKAGECONFIG[vala] = "-Dvapi=true,-Dvapi=false,vala-native vala"
+PACKAGECONFIG[fribidi] = "-Dfribidi=true,-Dfribidi=false,fribidi"
 PACKAGECONFIG[gnutls] = "-Dgnutls=true,-Dgnutls=false,gnutls"
 PACKAGECONFIG[systemd] = "-D_systemd=true,-D_systemd=false,systemd"
 # vala requires gir
@@ -42,6 +43,7 @@ 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 \
Signature · 1 line
2.42.1
#1 lore raw

Hello,

The added dependency fails on the AB:

https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/6196/steps/13/logs/warnings
https://autobuilder.yoctoproject.org/typhoon/#/builders/23/builds/8464/steps/12/logs/warnings
https://autobuilder.yoctoproject.org/typhoon/#/builders/39/builds/8169/steps/11/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/44/builds/8168/steps/20/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/47/builds/8114/steps/11/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/97/builds/7488/steps/12/logs/warnings

Quoted 93 lines · Khem Raj

* Enable systemd knob for distros with systemd in them.
* Add dependency on gtk4 which is needed
* Package systemd unit files
* Add packageconfig for fribidi defaulted to disabled

---
 ...01-Add-W_EXITCODE-macro-for-non-glibc-systems.patch |  4 ++--
 .../vte/{vte_0.72.2.bb => vte_0.74.1.bb}               | 10 ++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)
 rename meta/recipes-support/vte/{vte_0.72.2.bb => vte_0.74.1.bb} (80%)
meta/recipes-support/vte/vte/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch +2 -2
index b4100fc381e..daf07bfd3c9 100644
@@ -19,7 +19,7 @@ Signed-off-by: Andreas M�ller <[email protected]>
 
 --- a/src/missing.hh
 +++ b/src/missing.hh
-@@ -24,6 +24,10 @@
+@@ -43,6 +43,10 @@
  #define NSIG (8 * sizeof(sigset_t))
  #endif
 
@@ -27,7 +27,7 @@ Signed-off-by: Andreas M�ller <[email protected]>
 +#define W_EXITCODE(ret, sig) ((ret) << 8 | (sig))
 +#endif
 +
- #ifndef HAVE_FDWALK
+ #if !HAVE_FDWALK
  int fdwalk(int (*cb)(void* data, int fd),
             void* data);
 --- a/src/widget.cc
meta/recipes-support/vte/vte_0.74.1.bb renamed from meta/recipes-support/vte/vte_0.72.2.bb +6 -4
similarity index 80%
rename from meta/recipes-support/vte/vte_0.72.2.bb
rename to meta/recipes-support/vte/vte_0.74.1.bb
index 44e71491f62..2f0448edb3c 100644
@@ -11,16 +11,16 @@ 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"
 
 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 systemd
 
 # 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] = "2328c3f1c998350a18e0e513348e9fc581d57ea4e7b89aedf11e0e3c65042b4f"
 
 ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
 
@@ -32,8 +32,9 @@ do_compile:prepend() {
 # Package additional files
 FILES:${PN}-dev += "${datadir}/vala/vapi/*"
 
-PACKAGECONFIG ??= "gnutls"
+PACKAGECONFIG ??= "gnutls ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
 PACKAGECONFIG[vala] = "-Dvapi=true,-Dvapi=false,vala-native vala"
+PACKAGECONFIG[fribidi] = "-Dfribidi=true,-Dfribidi=false,fribidi"
 PACKAGECONFIG[gnutls] = "-Dgnutls=true,-Dgnutls=false,gnutls"
 PACKAGECONFIG[systemd] = "-D_systemd=true,-D_systemd=false,systemd"
 # vala requires gir
@@ -42,6 +43,7 @@ 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 \
Signature · 11 lines
2.42.1



-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#190522): https://lists.openembedded.org/g/openembedded-core/message/190522
Mute This Topic: https://lists.openembedded.org/mt/102593386/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
#2 lore raw

Please note also the earlier patch by Markus Volk, we nearly got it to merging until a snag with rust on x32. I suspect that snag may have been resolved since, and in any case I suggest you Khem take that patch instead and push it forward, it's nearly ready unlike this one.

Alex

Quoted 115 lines · Alexandre Belloni via lists.openembedded.org

Hello,

The added dependency fails on the AB:

https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/6196/steps/13/logs/warnings
https://autobuilder.yoctoproject.org/typhoon/#/builders/23/builds/8464/steps/12/logs/warnings
https://autobuilder.yoctoproject.org/typhoon/#/builders/39/builds/8169/steps/11/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/44/builds/8168/steps/20/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/47/builds/8114/steps/11/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/97/builds/7488/steps/12/logs/warnings

Quoted 81 lines · Khem Raj

* Enable systemd knob for distros with systemd in them.
* Add dependency on gtk4 which is needed
* Package systemd unit files
* Add packageconfig for fribidi defaulted to disabled

---
 ...01-Add-W_EXITCODE-macro-for-non-glibc-systems.patch |  4 ++--
 .../vte/{vte_0.72.2.bb => vte_0.74.1.bb}               | 10 ++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)
 rename meta/recipes-support/vte/{vte_0.72.2.bb => vte_0.74.1.bb} (80%)
meta/recipes-support/vte/vte/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch +2 -2
index b4100fc381e..daf07bfd3c9 100644
@@ -19,7 +19,7 @@ Signed-off-by: Andreas Müller <[email protected]>
 
 --- a/src/missing.hh
 +++ b/src/missing.hh
-@@ -24,6 +24,10 @@
+@@ -43,6 +43,10 @@
  #define NSIG (8 * sizeof(sigset_t))
  #endif
 
@@ -27,7 +27,7 @@ Signed-off-by: Andreas Müller <[email protected]>
 +#define W_EXITCODE(ret, sig) ((ret) << 8 | (sig))
 +#endif
 +
- #ifndef HAVE_FDWALK
+ #if !HAVE_FDWALK
  int fdwalk(int (*cb)(void* data, int fd),
             void* data);
 --- a/src/widget.cc
meta/recipes-support/vte/vte_0.74.1.bb renamed from meta/recipes-support/vte/vte_0.72.2.bb +6 -5
similarity index 80%
rename from meta/recipes-support/vte/vte_0.72.2.bb
rename to meta/recipes-support/vte/vte_0.74.1.bb
index 44e71491f62..2f0448edb3c 100644
@@ -11,16 +11,16 @@ 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"
 
 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 systemd
 
 # 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] = "2328c3f1c998350a18e0e513348e9fc581d57ea4e7b89aedf11e0e3c65042b4f"
 
 ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
 
@@ -32,8 +32,9 @@ do_compile:prepend() {
 # Package additional files
 FILES:${PN}-dev += "${datadir}/vala/vapi/*"
 
-PACKAGECONFIG ??= "gnutls"
+PACKAGECONFIG ??= "gnutls ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
 PACKAGECONFIG[vala] = "-Dvapi=true,-Dvapi=false,vala-native vala"
+PACKAGECONFIG[fribidi] = "-Dfribidi=true,-Dfribidi=false,fribidi"
 PACKAGECONFIG[gnutls] = "-Dgnutls=true,-Dgnutls=false,gnutls"
 PACKAGECONFIG[systemd] = "-D_systemd=true,-D_systemd=false,systemd"
 # vala requires gir
@@ -42,6 +43,7 @@ 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 \
--
Quoted 6 lines

2.42.1

--
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 (#190581): https://lists.openembedded.org/g/openembedded-core/message/190581
Mute This Topic: https://lists.openembedded.org/mt/102593386/1686489
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-