- Allow to build the gtk4 widget and vapi
This is needed to build gtk4 based terminals like blackbox
- Update dependencies
- Cleanup recipe
Signed-off-by: Markus Volk <f_...@t-online.de
<mailto:f_...@t-online.de>>
---
.../vte/{vte_0.70.2.bb => vte_0.70.3.bb} | 22
+++++++++----------
1 file changed, 11 insertions(+), 11 deletions(-)
rename meta/recipes-support/vte/{vte_0.70.2.bb => vte_0.70.3.bb}
(71%)
diff --git a/meta/recipes-support/vte/vte_0.70.2.bb
b/meta/recipes-support/vte/vte_0.70.3.bb
similarity index 71%
rename from meta/recipes-support/vte/vte_0.70.2.bb
rename to meta/recipes-support/vte/vte_0.70.3.bb
index ec2fb1f522..474ed87a88 100644
--- a/meta/recipes-support/vte/vte_0.70.2.bb
+++ b/meta/recipes-support/vte/vte_0.70.3.bb
@@ -11,34 +11,34 @@ LIC_FILES_CHKSUM = " \
file://COPYING.XTERM;md5=d7fc3a23c16c039afafe2e042030f057
<file://copying.xterm;md5=d7fc3a23c16c039afafe2e042030f057/> \
"
-DEPENDS = "glib-2.0 gtk+3 libpcre2 libxml2-native gperf-native icu"
+DEPENDS = "fribidi glib-2.0 gtk+3 libpcre2 libxml2-native
gperf-native icu pango zlib"
GNOMEBASEBUILDCLASS = "meson"
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"
<file://0001-add-w_exitcode-macro-for-non-glibc-systems.patch/>
-SRC_URI[archive.sha256sum] =
"4d15b4380de3f564d57eabd006389c407c705df5b0c70030fdcc24971a334d80"
+SRC_URI[archive.sha256sum] =
"9457134a02f3157fca04f7e0d39bdb0f3099be0a3ce82b7139d0c98a80748f23"
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"
-}
-
# Package additional files
FILES:${PN}-dev += "${datadir}/vala/vapi/*"
-PACKAGECONFIG ??= "gnutls"
-PACKAGECONFIG[vala] = "-Dvapi=true,-Dvapi=false,vala-native vala"
+PACKAGECONFIG ??= " \
+ gnutls \
+ ${@bb.utils.contains
<mailto:${@bb.utils.contains>('DISTRO_FEATURES',
'gobject-introspection-data', 'vala', '', d)} \
+ ${@bb.utils.contains
<mailto:${@bb.utils.contains>('DISTRO_FEATURES', 'opengl', 'gtk4',
'', d)} \
+"
+PACKAGECONFIG[gtk4] = "-Dgtk4=true,-Dgtk4=false,gtk4"
+PACKAGECONFIG[vala] = "-Dvapi=true,-Dvapi=false"
PACKAGECONFIG[gnutls] = "-Dgnutls=true,-Dgnutls=false,gnutls"
PACKAGECONFIG[systemd] = "-D_systemd=true,-D_systemd=false,systemd"
# vala requires gir
PACKAGECONFIG:remove:class-native = "vala"
+PACKAGECONFIG:remove:class-nativesdk = "vala gtk4"
CFLAGS += "-D_GNU_SOURCE"
--
2.34.1
