diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-devtools/vala/vala/disable-graphviz.patch | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/meta/recipes-devtools/vala/vala/disable-graphviz.patch b/meta/recipes-devtools/vala/vala/disable-graphviz.patch index 8fb94dc149..e7e38c768e 100644 --- a/meta/recipes-devtools/vala/vala/disable-graphviz.patch +++ b/meta/recipes-devtools/vala/vala/disable-graphviz.patch | |||
@@ -1,7 +1,8 @@ | |||
1 | From 500f4220f79c660a70a1ffc0d5b762d70088af5e Mon Sep 17 00:00:00 2001 | 1 | From 5ae347907b8c65983365a6325ac990fcde28d508 Mon Sep 17 00:00:00 2001 |
2 | From: Rico Tzschichholz <ricotz@ubuntu.com> | 2 | From: Rico Tzschichholz <ricotz@ubuntu.com> |
3 | Date: Wed, 6 Sep 2017 18:52:55 +0200 | 3 | Date: Wed, 6 Sep 2017 18:52:55 +0200 |
4 | Subject: [PATCH] libvaladoc: Allow disabling the graphviz dependency of | 4 | Subject: [PATCH] libvaladoc: Allow disabling the graphviz dependency of |
5 | |||
5 | valadoc | 6 | valadoc |
6 | 7 | ||
7 | https://bugzilla.gnome.org/show_bug.cgi?id=787375 | 8 | https://bugzilla.gnome.org/show_bug.cgi?id=787375 |
@@ -16,7 +17,7 @@ Upstream-Status: Submitted [bugzilla link above] | |||
16 | 4 files changed, 63 insertions(+), 34 deletions(-) | 17 | 4 files changed, 63 insertions(+), 34 deletions(-) |
17 | 18 | ||
18 | diff --git a/configure.ac b/configure.ac | 19 | diff --git a/configure.ac b/configure.ac |
19 | index 662180b..82d7015 100644 | 20 | index 694ffd2..9150620 100644 |
20 | --- a/configure.ac | 21 | --- a/configure.ac |
21 | +++ b/configure.ac | 22 | +++ b/configure.ac |
22 | @@ -112,34 +112,38 @@ PKG_CHECK_MODULES(GMODULE, gmodule-2.0 >= $GLIB_REQUIRED) | 23 | @@ -112,34 +112,38 @@ PKG_CHECK_MODULES(GMODULE, gmodule-2.0 >= $GLIB_REQUIRED) |
@@ -159,7 +160,7 @@ index 384292f..cce50d8 100644 | |||
159 | EXTRA_DIST = \ | 160 | EXTRA_DIST = \ |
160 | $(libvaladoc_la_VALASOURCES) \ | 161 | $(libvaladoc_la_VALASOURCES) \ |
161 | diff --git a/libvaladoc/html/basicdoclet.vala b/libvaladoc/html/basicdoclet.vala | 162 | diff --git a/libvaladoc/html/basicdoclet.vala b/libvaladoc/html/basicdoclet.vala |
162 | index cc9ea4e..432c381 100644 | 163 | index 37c731c..e0326ef 100644 |
163 | --- a/libvaladoc/html/basicdoclet.vala | 164 | --- a/libvaladoc/html/basicdoclet.vala |
164 | +++ b/libvaladoc/html/basicdoclet.vala | 165 | +++ b/libvaladoc/html/basicdoclet.vala |
165 | @@ -46,7 +46,11 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet { | 166 | @@ -46,7 +46,11 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet { |
@@ -201,11 +202,11 @@ index cc9ea4e..432c381 100644 | |||
201 | 202 | ||
202 | public void write_namespace_content (Namespace node, Api.Node? parent) { | 203 | public void write_namespace_content (Namespace node, Api.Node? parent) { |
203 | diff --git a/libvaladoc/html/htmlmarkupwriter.vala b/libvaladoc/html/htmlmarkupwriter.vala | 204 | diff --git a/libvaladoc/html/htmlmarkupwriter.vala b/libvaladoc/html/htmlmarkupwriter.vala |
204 | index 15ed9ef..fe0d705 100644 | 205 | index dcc4dad..cf9c860 100644 |
205 | --- a/libvaladoc/html/htmlmarkupwriter.vala | 206 | --- a/libvaladoc/html/htmlmarkupwriter.vala |
206 | +++ b/libvaladoc/html/htmlmarkupwriter.vala | 207 | +++ b/libvaladoc/html/htmlmarkupwriter.vala |
207 | @@ -43,12 +43,16 @@ public class Valadoc.Html.MarkupWriter : Valadoc.MarkupWriter { | 208 | @@ -51,12 +51,16 @@ public class Valadoc.Html.MarkupWriter : Valadoc.MarkupWriter { |
208 | }, xml_declaration); | 209 | } |
209 | } | 210 | } |
210 | 211 | ||
211 | +#if HAVE_GRAPHVIZ | 212 | +#if HAVE_GRAPHVIZ |