| Message ID | 20231125073823.159294-3-raj.khem@gmail.com |
|---|---|
| State | Accepted, archived |
| Commit | d2c4e8cb85c6a5ca37c7990f879c3b650df5770b |
| Headers | show |
| Series | [v10,1/3] vte: upgrade 0.72.2 -> 0.74.0 | expand |
Does this allow installing the gtk4 libraries without gtk3? Looks like the GIR files will mean pulling in both. Ross
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 On Sat, Nov 25, 2023 at 6:04 AM Ross Burton <Ross.Burton@arm.com> wrote: > Does this allow installing the gtk4 libraries without gtk3? Looks like the > GIR files will mean pulling in both. > > Ross > ------------------------------ > *From:* Khem Raj <raj.khem@gmail.com> > *Sent:* Saturday, November 25, 2023 7:38:21 AM > *To:* openembedded-core@lists.openembedded.org < > openembedded-core@lists.openembedded.org> > *Cc:* Khem Raj <raj.khem@gmail.com>; Ross Burton <Ross.Burton@arm.com> > *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. > > Signed-off-by: Khem Raj <raj.khem@gmail.com> > Cc: Ross Burton <ross.burton@arm.com> > --- > v10: Added new > > meta/recipes-support/vte/vte_0.74.1.bb | 10 +++++++++- > 1 file changed, 9 insertions(+), 1 deletion(-) > > diff --git a/meta/recipes-support/vte/vte_0.74.1.bb > b/meta/recipes-support/vte/vte_0.74.1.bb > index 8a7054a13cd..91c331d44cc 100644 > --- a/meta/recipes-support/vte/vte_0.74.1.bb > +++ b/meta/recipes-support/vte/vte_0.74.1.bb > @@ -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 > >
On Sat, Nov 25, 2023 at 6:04 AM Ross Burton <Ross.Burton@arm.com> wrote: > > 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. > > Ross > ________________________________ > From: Khem Raj <raj.khem@gmail.com> > Sent: Saturday, November 25, 2023 7:38:21 AM > To: openembedded-core@lists.openembedded.org <openembedded-core@lists.openembedded.org> > Cc: Khem Raj <raj.khem@gmail.com>; Ross Burton <Ross.Burton@arm.com> > 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. > > Signed-off-by: Khem Raj <raj.khem@gmail.com> > Cc: Ross Burton <ross.burton@arm.com> > --- > v10: Added new > > meta/recipes-support/vte/vte_0.74.1.bb | 10 +++++++++- > 1 file changed, 9 insertions(+), 1 deletion(-) > > diff --git a/meta/recipes-support/vte/vte_0.74.1.bb b/meta/recipes-support/vte/vte_0.74.1.bb > index 8a7054a13cd..91c331d44cc 100644 > --- a/meta/recipes-support/vte/vte_0.74.1.bb > +++ b/meta/recipes-support/vte/vte_0.74.1.bb > @@ -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 >
diff --git a/meta/recipes-support/vte/vte_0.74.1.bb b/meta/recipes-support/vte/vte_0.74.1.bb index 8a7054a13cd..91c331d44cc 100644 --- a/meta/recipes-support/vte/vte_0.74.1.bb +++ b/meta/recipes-support/vte/vte_0.74.1.bb @@ -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 = " \
This avoids adding gtk4 dependencies when image may only desire the gtk3 pieces of vte. Signed-off-by: Khem Raj <raj.khem@gmail.com> Cc: Ross Burton <ross.burton@arm.com> --- v10: Added new meta/recipes-support/vte/vte_0.74.1.bb | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)