Message ID | 20221210052137.303984-5-f_l_k@t-online.de |
---|---|
State | Under Review |
Headers | show |
Series | [meta-gnome,1/6] gdm: update 42.0 -> 43.0 | expand |
On Fri, Dec 9, 2022 at 9:22 PM Markus Volk <f_l_k@t-online.de> wrote: > > Signed-off-by: Markus Volk <f_l_k@t-online.de> > --- > ...urceview5_5.4.2.bb => gtksourceview5_5.6.1.bb} | 15 +++++++++------ > 1 file changed, 9 insertions(+), 6 deletions(-) > rename meta-gnome/recipes-gnome/gtksourceview/{gtksourceview5_5.4.2.bb => gtksourceview5_5.6.1.bb} (65%) > > diff --git a/meta-gnome/recipes-gnome/gtksourceview/gtksourceview5_5.4.2.bb b/meta-gnome/recipes-gnome/gtksourceview/gtksourceview5_5.6.1.bb > similarity index 65% > rename from meta-gnome/recipes-gnome/gtksourceview/gtksourceview5_5.4.2.bb > rename to meta-gnome/recipes-gnome/gtksourceview/gtksourceview5_5.6.1.bb > index 297f79fe2..a35a8df7d 100644 > --- a/meta-gnome/recipes-gnome/gtksourceview/gtksourceview5_5.4.2.bb > +++ b/meta-gnome/recipes-gnome/gtksourceview/gtksourceview5_5.6.1.bb > @@ -5,13 +5,14 @@ LICENSE = "LGPL-2.1-only" > LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" > > DEPENDS = " \ > + fribidi \ > glib-2.0-native \ > gnome-common-native \ > - intltool-native \ > - gtk+3 \ > + fontconfig \ > gtk4 \ > libxml2 \ > libpcre2 \ > + pango \ > " > > PNAME = "gtksourceview" > @@ -22,14 +23,16 @@ GNOMEBASEBUILDCLASS = "meson" > > inherit gnomebase lib_package gettext features_check gtk-doc gtk-icon-cache gobject-introspection vala > > -ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" > -REQUIRED_DISTRO_FEATURES = "opengl" > +REQUIRED_DISTRO_FEATURES = "opengl gtk" > this will need few more recipes to be enabled only if gtk is in distro feature. Please test a parse step for world build with meta-gnome without gtk in distro features ERROR: Nothing PROVIDES 'gtksourceview5' (but /home/pokybuild/yocto-worker/meta-oe/build/meta-openembedded/meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_42.2.bb, /home/pokybuild/yocto-worker/meta-oe/build/meta-openembedded/meta-gnome/recipes-gnome/gnome-text-editor/gnome-text-editor_43.1.bb DEPENDS on or otherwise requires it) gtksourceview5 was skipped: missing required distro feature 'gtk' (not in DISTRO_FEATURES) ERROR: Required build target 'meta-world-pkgdata' has no buildable providers. Missing or unbuildable dependency chain was: ['meta-world-pkgdata', 'gnome-calculator', 'gtksourceview5'] > -SRC_URI = "https://download.gnome.org/sources/gtksourceview/5.4/${PNAME}-${PV}.tar.xz" > -SRC_URI[sha256sum] = "ad140e07eb841910de483c092bd4885abd29baadd6e95fa22d93ed2df0b79de7" > +SRC_URI = "https://download.gnome.org/sources/gtksourceview/5.6/${PNAME}-${PV}.tar.xz" > +SRC_URI[sha256sum] = "659d9cc9d034a114f07e7e134ee80d77dec0497cb1516ae5369119c2fcb9da16" > > GIR_MESON_ENABLE_FLAG = 'enabled' > GIR_MESON_DISABLE_FLAG = 'disabled' > GTKDOC_MESON_OPTION = "gtk_doc" > > +PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'vulkan', d)}" > +PACKAGECONFIG[vulkan] = ",,vulkan-loader vulkan-headers" > + > FILES:${PN} += "${datadir}/gtksourceview-5" > -- > 2.34.1 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#100016): https://lists.openembedded.org/g/openembedded-devel/message/100016 > Mute This Topic: https://lists.openembedded.org/mt/95577353/1997914 > Group Owner: openembedded-devel+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- >
diff --git a/meta-gnome/recipes-gnome/gtksourceview/gtksourceview5_5.4.2.bb b/meta-gnome/recipes-gnome/gtksourceview/gtksourceview5_5.6.1.bb similarity index 65% rename from meta-gnome/recipes-gnome/gtksourceview/gtksourceview5_5.4.2.bb rename to meta-gnome/recipes-gnome/gtksourceview/gtksourceview5_5.6.1.bb index 297f79fe2..a35a8df7d 100644 --- a/meta-gnome/recipes-gnome/gtksourceview/gtksourceview5_5.4.2.bb +++ b/meta-gnome/recipes-gnome/gtksourceview/gtksourceview5_5.6.1.bb @@ -5,13 +5,14 @@ LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" DEPENDS = " \ + fribidi \ glib-2.0-native \ gnome-common-native \ - intltool-native \ - gtk+3 \ + fontconfig \ gtk4 \ libxml2 \ libpcre2 \ + pango \ " PNAME = "gtksourceview" @@ -22,14 +23,16 @@ GNOMEBASEBUILDCLASS = "meson" inherit gnomebase lib_package gettext features_check gtk-doc gtk-icon-cache gobject-introspection vala -ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" -REQUIRED_DISTRO_FEATURES = "opengl" +REQUIRED_DISTRO_FEATURES = "opengl gtk" -SRC_URI = "https://download.gnome.org/sources/gtksourceview/5.4/${PNAME}-${PV}.tar.xz" -SRC_URI[sha256sum] = "ad140e07eb841910de483c092bd4885abd29baadd6e95fa22d93ed2df0b79de7" +SRC_URI = "https://download.gnome.org/sources/gtksourceview/5.6/${PNAME}-${PV}.tar.xz" +SRC_URI[sha256sum] = "659d9cc9d034a114f07e7e134ee80d77dec0497cb1516ae5369119c2fcb9da16" GIR_MESON_ENABLE_FLAG = 'enabled' GIR_MESON_DISABLE_FLAG = 'disabled' GTKDOC_MESON_OPTION = "gtk_doc" +PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'vulkan', d)}" +PACKAGECONFIG[vulkan] = ",,vulkan-loader vulkan-headers" + FILES:${PN} += "${datadir}/gtksourceview-5"
Signed-off-by: Markus Volk <f_l_k@t-online.de> --- ...urceview5_5.4.2.bb => gtksourceview5_5.6.1.bb} | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) rename meta-gnome/recipes-gnome/gtksourceview/{gtksourceview5_5.4.2.bb => gtksourceview5_5.6.1.bb} (65%)