diff options
Diffstat (limited to 'source/d')
| -rw-r--r-- | source/d/vala/disable-graphviz.patch | 66 |
1 files changed, 21 insertions, 45 deletions
diff --git a/source/d/vala/disable-graphviz.patch b/source/d/vala/disable-graphviz.patch index 477504dc..54631335 100644 --- a/source/d/vala/disable-graphviz.patch +++ b/source/d/vala/disable-graphviz.patch @@ -1,26 +1,6 @@ -From 57f6b661d7865e8cecd17be36fab68f7f8447998 Mon Sep 17 00:00:00 2001 -From: Rico Tzschichholz <ricotz@ubuntu.com> -Date: Wed, 6 Sep 2017 18:52:55 +0200 -Subject: [PATCH] libvaladoc: Allow disabling the graphviz dependency of - - valadoc - -https://bugzilla.gnome.org/show_bug.cgi?id=787375 -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> -Upstream-Status: Submitted [bugzilla link above] - ---- - configure.ac | 60 +++++++++++++++++++---------------- - libvaladoc/Makefile.am | 25 +++++++++++---- - libvaladoc/html/basicdoclet.vala | 8 +++++ - libvaladoc/html/htmlmarkupwriter.vala | 4 +++ - 4 files changed, 63 insertions(+), 34 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 730c72d..af81986 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -119,34 +119,38 @@ PKG_CHECK_MODULES(GMODULE, gmodule-2.0 >= $GLIB_REQUIRED) +--- ./configure.ac.orig 2018-12-20 08:54:58.000000000 -0600 ++++ ./configure.ac 2018-12-20 12:32:05.649552535 -0600 +@@ -119,34 +119,38 @@ AC_SUBST(GMODULE_CFLAGS) AC_SUBST(GMODULE_LIBS) @@ -87,11 +67,9 @@ index 730c72d..af81986 100644 AM_CONDITIONAL(HAVE_CGRAPH, test "$have_cgraph" = "yes") AC_PATH_PROG([XSLTPROC], [xsltproc], :) -diff --git a/libvaladoc/Makefile.am b/libvaladoc/Makefile.am -index 384292f..cce50d8 100644 ---- a/libvaladoc/Makefile.am -+++ b/libvaladoc/Makefile.am -@@ -126,10 +126,6 @@ libvaladoc_la_VALASOURCES = \ +--- ./libvaladoc/Makefile.am.orig 2018-12-20 08:00:31.000000000 -0600 ++++ ./libvaladoc/Makefile.am 2018-12-20 12:33:26.911553405 -0600 +@@ -128,10 +128,6 @@ content/tablerow.vala \ content/taglet.vala \ content/text.vala \ @@ -102,7 +80,7 @@ index 384292f..cce50d8 100644 parser/manyrule.vala \ parser/oneofrule.vala \ parser/optionalrule.vala \ -@@ -156,13 +152,24 @@ libvaladoc_la_VALASOURCES = \ +@@ -158,13 +154,24 @@ highlighter/codetoken.vala \ highlighter/highlighter.vala \ html/basicdoclet.vala \ @@ -128,18 +106,20 @@ index 384292f..cce50d8 100644 libvaladoc@PACKAGE_SUFFIX@_la_SOURCES = \ libvaladoc.vala.stamp \ $(libvaladoc_la_VALASOURCES:.vala=.c) \ -@@ -182,9 +189,9 @@ libvaladoc.vala.stamp: $(libvaladoc_la_VALASOURCES) +@@ -184,11 +191,11 @@ --library valadoc \ --vapi valadoc@PACKAGE_SUFFIX@.vapi \ --vapidir $(top_srcdir)/vapi --pkg gmodule-2.0 \ - --vapidir $(top_srcdir)/vapi --pkg libgvc \ --vapidir $(top_srcdir)/gee --pkg gee \ --vapidir $(top_srcdir)/vala --pkg vala \ + --vapidir $(top_srcdir)/ccode --pkg ccode \ + --vapidir $(top_srcdir)/codegen --pkg codegen \ + $(LIBGVC_PKG) \ --pkg config \ $(filter %.vala %.c,$^) touch $@ -@@ -211,6 +218,9 @@ nodist_pkgconfig_DATA = valadoc@PACKAGE_SUFFIX@.pc +@@ -217,6 +224,9 @@ valadoc@PACKAGE_SUFFIX@.pc: valadoc.pc cp $< $@ @@ -149,7 +129,7 @@ index 384292f..cce50d8 100644 vapidir = $(datadir)/vala/vapi dist_vapi_DATA = valadoc@PACKAGE_SUFFIX@.vapi -@@ -218,6 +228,9 @@ nodist_vapi_DATA = valadoc@PACKAGE_SUFFIX@.deps +@@ -224,6 +234,9 @@ valadoc@PACKAGE_SUFFIX@.deps: valadoc.deps cp $< $@ @@ -159,11 +139,9 @@ index 384292f..cce50d8 100644 EXTRA_DIST = \ $(libvaladoc_la_VALASOURCES) \ -diff --git a/libvaladoc/html/basicdoclet.vala b/libvaladoc/html/basicdoclet.vala -index 37c731c..e0326ef 100644 ---- a/libvaladoc/html/basicdoclet.vala -+++ b/libvaladoc/html/basicdoclet.vala -@@ -46,7 +46,11 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet { +--- ./libvaladoc/html/basicdoclet.vala.orig 2018-12-20 08:00:31.000000000 -0600 ++++ ./libvaladoc/html/basicdoclet.vala 2018-12-20 12:32:05.661552535 -0600 +@@ -46,7 +46,11 @@ protected HtmlRenderer _renderer; protected Html.MarkupWriter writer; protected Html.CssClassResolver cssresolver; @@ -175,7 +153,7 @@ index 37c731c..e0326ef 100644 protected ErrorReporter reporter; protected string package_list_link = "../index.html"; -@@ -120,7 +124,9 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet { +@@ -120,7 +124,9 @@ this.linker = new LinkHelper (); _renderer = new HtmlRenderer (settings, this.linker, this.cssresolver); @@ -185,7 +163,7 @@ index 37c731c..e0326ef 100644 } -@@ -1025,6 +1031,7 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet { +@@ -1026,6 +1032,7 @@ } protected void write_image_block (Api.Node element) { @@ -193,7 +171,7 @@ index 37c731c..e0326ef 100644 if (element is Class || element is Interface || element is Struct) { unowned string format = (settings.use_svg_images ? "svg" : "png"); var chart = new Charts.Hierarchy (image_factory, element); -@@ -1044,6 +1051,7 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet { +@@ -1045,6 +1052,7 @@ this.get_img_path_html (element, format)}); writer.add_usemap (chart); } @@ -201,11 +179,9 @@ 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 5aa4afd..e79b0b8 100644 ---- a/libvaladoc/html/htmlmarkupwriter.vala -+++ b/libvaladoc/html/htmlmarkupwriter.vala -@@ -51,12 +51,16 @@ public class Valadoc.Html.MarkupWriter : Valadoc.MarkupWriter { +--- ./libvaladoc/html/htmlmarkupwriter.vala.orig 2018-12-20 08:54:58.000000000 -0600 ++++ ./libvaladoc/html/htmlmarkupwriter.vala 2018-12-20 12:32:05.662552535 -0600 +@@ -51,12 +51,16 @@ } } |