Signed-off-by: Markus Volk <[email protected]>
---
.../recipes-gnome/gnome-boxes/gnome-boxes_45.0.bb | 1 +
meta-gnome/recipes-connectivity/gtk-vnc/gtk-vnc_1.3.1.bb | 3 +++
meta-gnome/recipes-gnome/gedit/gedit_46.1.bb | 2 +-
meta-gnome/recipes-gnome/gjs/gjs_1.78.0.bb | 2 +-
.../recipes-gnome/gnome-calculator/gnome-calculator_45.0.2.bb | 1 +
meta-gnome/recipes-gnome/gsound/gsound_1.0.3.bb | 2 ++
meta-gnome/recipes-gnome/libgweather/libgweather4_4.4.0.bb | 1 +
meta-gnome/recipes-gnome/rest/rest_0.9.1.bb | 2 --
meta-gnome/recipes-gnome/tracker/tracker-miners_3.6.2.bb | 1 +
.../libcloudproviders/libcloudproviders_0.3.4.bb | 1 +
meta-oe/recipes-gnome/gcr/gcr3_3.41.1.bb | 3 +++
meta-oe/recipes-support/libosinfo/libosinfo_1.11.0.bb | 4 +++-
12 files changed, 18 insertions(+), 5 deletions(-)
diff --git
a/meta-gnome/dynamic-layers/meta-virtualization/recipes-gnome/gnome-boxes/gnome-boxes_45.0.bb
b/meta-gnome/dynamic-layers/meta-virtualization/recipes-gnome/gnome-boxes/gnome-boxes_45.0.bb
index f2aeb8878..fc1235109 100644
---
a/meta-gnome/dynamic-layers/meta-virtualization/recipes-gnome/gnome-boxes/gnome-boxes_45.0.bb
+++
b/meta-gnome/dynamic-layers/meta-virtualization/recipes-gnome/gnome-boxes/gnome-boxes_45.0.bb
@@ -33,6 +33,7 @@ inherit gnomebase gsettings pkgconfig mime-xdg gtk-icon-cache
gobject-introspect
SRC_URI[archive.sha256sum] =
"cc63080eefa147a8472ab1a5ff087b97a27ab723a4ee005ed41e8c9dd7798e41"
GIR_MESON_OPTION = ""
+VALA_MESON_OPTION = ""
FILES:${PN} += "${datadir}"
diff --git a/meta-gnome/recipes-connectivity/gtk-vnc/gtk-vnc_1.3.1.bb
b/meta-gnome/recipes-connectivity/gtk-vnc/gtk-vnc_1.3.1.bb
index 36eb8ca19..8737b6d7e 100644
--- a/meta-gnome/recipes-connectivity/gtk-vnc/gtk-vnc_1.3.1.bb
+++ b/meta-gnome/recipes-connectivity/gtk-vnc/gtk-vnc_1.3.1.bb
@@ -15,6 +15,9 @@ DEPENDS = " \
GNOMEBASEBUILDCLASS = "meson"
REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
GIR_MESON_OPTION = ""
+VALA_MESON_OPTION = "with-vala"
+VALA_MESON_ENABLE_FLAG ?= 'enabled'
+VALA_MESON_DISABLE_FLAG ?= 'disabled'
PACKAGECONFIG[pulseaudio] =
"-Dpulseaudio=enabled,-Dpulseaudio=disabled,pulseaudio"
PACKAGECONFIG[sasl] = "-Dsasl=enabled,-Dsasl=disabled,cyrus-sasl"
diff --git a/meta-gnome/recipes-gnome/gedit/gedit_46.1.bb
b/meta-gnome/recipes-gnome/gedit/gedit_46.1.bb
index 01d7a072a..0014b512a 100644
--- a/meta-gnome/recipes-gnome/gedit/gedit_46.1.bb
+++ b/meta-gnome/recipes-gnome/gedit/gedit_46.1.bb
@@ -19,7 +19,7 @@ DEPENDS = " \
tepl \
"
-inherit gnomebase gsettings itstool gnome-help gobject-introspection gtk-doc
vala gettext features_check mime-xdg gtk-icon-cache python3targetconfig
+inherit gnomebase gsettings itstool gnome-help gobject-introspection gtk-doc
gettext features_check mime-xdg gtk-icon-cache python3targetconfig
def gnome_verdir(v):
return oe.utils.trim_version(v, 1)
diff --git a/meta-gnome/recipes-gnome/gjs/gjs_1.78.0.bb
b/meta-gnome/recipes-gnome/gjs/gjs_1.78.0.bb
index 0af9f5600..e91fa1bc6 100644
--- a/meta-gnome/recipes-gnome/gjs/gjs_1.78.0.bb
+++ b/meta-gnome/recipes-gnome/gjs/gjs_1.78.0.bb
@@ -6,7 +6,7 @@ GNOMEBASEBUILDCLASS = "meson"
DEPENDS = "mozjs-115 cairo"
-inherit gnomebase gsettings gobject-introspection vala gettext features_check
upstream-version-is-even pkgconfig
+inherit gnomebase gsettings gobject-introspection gettext features_check
upstream-version-is-even pkgconfig
SRC_URI[archive.sha256sum] =
"fbaa20e0917668830800f92951688f9fc08f01296affd5cdb4b35f750be27dc9"
SRC_URI += " \
diff --git
a/meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_45.0.2.bb
b/meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_45.0.2.bb
index cde2e1d3c..3482f76a5 100644
--- a/meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_45.0.2.bb
+++ b/meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_45.0.2.bb
@@ -18,6 +18,7 @@ DEPENDS = " \
GIR_MESON_OPTION = 'disable-introspection'
GIR_MESON_ENABLE_FLAG = 'false'
GIR_MESON_DISABLE_FLAG = 'true'
+VALA_MESON_OPTION = ''
GNOMEBASEBUILDCLASS = "meson"
GTKIC_VERSION = '4'
diff --git a/meta-gnome/recipes-gnome/gsound/gsound_1.0.3.bb
b/meta-gnome/recipes-gnome/gsound/gsound_1.0.3.bb
index bdef603f0..d01067eb1 100644
--- a/meta-gnome/recipes-gnome/gsound/gsound_1.0.3.bb
+++ b/meta-gnome/recipes-gnome/gsound/gsound_1.0.3.bb
@@ -9,6 +9,8 @@ DEPENDS = " \
GNOMEBASEBUILDCLASS = "meson"
+VALA_MESON_OPTION = "enable_vala"
+
inherit gnomebase gettext gobject-introspection vala
SRC_URI[archive.sha256sum] =
"ca2d039e1ebd148647017a7f548862350bc9af01986d39f10cfdc8e95f07881a"
diff --git a/meta-gnome/recipes-gnome/libgweather/libgweather4_4.4.0.bb
b/meta-gnome/recipes-gnome/libgweather/libgweather4_4.4.0.bb
index 81ae8317d..06353efab 100644
--- a/meta-gnome/recipes-gnome/libgweather/libgweather4_4.4.0.bb
+++ b/meta-gnome/recipes-gnome/libgweather/libgweather4_4.4.0.bb
@@ -15,6 +15,7 @@ SRC_URI +=
"file://0001-Allow-building-gir-in-cross-environments.patch"
SRC_URI[archive.sha256sum] =
"366e866ff2a708b894cfea9475b8e8ff54cb3e2b477ea72a8ade0dabee5f48a4"
GTKDOC_MESON_OPTION = "gtk_doc"
+VALA_MESON_OPTION = "enable_vala"
DEPENDS = " \
geocode-glib \
diff --git a/meta-gnome/recipes-gnome/rest/rest_0.9.1.bb
b/meta-gnome/recipes-gnome/rest/rest_0.9.1.bb
index 3a81a58f6..e46cbfc69 100644
--- a/meta-gnome/recipes-gnome/rest/rest_0.9.1.bb
+++ b/meta-gnome/recipes-gnome/rest/rest_0.9.1.bb
@@ -17,8 +17,6 @@ DEPENDS = " \
inherit gnomebase gobject-introspection vala pkgconfig gi-docgen
-EXTRA_OEMESON = "${@bb.utils.contains('GI_DATA_ENABLED', 'True',
'-Dvapi=true', '-Dvapi=false', d)}"
-
PACKAGECONFIG ?= ""
PACKAGECONFIG[examples] = "-Dexamples=true,-Dexamples=false"
PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false"
diff --git a/meta-gnome/recipes-gnome/tracker/tracker-miners_3.6.2.bb
b/meta-gnome/recipes-gnome/tracker/tracker-miners_3.6.2.bb
index a0a41d7f8..426082bd5 100644
--- a/meta-gnome/recipes-gnome/tracker/tracker-miners_3.6.2.bb
+++ b/meta-gnome/recipes-gnome/tracker/tracker-miners_3.6.2.bb
@@ -25,6 +25,7 @@ SRC_URI[archive.sha256sum] =
"0ad722f3d532c21d757cf488f942960679ea8f457925efa976
# gobject-introspection is mandatory and cannot be configured
REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
GIR_MESON_OPTION = ""
+VALA_MESON_OPTION = ""
PACKAGECONFIG ??= " \
${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "ffmpeg", "",
d)} \
diff --git
a/meta-gnome/recipes-support/libcloudproviders/libcloudproviders_0.3.4.bb
b/meta-gnome/recipes-support/libcloudproviders/libcloudproviders_0.3.4.bb
index 36089238f..21fe4d119 100644
--- a/meta-gnome/recipes-support/libcloudproviders/libcloudproviders_0.3.4.bb
+++ b/meta-gnome/recipes-support/libcloudproviders/libcloudproviders_0.3.4.bb
@@ -3,6 +3,7 @@ LICENSE="LGPL-3.0-or-later"
LIC_FILES_CHKSUM = "file://LICENSE;md5=e6a600fd5e1d9cbde2d983680233ad02"
GNOMEBASEBUILDCLASS = "meson"
+VALA_MESON_OPTION ?= 'vapigen'
DEPENDS = "glib-2.0"
diff --git a/meta-oe/recipes-gnome/gcr/gcr3_3.41.1.bb
b/meta-oe/recipes-gnome/gcr/gcr3_3.41.1.bb
index ba5660a5e..a5bb868bb 100644
--- a/meta-oe/recipes-gnome/gcr/gcr3_3.41.1.bb
+++ b/meta-oe/recipes-gnome/gcr/gcr3_3.41.1.bb
@@ -17,6 +17,8 @@ CFLAGS += "-D_GNU_SOURCE"
GNOMEBASEBUILDCLASS = "meson"
GTKDOC_MESON_OPTION = "gtk_doc"
+VALA_MESON_OPTION ?= ''
+
inherit gnomebase gtk-icon-cache gi-docgen features_check
upstream-version-is-even vala gobject-introspection gettext mime mime-xdg
UPSTREAM_CHECK_REGEX = "[^\d\.](?P<pver>3.(?!9\d+)\d+(\.\d+)+)\.tar"
@@ -39,6 +41,7 @@ PACKAGECONFIG[systemd] =
"-Dsystemd=enabled,-Dsystemd=disabled,systemd"
FILES:${PN} += " \
${datadir}/dbus-1 \
${datadir}/gcr-3 \
+ ${datadir}/vala \
${systemd_user_unitdir}/gcr-ssh-agent.socket \
${systemd_user_unitdir}/gcr-ssh-agent.service \
"
diff --git a/meta-oe/recipes-support/libosinfo/libosinfo_1.11.0.bb
b/meta-oe/recipes-support/libosinfo/libosinfo_1.11.0.bb
index 16e0cf8f7..ca6f9ba3f 100644
--- a/meta-oe/recipes-support/libosinfo/libosinfo_1.11.0.bb
+++ b/meta-oe/recipes-support/libosinfo/libosinfo_1.11.0.bb
@@ -18,6 +18,9 @@ inherit meson pkgconfig gtk-doc gobject-introspection vala
DEPENDS = "glib-2.0 libsoup libxslt"
+VALA_MESON_OPTION = 'enable-vala'
+VALA_MESON_ENABLE_FLAG = 'enabled'
+VALA_MESON_DISABLE_FLAG = 'disabled'
GIR_MESON_OPTION = "enable-introspection"
GIR_MESON_ENABLE_FLAG = 'enabled'
GIR_MESON_DISABLE_FLAG = 'disabled'
@@ -26,7 +29,6 @@ GTKDOC_MESON_OPTION = "enable-gtk-doc"
EXTRA_OEMESON += " \
-Dwith-pci-ids-path=${datadir}/pci.ids \
-Dwith-usb-ids-path=${datadir}/usb.ids \
- ${@bb.utils.contains('GI_DATA_ENABLED', 'True',
'-Denable-vala=enabled', '-Denable-vala=disabled', d)} \
"
RDEPENDS:${PN} = "pciutils-ids usbids"
--
2.42.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#106460):
https://lists.openembedded.org/g/openembedded-devel/message/106460
Mute This Topic: https://lists.openembedded.org/mt/102449762/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
