summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2018-09-06 12:29:26 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-09-10 12:13:06 +0100
commitaae1276f9630aa1ba70921d02f79c4074dbdd677 (patch)
tree500775e41ef3e4e2b4db757c172d3f4fffccc519 /meta
parent39c941e1926f3abe00b74088c92307fde6e7598a (diff)
downloadpoky-aae1276f9630aa1ba70921d02f79c4074dbdd677.tar.gz
vala: update to 0.42.0
(From OE-Core rev: 8553c52f174af4c8c433c543f806f5ed5c1ec48c) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/vala/vala/disable-graphviz.patch12
-rw-r--r--meta/recipes-devtools/vala/vala_0.42.0.bb (renamed from meta/recipes-devtools/vala/vala_0.40.8.bb)4
2 files changed, 8 insertions, 8 deletions
diff --git a/meta/recipes-devtools/vala/vala/disable-graphviz.patch b/meta/recipes-devtools/vala/vala/disable-graphviz.patch
index e7e38c768e..477504dca3 100644
--- a/meta/recipes-devtools/vala/vala/disable-graphviz.patch
+++ b/meta/recipes-devtools/vala/vala/disable-graphviz.patch
@@ -1,4 +1,4 @@
1From 5ae347907b8c65983365a6325ac990fcde28d508 Mon Sep 17 00:00:00 2001 1From 57f6b661d7865e8cecd17be36fab68f7f8447998 Mon Sep 17 00:00:00 2001
2From: Rico Tzschichholz <ricotz@ubuntu.com> 2From: Rico Tzschichholz <ricotz@ubuntu.com>
3Date: Wed, 6 Sep 2017 18:52:55 +0200 3Date: Wed, 6 Sep 2017 18:52:55 +0200
4Subject: [PATCH] libvaladoc: Allow disabling the graphviz dependency of 4Subject: [PATCH] libvaladoc: Allow disabling the graphviz dependency of
@@ -17,10 +17,10 @@ Upstream-Status: Submitted [bugzilla link above]
17 4 files changed, 63 insertions(+), 34 deletions(-) 17 4 files changed, 63 insertions(+), 34 deletions(-)
18 18
19diff --git a/configure.ac b/configure.ac 19diff --git a/configure.ac b/configure.ac
20index 694ffd2..9150620 100644 20index 730c72d..af81986 100644
21--- a/configure.ac 21--- a/configure.ac
22+++ b/configure.ac 22+++ b/configure.ac
23@@ -112,34 +112,38 @@ PKG_CHECK_MODULES(GMODULE, gmodule-2.0 >= $GLIB_REQUIRED) 23@@ -119,34 +119,38 @@ PKG_CHECK_MODULES(GMODULE, gmodule-2.0 >= $GLIB_REQUIRED)
24 AC_SUBST(GMODULE_CFLAGS) 24 AC_SUBST(GMODULE_CFLAGS)
25 AC_SUBST(GMODULE_LIBS) 25 AC_SUBST(GMODULE_LIBS)
26 26
@@ -202,7 +202,7 @@ index 37c731c..e0326ef 100644
202 202
203 public void write_namespace_content (Namespace node, Api.Node? parent) { 203 public void write_namespace_content (Namespace node, Api.Node? parent) {
204diff --git a/libvaladoc/html/htmlmarkupwriter.vala b/libvaladoc/html/htmlmarkupwriter.vala 204diff --git a/libvaladoc/html/htmlmarkupwriter.vala b/libvaladoc/html/htmlmarkupwriter.vala
205index dcc4dad..cf9c860 100644 205index 5aa4afd..e79b0b8 100644
206--- a/libvaladoc/html/htmlmarkupwriter.vala 206--- a/libvaladoc/html/htmlmarkupwriter.vala
207+++ b/libvaladoc/html/htmlmarkupwriter.vala 207+++ b/libvaladoc/html/htmlmarkupwriter.vala
208@@ -51,12 +51,16 @@ public class Valadoc.Html.MarkupWriter : Valadoc.MarkupWriter { 208@@ -51,12 +51,16 @@ public class Valadoc.Html.MarkupWriter : Valadoc.MarkupWriter {
@@ -210,14 +210,14 @@ index dcc4dad..cf9c860 100644
210 } 210 }
211 211
212+#if HAVE_GRAPHVIZ 212+#if HAVE_GRAPHVIZ
213 public MarkupWriter add_usemap (Charts.Chart chart) { 213 public unowned MarkupWriter add_usemap (Charts.Chart chart) {
214 string? buf = (string?) chart.write_buffer ("cmapx"); 214 string? buf = (string?) chart.write_buffer ("cmapx");
215 if (buf != null) { 215 if (buf != null) {
216 raw_text ("\n"); 216 raw_text ("\n");
217 raw_text ((!) buf); 217 raw_text ((!) buf);
218 } 218 }
219+#else 219+#else
220+ public MarkupWriter add_usemap (void* chart) { 220+ public unowned MarkupWriter add_usemap (void* chart) {
221+#endif 221+#endif
222 222
223 return this; 223 return this;
diff --git a/meta/recipes-devtools/vala/vala_0.40.8.bb b/meta/recipes-devtools/vala/vala_0.42.0.bb
index dba9f0d235..2b02e0c840 100644
--- a/meta/recipes-devtools/vala/vala_0.40.8.bb
+++ b/meta/recipes-devtools/vala/vala_0.42.0.bb
@@ -6,5 +6,5 @@ SRC_URI += " file://0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.pa
6 file://0001-Disable-valadoc.patch \ 6 file://0001-Disable-valadoc.patch \
7" 7"
8 8
9SRC_URI[md5sum] = "3e3177692fb5d81a7b8aaa6b95a30bdd" 9SRC_URI[md5sum] = "aa6eb8097d25b5847ad3fab34c0ff865"
10SRC_URI[sha256sum] = "5c35e087a7054e9f0a514a0c1f1d0a0d7cf68d3e43c1dbeb840f9b0d815c0fa5" 10SRC_URI[sha256sum] = "62a55986da23cf3aaafd7624c32db2a1af11c8419e0bb0751727d10f1f7ab7be"