[PATCH 18/30] vte: upgrade 0.64.2 -> 0.66.0
From: Alexander Kanavin <hidden>
Date: 2021-10-27 09:07:52
Subsystem:
the rest · Maintainer:
Linus Torvalds
From: Alexander Kanavin <redacted>
Signed-off-by: Alexander Kanavin <redacted>
---
...rrectly-substitute-gtkdoc-qemu-wrapp.patch | 24 +++++++++++++++++++
.../vte/{vte_0.64.2.bb => vte_0.66.0.bb} | 5 ++--
2 files changed, 27 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-support/vte/vte/0001-Makefile.docs-correctly-substitute-gtkdoc-qemu-wrapp.patch
rename meta/recipes-support/vte/{vte_0.64.2.bb => vte_0.66.0.bb} (91%)
diff --git a/meta/recipes-support/vte/vte/0001-Makefile.docs-correctly-substitute-gtkdoc-qemu-wrapp.patch b/meta/recipes-support/vte/vte/0001-Makefile.docs-correctly-substitute-gtkdoc-qemu-wrapp.patch
new file mode 100644
index 0000000000..c69a52e5d0
--- /dev/null
+++ b/meta/recipes-support/vte/vte/0001-Makefile.docs-correctly-substitute-gtkdoc-qemu-wrapp.patch@@ -0,0 +1,24 @@ +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
diff --git a/meta/recipes-support/vte/vte_0.64.2.bb b/meta/recipes-support/vte/vte_0.66.0.bb
similarity index 91%
rename from meta/recipes-support/vte/vte_0.64.2.bb
rename to meta/recipes-support/vte/vte_0.66.0.bb
index a79f2e4451..6676b7feeb 100644
--- a/meta/recipes-support/vte/vte_0.64.2.bb
+++ b/meta/recipes-support/vte/vte_0.66.0.bb@@ -19,8 +19,9 @@ GIR_MESON_OPTION = 'gir' inherit gnomebase gtk-doc 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" -SRC_URI[archive.sha256sum] = "2b3c820b65a667c1d8859ba20478be626d1519cc3159dac25f703330c6d07e18" +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] = "d0813ac00fb1d74d88851e765f755d496c83e097097358ea1baadb38b37b7b33" ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
--
2.20.1