mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-29 18:32:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

vte: update 0.68.0 -> 0.70.1

Browse Source 
Transition to gi-docgen from gtk-doc.

Drop vala tweaks: gobject-introspection already does
it correctly (with STAGING_LIBDIR included).

(From OE-Core rev: 1a418b35918abf78f18356fd77c63c94a14065ef)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2022-11-20 14:31:22 +01:00
committed by Richard Purdie
parent e3f65282c9
commit ff0183615a
2 changed files with 4 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
meta/recipes-support/vte/vte/0001-Makefile.docs-correctly-substitute-gtkdoc-qemu-wrapp.patch
View File

@@ -1,24 +0,0 @@
From daa30d0039397a735d49ea535305ed0bc5f9d73b Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex@linutronix.de>
Date: Tue, 26 Oct 2021 09:38:42 +0200
Subject: [PATCH] Makefile.docs: correctly substitute gtkdoc qemu wrapper
Upstream-Status: Inappropriate [oe-core specific]
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
doc/reference/Makefile.docs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/doc/reference/Makefile.docs b/doc/reference/Makefile.docs
index b18f0a4..da18440 100644
--- a/doc/reference/Makefile.docs
+++ b/doc/reference/Makefile.docs
@@ -233,7 +233,7 @@ INSTALL_DATA = $(INSTALL) -m 644
GTKDOC_CC = $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(CPPFLAGS) $(CFLAGS)
GTKDOC_LD = $(CC) $(GTKDOC_DEPS_LIBS) $(CFLAGS) $(LDFLAGS)
-GTKDOC_RUN =
+GTKDOC_RUN = $(top_builddir)/gtkdoc-qemuwrapper
GTKDOC_CHECK_PATH = gtkdoc-check
GTKDOC_REBASE = gtkdoc-rebase

16
meta/recipes-support/vte/vte_0.68.0.bb → meta/recipes-support/vte/vte_0.70.1.bb
View File

@@ -15,24 +15,16 @@ DEPENDS = "glib-2.0 gtk+3 libpcre2 libxml2-native gperf-native icu"
GNOMEBASEBUILDCLASS = "meson"
GIR_MESON_OPTION = 'gir'
GIDOCGEN_MESON_OPTION = "docs"
inherit gnomebase gtk-doc features_check upstream-version-is-even gobject-introspection
inherit gnomebase gi-docgen features_check upstream-version-is-even gobject-introspection
# 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-Makefile.docs-correctly-substitute-gtkdoc-qemu-wrapp.patch"
SRC_URI[archive.sha256sum] = "13e7d4789ca216a33780030d246c9b13ddbfd04094c6316eea7ff92284dd1749"
SRC_URI += "file://0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch"
SRC_URI[archive.sha256sum] = "1f4601cbfea5302b96902208c8f185e5b18b259b5358bc93cf392bf59871c5b6"
ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
# Instead of "inherit vala" we do the relevant settings here so we can
# set DEPENDS based on PACKAGECONFIG.
# Our patched version of Vala looks in STAGING_DATADIR for .vapi files
export STAGING_DATADIR
# Upstream Vala >= 0.11 looks in XDG_DATA_DIRS for .vapi files
export XDG_DATA_DIRS = "${STAGING_DATADIR}"
# Help g-ir-scanner find the .so for linking
do_compile:prepend() {
export GIR_EXTRA_LIBS_PATH="${B}/src/.libs"