Signed-off-by: Alexander Kanavin <alex.kana...@gmail.com>
---
meta/recipes-devtools/vala/vala/disable-graphviz.patch | 12 ++++++------
meta/recipes-devtools/vala/vala_0.40.8.bb | 10 ----------
meta/recipes-devtools/vala/vala_0.42.0.bb | 10 ++++++++++
3 files changed, 16 insertions(+), 16 deletions(-)
delete mode 100644 meta/recipes-devtools/vala/vala_0.40.8.bb
create mode 100644 meta/recipes-devtools/vala/vala_0.42.0.bb
diff --git a/meta/recipes-devtools/vala/vala/disable-graphviz.patch
b/meta/recipes-devtools/vala/vala/disable-graphviz.patch
index e7e38c7..477504d 100644
--- a/meta/recipes-devtools/vala/vala/disable-graphviz.patch
+++ b/meta/recipes-devtools/vala/vala/disable-graphviz.patch
@@ -1,4 +1,4 @@
-From 5ae347907b8c65983365a6325ac990fcde28d508 Mon Sep 17 00:00:00 2001
+From 57f6b661d7865e8cecd17be36fab68f7f8447998 Mon Sep 17 00:00:00 2001
From: Rico Tzschichholz <ric...@ubuntu.com>
Date: Wed, 6 Sep 2017 18:52:55 +0200
Subject: [PATCH] libvaladoc: Allow disabling the graphviz dependency of
@@ -17,10 +17,10 @@ Upstream-Status: Submitted [bugzilla link above]
4 files changed, 63 insertions(+), 34 deletions(-)
diff --git a/configure.ac b/configure.ac
-index 694ffd2..9150620 100644
+index 730c72d..af81986 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -112,34 +112,38 @@ PKG_CHECK_MODULES(GMODULE, gmodule-2.0 >= $GLIB_REQUIRED)
+@@ -119,34 +119,38 @@ PKG_CHECK_MODULES(GMODULE, gmodule-2.0 >= $GLIB_REQUIRED)
AC_SUBST(GMODULE_CFLAGS)
AC_SUBST(GMODULE_LIBS)
@@ -202,7 +202,7 @@ index 37c731c..e0326ef 100644
public void write_namespace_content (Namespace node, Api.Node? parent) {
diff --git a/libvaladoc/html/htmlmarkupwriter.vala
b/libvaladoc/html/htmlmarkupwriter.vala
-index dcc4dad..cf9c860 100644
+index 5aa4afd..e79b0b8 100644
--- a/libvaladoc/html/htmlmarkupwriter.vala
+++ b/libvaladoc/html/htmlmarkupwriter.vala
@@ -51,12 +51,16 @@ public class Valadoc.Html.MarkupWriter :
Valadoc.MarkupWriter {
@@ -210,14 +210,14 @@ index dcc4dad..cf9c860 100644
}
+#if HAVE_GRAPHVIZ
- public MarkupWriter add_usemap (Charts.Chart chart) {
+ public unowned MarkupWriter add_usemap (Charts.Chart chart) {
string? buf = (string?) chart.write_buffer ("cmapx");
if (buf != null) {
raw_text ("\n");
raw_text ((!) buf);
}
+#else
-+ public MarkupWriter add_usemap (void* chart) {
++ public unowned MarkupWriter add_usemap (void* chart) {
+#endif
return this;
diff --git a/meta/recipes-devtools/vala/vala_0.40.8.bb
b/meta/recipes-devtools/vala/vala_0.40.8.bb
deleted file mode 100644
index dba9f0d..0000000
--- a/meta/recipes-devtools/vala/vala_0.40.8.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require ${BPN}.inc
-
-SRC_URI += "
file://0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch \
- file://0001-vapigen.m4-use-PKG_CONFIG_SYSROOT_DIR.patch \
- file://disable-graphviz.patch \
- file://0001-Disable-valadoc.patch \
-"
-
-SRC_URI[md5sum] = "3e3177692fb5d81a7b8aaa6b95a30bdd"
-SRC_URI[sha256sum] =
"5c35e087a7054e9f0a514a0c1f1d0a0d7cf68d3e43c1dbeb840f9b0d815c0fa5"
diff --git a/meta/recipes-devtools/vala/vala_0.42.0.bb
b/meta/recipes-devtools/vala/vala_0.42.0.bb
new file mode 100644
index 0000000..2b02e0c
--- /dev/null
+++ b/meta/recipes-devtools/vala/vala_0.42.0.bb
@@ -0,0 +1,10 @@
+require ${BPN}.inc
+
+SRC_URI += "
file://0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch \
+ file://0001-vapigen.m4-use-PKG_CONFIG_SYSROOT_DIR.patch \
+ file://disable-graphviz.patch \
+ file://0001-Disable-valadoc.patch \
+"
+
+SRC_URI[md5sum] = "aa6eb8097d25b5847ad3fab34c0ff865"
+SRC_URI[sha256sum] =
"62a55986da23cf3aaafd7624c32db2a1af11c8419e0bb0751727d10f1f7ab7be"
--
2.7.4
--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
