| Message ID | 20231122063119.3620722-1-raj.khem@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v9,1/3] vte: upgrade 2.72.2 -> 2.74.0 | expand |
I think you mean “0.72.2". Ross > On 22 Nov 2023, at 06:31, Khem Raj via lists.openembedded.org <raj.khem=gmail.com@lists.openembedded.org> wrote: > > From: Markus Volk <f_l_k@t-online.de> > > 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) > > Signed-off-by: Markus Volk <f_l_k@t-online.de> > Signed-off-by: Khem Raj <raj.khem@gmail.com> > Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> > --- > v9: Rebased > > ...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%) > > diff --git a/meta/recipes-support/vte/vte/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch b/meta/recipes-support/vte/vte/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch > index b4100fc381e..8934d5f80a6 100644 > --- a/meta/recipes-support/vte/vte/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch > +++ b/meta/recipes-support/vte/vte/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch > @@ -11,32 +11,25 @@ Upstream-Status: Submitted [1] > Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> > > [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 > + > diff --git a/meta/recipes-support/vte/vte_0.72.2.bb b/meta/recipes-support/vte/vte_0.74.0.bb > similarity index 66% > rename from meta/recipes-support/vte/vte_0.72.2.bb > rename to meta/recipes-support/vte/vte_0.74.0.bb > index 44e71491f62..21203adcf79 100644 > --- a/meta/recipes-support/vte/vte_0.72.2.bb > +++ b/meta/recipes-support/vte/vte_0.74.0.bb > @@ -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.43.0 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#191018): https://lists.openembedded.org/g/openembedded-core/message/191018 > Mute This Topic: https://lists.openembedded.org/mt/102744802/6875888 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [ross.burton@arm.com] > -=-=-=-=-=-=-=-=-=-=-=- >
On 22 Nov 2023, at 06:31, Khem Raj via lists.openembedded.org <raj.khem=gmail.com@lists.openembedded.org> wrote: > +PACKAGECONFIG ??= " \ > + gnutls \ > + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ > + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gtk4', '', d)} \ > +" > +PACKAGECONFIG[gtk4] = "-Dgtk4=true,-Dgtk4=false,gtk4” So for example a Sato system which is entirely 100% GTK+3 will now also pull in the entire GTK4 stack, right? That’s clearly and obviously the wrong thing to do. Split the packages so that the GTK3 binaries are in separate packages to the GTK4 binaries. Ross
> On 24 Nov 2023, at 16:21, Ross Burton via lists.openembedded.org <ross.burton=arm.com@lists.openembedded.org> wrote: > > On 22 Nov 2023, at 06:31, Khem Raj via lists.openembedded.org <raj.khem=gmail.com@lists.openembedded.org> wrote: >> +PACKAGECONFIG ??= " \ >> + gnutls \ >> + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ >> + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gtk4', '', d)} \ >> +" >> +PACKAGECONFIG[gtk4] = "-Dgtk4=true,-Dgtk4=false,gtk4” > > So for example a Sato system which is entirely 100% GTK+3 will now also pull in the entire GTK4 stack, right? > > That’s clearly and obviously the wrong thing to do. > > Split the packages so that the GTK3 binaries are in separate packages to the GTK4 binaries. I can only presume nobody looks at buildhistory-diff, but this isn’t a subtle problem: packages/core2-64-poky-linux/vte/vte-dbg: PKGSIZE changed from 7057208 to 14127056 (+100%) packages/core2-64-poky-linux/vte/vte-dbg: RRECOMMENDS: removed "fribidi-dbg", added "gtk4-dbg libsystemd-dbg" packages/core2-64-poky-linux/vte/vte-dev: RDEPENDS: added "gtk4-dev cairo-dev" packages/core2-64-poky-linux/vte/vte-dev: PKGSIZE changed from 391257 to 815848 (+109%) packages/core2-64-poky-linux/vte/vte-dev: RRECOMMENDS: removed "fribidi-dev", added "vala-dev libsystemd-dev gtk4-dev systemd-dev" packages/core2-64-poky-linux/vte/vte-dev: FILELIST: added "/usr/include/vte-2.91-gtk4/vte/vte.h /usr/include/vte-2.91-gtk4/vte/vteglobals.h /usr/include/vte-2.91-gtk4/vte/vteenums.h /usr/include/vte-2.91-gtk4/vte/vteterminal.h /usr/share/gir-1.0/Vte-3.91.gir /usr/share/vala/vapi/vte-2.91-gtk4.vapi /usr/include/vte-2.91-gtk4/vte/vtemacros.h /usr/include/vte-2.91-gtk4/vte/vteregex.h /usr/share/vala/vapi/vte-2.91.deps /usr/include/vte-2.91-gtk4/vte/vtepty.h /usr/lib/libvte-2.91-gtk4.so /usr/share/vala/vapi/vte-2.91-gtk4.deps /usr/share/vala/vapi/vte-2.91.vapi /usr/include/vte-2.91-gtk4/vte/vtedeprecated.h /usr/include/vte-2.91-gtk4/vte/vtetypebuiltins.h /usr/lib/pkgconfig/vte-2.91-gtk4.pc /usr/include/vte-2.91-gtk4/vte/vtetypebuiltins-gtk4.h /usr/include/vte-2.91-gtk4/vte/vteversion.h" packages/core2-64-poky-linux/vte/vte-locale-el: PKGSIZE changed from 1278 to 1622 (+27%) packages/core2-64-poky-linux/vte/vte: RDEPENDS: added "gtk4 (['>= 4.12.3'])" packages/core2-64-poky-linux/vte/vte: PKGSIZE changed from 93336 to 178466 (+91%) packages/core2-64-poky-linux/vte/vte: FILELIST: added "/usr/lib/systemd/user/vte-spawn-.scope.d/defaults.conf /usr/bin/vte-2.91-gtk4” Ross
On Fri, Nov 24, 2023 at 8:24 AM Ross Burton <Ross.Burton@arm.com> wrote: > > > > On 24 Nov 2023, at 16:21, Ross Burton via lists.openembedded.org > <ross.burton=arm.com@lists.openembedded.org> wrote: > > > > On 22 Nov 2023, at 06:31, Khem Raj via lists.openembedded.org <raj.khem= > gmail.com@lists.openembedded.org> wrote: > >> +PACKAGECONFIG ??= " \ > >> + gnutls \ > >> + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ > >> + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gtk4', '', d)} \ > >> +" > >> +PACKAGECONFIG[gtk4] = "-Dgtk4=true,-Dgtk4=false,gtk4” > > > > So for example a Sato system which is entirely 100% GTK+3 will now also > pull in the entire GTK4 stack, right? > > > > That’s clearly and obviously the wrong thing to do. > > > > Split the packages so that the GTK3 binaries are in separate packages to > the GTK4 binaries. > Hmm interesting I wonder if it Will avoid adding the dependencies for dbg and dev packages > > I can only presume nobody looks at buildhistory-diff, but this isn’t a > subtle problem: > > packages/core2-64-poky-linux/vte/vte-dbg: PKGSIZE changed from 7057208 to > 14127056 (+100%) > packages/core2-64-poky-linux/vte/vte-dbg: RRECOMMENDS: removed > "fribidi-dbg", added "gtk4-dbg libsystemd-dbg" > packages/core2-64-poky-linux/vte/vte-dev: RDEPENDS: added "gtk4-dev > cairo-dev" > packages/core2-64-poky-linux/vte/vte-dev: PKGSIZE changed from 391257 to > 815848 (+109%) > packages/core2-64-poky-linux/vte/vte-dev: RRECOMMENDS: removed > "fribidi-dev", added "vala-dev libsystemd-dev gtk4-dev systemd-dev" > packages/core2-64-poky-linux/vte/vte-dev: FILELIST: added > "/usr/include/vte-2.91-gtk4/vte/vte.h > /usr/include/vte-2.91-gtk4/vte/vteglobals.h > /usr/include/vte-2.91-gtk4/vte/vteenums.h > /usr/include/vte-2.91-gtk4/vte/vteterminal.h > /usr/share/gir-1.0/Vte-3.91.gir /usr/share/vala/vapi/vte-2.91-gtk4.vapi > /usr/include/vte-2.91-gtk4/vte/vtemacros.h > /usr/include/vte-2.91-gtk4/vte/vteregex.h > /usr/share/vala/vapi/vte-2.91.deps /usr/include/vte-2.91-gtk4/vte/vtepty.h > /usr/lib/libvte-2.91-gtk4.so /usr/share/vala/vapi/vte-2.91-gtk4.deps > /usr/share/vala/vapi/vte-2.91.vapi > /usr/include/vte-2.91-gtk4/vte/vtedeprecated.h > /usr/include/vte-2.91-gtk4/vte/vtetypebuiltins.h > /usr/lib/pkgconfig/vte-2.91-gtk4.pc > /usr/include/vte-2.91-gtk4/vte/vtetypebuiltins-gtk4.h > /usr/include/vte-2.91-gtk4/vte/vteversion.h" > packages/core2-64-poky-linux/vte/vte-locale-el: PKGSIZE changed from 1278 > to 1622 (+27%) > packages/core2-64-poky-linux/vte/vte: RDEPENDS: added "gtk4 (['>= > 4.12.3'])" > packages/core2-64-poky-linux/vte/vte: PKGSIZE changed from 93336 to 178466 > (+91%) > packages/core2-64-poky-linux/vte/vte: FILELIST: added > "/usr/lib/systemd/user/vte-spawn-.scope.d/defaults.conf > /usr/bin/vte-2.91-gtk4” > > Ross
> > Split the packages so that the GTK3 binaries are in separate packages to the GTK4 binaries. > > Hmm interesting I wonder if it Will avoid adding the dependencies for dbg and dev packages It won’t, you’ll need to manually handle those dependencies. Ross
On Fri, Nov 24, 2023 at 9:01 AM Ross Burton <Ross.Burton@arm.com> wrote: > > > Split the packages so that the GTK3 binaries are in separate packages > to the GTK4 binaries. > > > > Hmm interesting I wonder if it Will avoid adding the dependencies for > dbg and dev packages > > It won’t, you’ll need to manually handle those dependencies. > Right. So the real question still remains regardless how this is packaged which is can multilib rootfs have different glib cache > > Ross
On Fri, 24 Nov 2023 at 18:05, Khem Raj <raj.khem@gmail.com> wrote: >> > > Split the packages so that the GTK3 binaries are in separate packages to the GTK4 binaries. >> > >> > Hmm interesting I wonder if it Will avoid adding the dependencies for dbg and dev packages >> >> It won’t, you’ll need to manually handle those dependencies. > > > Right. So the real question still remains regardless how this is packaged which is can multilib rootfs have different glib cache That only becomes an issue once we have gtk4 in our multilib testing, and as long as vte packaging splits the pieces properly (Ross's buildhistory output shows it can be easily done), we don't have to deal with it for now. Markus, perhaps you can do it, as you have more experience in gtk-related packaging? Alex
diff --git a/meta/recipes-support/vte/vte/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch b/meta/recipes-support/vte/vte/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch index b4100fc381e..8934d5f80a6 100644 --- a/meta/recipes-support/vte/vte/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch +++ b/meta/recipes-support/vte/vte/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch @@ -11,32 +11,25 @@ Upstream-Status: Submitted [1] Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> [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 + diff --git a/meta/recipes-support/vte/vte_0.72.2.bb b/meta/recipes-support/vte/vte_0.74.0.bb similarity index 66% rename from meta/recipes-support/vte/vte_0.72.2.bb rename to meta/recipes-support/vte/vte_0.74.0.bb index 44e71491f62..21203adcf79 100644 --- a/meta/recipes-support/vte/vte_0.72.2.bb +++ b/meta/recipes-support/vte/vte_0.74.0.bb @@ -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"