Skip to contentSkip to conversation

vte: Separate out gtk4 pieces of vte into individual packages

PATCH In review Khem Raj 2 participants 3 messages Nov 28, 2023 – Dec 1, 2023

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH v11 1/1 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.

---
v11: Package Vte-3.91.gir into ${PN}-gtk4-dev

 meta/recipes-support/vte/vte_0.74.1.bb | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)
meta/recipes-support/vte/vte_0.74.1.bb +10 -1
index 8a7054a13cd..071f6684644 100644
@@ -36,7 +36,16 @@ 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}/gir-1.0/Vte-3.91.gir \
+                        ${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
#1 lore raw

Hello Khem,

The vte upgrade causes librsvg to fail on qemux86-64-x32:
https://autobuilder.yoctoproject.org/typhoon/#/builders/57/builds/8077/steps/11/logs/stdio

I'm not sure how and I was suspecting other rust changes but I confirmed this is the 3 patches series as this one was successful:
https://autobuilder.yoctoproject.org/typhoon/#/builders/57/builds/8083

Quoted 46 lines · Khem Raj

This avoids adding gtk4 dependencies when image may only desire the gtk3 pieces of vte.

---
v11: Package Vte-3.91.gir into ${PN}-gtk4-dev

 meta/recipes-support/vte/vte_0.74.1.bb | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)
meta/recipes-support/vte/vte_0.74.1.bb +10 -1
index 8a7054a13cd..071f6684644 100644
@@ -36,7 +36,16 @@ 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}/gir-1.0/Vte-3.91.gir \
+                        ${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 · 11 lines
2.43.0



-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191330): https://lists.openembedded.org/g/openembedded-core/message/191330
Mute This Topic: https://lists.openembedded.org/mt/102841833/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
author
#2 lore raw
Quoted 6 lines · Alexandre Belloni

Hello Khem,

The vte upgrade causes librsvg to fail on qemux86-64-x32:
https://autobuilder.yoctoproject.org/typhoon/#/builders/57/builds/8077/steps/11/logs/stdio

I think it could be that os and libc are not computed correctly for rust on x32 Can you try this patch on top of these three.

https://snips.sh/f/WuMM_2WYXh

Quoted 58 lines

I'm not sure how and I was suspecting other rust changes but I confirmed this is the 3 patches series as this one was successful:
https://autobuilder.yoctoproject.org/typhoon/#/builders/57/builds/8083

Quoted 38 lines · Khem Raj

This avoids adding gtk4 dependencies when image may only desire the gtk3 pieces of vte.

---
v11: Package Vte-3.91.gir into ${PN}-gtk4-dev

 meta/recipes-support/vte/vte_0.74.1.bb | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)
meta/recipes-support/vte/vte_0.74.1.bb +10 -2
index 8a7054a13cd..071f6684644 100644
@@ -36,7 +36,16 @@ 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}/gir-1.0/Vte-3.91.gir \
+                        ${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

Quoted 8 lines

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