vala_0_38, vala_0_40, vala_0_42: add configuration to disable graphviz

+48 -5

pkgs/development/compilers/vala/default.nix

··· 1 - { stdenv, lib, fetchurl, pkgconfig, flex, bison, libxslt, autoconf, automake, graphviz 2 - , glib, libiconv, libintl, libtool, expat 1 + { stdenv, lib, fetchurl, fetchpatch, pkgconfig, flex, bison, libxslt, autoconf, automake, autoreconfHook 2 + , graphviz, glib, libiconv, libintl, libtool, expat 3 3 }: 4 4 5 5 let 6 - generic = { major, minor, sha256, extraNativeBuildInputs ? [], extraBuildInputs ? [] }: 6 + generic = lib.makeOverridable ({ 7 + major, minor, sha256, 8 + extraNativeBuildInputs ? [], 9 + extraBuildInputs ? [], 10 + withGraphviz ? false 11 + }: 7 12 let 8 13 atLeast = lib.versionAtLeast "${major}.${minor}"; 14 + 15 + # Patches from the openembedded-core project to build vala without graphviz 16 + # support. We need to apply an additional patch to allow building when the 17 + # header file isn't available at all, but that patch (./gvc-compat.patch) 18 + # can be shared between all versions of Vala so far. 19 + graphvizPatch = 20 + let 21 + fp = { commit, sha256 }: fetchpatch { 22 + url = "https://github.com/openembedded/openembedded-core/raw/${commit}/meta/recipes-devtools/vala/vala/disable-graphviz.patch"; 23 + inherit sha256; 24 + }; 25 + 26 + in { 27 + "0.38" = fp { 28 + commit = "2c290f7253bba5ceb0d32e7d0b0ec0d0e81cc263"; 29 + sha256 = "056ybapfx18d7xw1k8k85nsjrc26qk2q2d9v9nz2zrcwbq5brhkp"; 30 + }; 31 + 32 + # NOTE: the openembedded-core project doesn't have a patch for 0.40.12 33 + # or 0.42.4 just yet; we've fixed the single merge conflict in the 34 + # patches below and checked them in here. 35 + # 0.40.12: https://github.com/openembedded/openembedded-core/raw/8553c52f174af4c8c433c543f806f5ed5c1ec48c/meta/recipes-devtools/vala/vala/disable-graphviz.patch 36 + # 0.42.4: https://github.com/openembedded/openembedded-core/raw/dfbbff39cfd413510abbd60930232a9c6b35d765/meta/recipes-devtools/vala/vala/disable-graphviz.patch 37 + "0.40" = ./disable-graphviz-0.40.12.patch; 38 + "0.42" = ./disable-graphviz-0.42.4.patch; 39 + 40 + }.${major} or (throw "no graphviz patch for this version of vala"); 41 + 42 + disableGraphviz = atLeast "0.38" && !withGraphviz; 43 + 9 44 in stdenv.mkDerivation rec { 10 45 name = "vala-${version}"; 11 46 version = "${major}.${minor}"; ··· 19 54 patchShebangs tests 20 55 ''; 21 56 57 + # If we're disabling graphviz, apply the patches and corresponding 58 + # configure flag. We also need to override the path to the valac compiler 59 + # so that it can be used to regenerate documentation. 60 + patches = lib.optionals disableGraphviz [ graphvizPatch ./gvc-compat.patch ]; 61 + configureFlags = lib.optional disableGraphviz "--disable-graphviz"; 62 + preBuild = lib.optional disableGraphviz "buildFlagsArray+=(\"VALAC=$(pwd)/compiler/valac\")"; 63 + 22 64 outputs = [ "out" "devdoc" ]; 23 65 24 66 nativeBuildInputs = [ 25 67 pkgconfig flex bison libxslt 26 68 ] ++ lib.optional (stdenv.isDarwin && (atLeast "0.38")) expat 69 + ++ lib.optional disableGraphviz autoreconfHook # if we changed our ./configure script, need to reconfigure 27 70 ++ extraNativeBuildInputs; 28 71 29 72 buildInputs = [ 30 73 glib libiconv libintl 31 - ] ++ lib.optional (atLeast "0.38") graphviz 74 + ] ++ lib.optional (atLeast "0.38" && withGraphviz) graphviz 32 75 ++ extraBuildInputs; 33 76 34 77 enableParallelBuilding = true; ··· 42 85 platforms = platforms.unix; 43 86 maintainers = with maintainers; [ antono jtojnar lethalman peterhoeg ]; 44 87 }; 45 - }; 88 + }); 46 89 47 90 in rec { 48 91 vala_0_36 = generic {

+208

pkgs/development/compilers/vala/disable-graphviz-0.40.12.patch

··· 1 + diff --git i/configure.ac w/configure.ac 2 + index 694ffd200..915062053 100644 3 + --- i/configure.ac 4 + +++ w/configure.ac 5 + @@ -112,34 +112,38 @@ PKG_CHECK_MODULES(GMODULE, gmodule-2.0 >= $GLIB_REQUIRED) 6 + AC_SUBST(GMODULE_CFLAGS) 7 + AC_SUBST(GMODULE_LIBS) 8 + 9 + -PKG_CHECK_MODULES(LIBGVC, libgvc >= $LIBGVC_REQUIRED) 10 + -AC_MSG_CHECKING([for CGRAPH]) 11 + -cgraph_tmp_LIBADD="$LIBADD" 12 + -cgraph_tmp_CFLAGS="$CFLAGS" 13 + -LIBADD="$LIBADD $LIBGVC_LIBS" 14 + -CFLAGS="$CFLAGS $LIBGVC_CFLAGS" 15 + -AC_RUN_IFELSE( 16 + - [AC_LANG_SOURCE([ 17 + - #include <gvc.h> 18 + - 19 + - int main(void) { 20 + - #ifdef WITH_CGRAPH 21 + - return 0; 22 + - #else 23 + - return -1; 24 + - #endif 25 + - } 26 + - ])], [ 27 + - AC_MSG_RESULT([yes]) 28 + - VALAFLAGS="$VALAFLAGS -D WITH_CGRAPH" 29 + - have_cgraph=yes 30 + - ], [ 31 + - AC_MSG_RESULT([no]) 32 + - have_cgraph=no 33 + - ] 34 + -) 35 + -LIBADD="$cgraph_tmp_LIBADD" 36 + -CFLAGS="$cgraph_tmp_CFLAGS" 37 + +AC_ARG_ENABLE(graphviz, AS_HELP_STRING([--disable-graphviz], [Disable graphviz usage for valadoc]), enable_graphviz=$enableval, enable_graphviz=yes) 38 + +if test x$enable_graphviz = xyes; then 39 + + PKG_CHECK_MODULES(LIBGVC, libgvc >= $LIBGVC_REQUIRED) 40 + + AC_MSG_CHECKING([for CGRAPH]) 41 + + VALAFLAGS="$VALAFLAGS -D HAVE_GRAPHVIZ" 42 + + cgraph_tmp_LIBADD="$LIBADD" 43 + + cgraph_tmp_CFLAGS="$CFLAGS" 44 + + LIBADD="$LIBADD $LIBGVC_LIBS" 45 + + CFLAGS="$CFLAGS $LIBGVC_CFLAGS" 46 + + AC_RUN_IFELSE( 47 + + [AC_LANG_SOURCE([ 48 + + #include <gvc.h> 49 + + int main(void) { 50 + + #ifdef WITH_CGRAPH 51 + + return 0; 52 + + #else 53 + + return -1; 54 + + #endif 55 + + } 56 + + ])], [ 57 + + AC_MSG_RESULT([yes]) 58 + + VALAFLAGS="$VALAFLAGS -D WITH_CGRAPH" 59 + + have_cgraph=yes 60 + + ], [ 61 + + AC_MSG_RESULT([no]) 62 + + have_cgraph=no 63 + + ] 64 + + ) 65 + + LIBADD="$cgraph_tmp_LIBADD" 66 + + CFLAGS="$cgraph_tmp_CFLAGS" 67 + +fi 68 + +AM_CONDITIONAL(ENABLE_GRAPHVIZ, test x$enable_graphviz = xyes) 69 + AM_CONDITIONAL(HAVE_CGRAPH, test "$have_cgraph" = "yes") 70 + 71 + AC_PATH_PROG([XSLTPROC], [xsltproc], :) 72 + diff --git i/libvaladoc/Makefile.am w/libvaladoc/Makefile.am 73 + index f3f790e76..3c5dc4c80 100644 74 + --- i/libvaladoc/Makefile.am 75 + +++ w/libvaladoc/Makefile.am 76 + @@ -128,10 +128,6 @@ libvaladoc_la_VALASOURCES = \ 77 + content/tablerow.vala \ 78 + content/taglet.vala \ 79 + content/text.vala \ 80 + - charts/chart.vala \ 81 + - charts/chartfactory.vala \ 82 + - charts/hierarchychart.vala \ 83 + - charts/simplechartfactory.vala \ 84 + parser/manyrule.vala \ 85 + parser/oneofrule.vala \ 86 + parser/optionalrule.vala \ 87 + @@ -158,13 +154,24 @@ libvaladoc_la_VALASOURCES = \ 88 + highlighter/codetoken.vala \ 89 + highlighter/highlighter.vala \ 90 + html/basicdoclet.vala \ 91 + - html/htmlchartfactory.vala \ 92 + html/linkhelper.vala \ 93 + html/cssclassresolver.vala \ 94 + html/htmlmarkupwriter.vala \ 95 + html/htmlrenderer.vala \ 96 + $(NULL) 97 + 98 + +if ENABLE_GRAPHVIZ 99 + +libvaladoc_la_VALASOURCES += \ 100 + + charts/chart.vala \ 101 + + charts/chartfactory.vala \ 102 + + charts/hierarchychart.vala \ 103 + + charts/simplechartfactory.vala \ 104 + + html/htmlchartfactory.vala \ 105 + + $(NULL) 106 + + 107 + +LIBGVC_PKG = --vapidir $(top_srcdir)/vapi --pkg libgvc 108 + +endif 109 + + 110 + libvaladoc@PACKAGE_SUFFIX@_la_SOURCES = \ 111 + libvaladoc.vala.stamp \ 112 + $(libvaladoc_la_VALASOURCES:.vala=.c) \ 113 + @@ -184,11 +191,11 @@ libvaladoc.vala.stamp: $(libvaladoc_la_VALASOURCES) 114 + --library valadoc \ 115 + --vapi valadoc@PACKAGE_SUFFIX@.vapi \ 116 + --vapidir $(top_srcdir)/vapi --pkg gmodule-2.0 \ 117 + - --vapidir $(top_srcdir)/vapi --pkg libgvc \ 118 + --vapidir $(top_srcdir)/gee --pkg gee \ 119 + --vapidir $(top_srcdir)/vala --pkg vala \ 120 + --vapidir $(top_srcdir)/ccode --pkg ccode \ 121 + --vapidir $(top_srcdir)/codegen --pkg codegen \ 122 + + $(LIBGVC_PKG) \ 123 + --pkg config \ 124 + $(filter %.vala %.c,$^) 125 + touch $@ 126 + @@ -217,6 +224,9 @@ nodist_pkgconfig_DATA = valadoc@PACKAGE_SUFFIX@.pc 127 + 128 + valadoc@PACKAGE_SUFFIX@.pc: valadoc.pc 129 + cp $< $@ 130 + +if !ENABLE_GRAPHVIZ 131 + + sed -i "s/libgvc //g" $@ 132 + +endif 133 + 134 + vapidir = $(datadir)/vala/vapi 135 + dist_vapi_DATA = valadoc@PACKAGE_SUFFIX@.vapi 136 + @@ -224,6 +234,9 @@ nodist_vapi_DATA = valadoc@PACKAGE_SUFFIX@.deps 137 + 138 + valadoc@PACKAGE_SUFFIX@.deps: valadoc.deps 139 + cp $< $@ 140 + +if !ENABLE_GRAPHVIZ 141 + + sed -i "s/libgvc//g" $@ 142 + +endif 143 + 144 + EXTRA_DIST = \ 145 + $(libvaladoc_la_VALASOURCES) \ 146 + diff --git i/libvaladoc/html/basicdoclet.vala w/libvaladoc/html/basicdoclet.vala 147 + index 192e488cd..ec0960222 100644 148 + --- i/libvaladoc/html/basicdoclet.vala 149 + +++ w/libvaladoc/html/basicdoclet.vala 150 + @@ -46,7 +46,11 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet { 151 + protected HtmlRenderer _renderer; 152 + protected Html.MarkupWriter writer; 153 + protected Html.CssClassResolver cssresolver; 154 + +#if HAVE_GRAPHVIZ 155 + protected Charts.Factory image_factory; 156 + +#else 157 + + protected void* image_factory; 158 + +#endif 159 + protected ErrorReporter reporter; 160 + protected string package_list_link = "../index.html"; 161 + 162 + @@ -120,7 +124,9 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet { 163 + this.linker = new LinkHelper (); 164 + 165 + _renderer = new HtmlRenderer (settings, this.linker, this.cssresolver); 166 + +#if HAVE_GRAPHVIZ 167 + this.image_factory = new SimpleChartFactory (settings, linker); 168 + +#endif 169 + } 170 + 171 + 172 + @@ -1026,6 +1032,7 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet { 173 + } 174 + 175 + protected void write_image_block (Api.Node element) { 176 + +#if HAVE_GRAPHVIZ 177 + if (element is Class || element is Interface || element is Struct) { 178 + unowned string format = (settings.use_svg_images ? "svg" : "png"); 179 + var chart = new Charts.Hierarchy (image_factory, element); 180 + @@ -1045,6 +1052,7 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet { 181 + this.get_img_path_html (element, format)}); 182 + writer.add_usemap (chart); 183 + } 184 + +#endif 185 + } 186 + 187 + public void write_namespace_content (Namespace node, Api.Node? parent) { 188 + diff --git i/libvaladoc/html/htmlmarkupwriter.vala w/libvaladoc/html/htmlmarkupwriter.vala 189 + index dcc4dad76..cf9c860b8 100644 190 + --- i/libvaladoc/html/htmlmarkupwriter.vala 191 + +++ w/libvaladoc/html/htmlmarkupwriter.vala 192 + @@ -51,12 +51,16 @@ public class Valadoc.Html.MarkupWriter : Valadoc.MarkupWriter { 193 + } 194 + } 195 + 196 + +#if HAVE_GRAPHVIZ 197 + public MarkupWriter add_usemap (Charts.Chart chart) { 198 + string? buf = (string?) chart.write_buffer ("cmapx"); 199 + if (buf != null) { 200 + raw_text ("\n"); 201 + raw_text ((!) buf); 202 + } 203 + +#else 204 + + public MarkupWriter add_usemap (void* chart) { 205 + +#endif 206 + 207 + return this; 208 + }

+208

pkgs/development/compilers/vala/disable-graphviz-0.42.4.patch

··· 1 + diff --git i/configure.ac w/configure.ac 2 + index 730c72d7b..af8198637 100644 3 + --- i/configure.ac 4 + +++ w/configure.ac 5 + @@ -119,34 +119,38 @@ PKG_CHECK_MODULES(GMODULE, gmodule-2.0 >= $GLIB_REQUIRED) 6 + AC_SUBST(GMODULE_CFLAGS) 7 + AC_SUBST(GMODULE_LIBS) 8 + 9 + -PKG_CHECK_MODULES(LIBGVC, libgvc >= $LIBGVC_REQUIRED) 10 + -AC_MSG_CHECKING([for CGRAPH]) 11 + -cgraph_tmp_LIBADD="$LIBADD" 12 + -cgraph_tmp_CFLAGS="$CFLAGS" 13 + -LIBADD="$LIBADD $LIBGVC_LIBS" 14 + -CFLAGS="$CFLAGS $LIBGVC_CFLAGS" 15 + -AC_RUN_IFELSE( 16 + - [AC_LANG_SOURCE([ 17 + - #include <gvc.h> 18 + - 19 + - int main(void) { 20 + - #ifdef WITH_CGRAPH 21 + - return 0; 22 + - #else 23 + - return -1; 24 + - #endif 25 + - } 26 + - ])], [ 27 + - AC_MSG_RESULT([yes]) 28 + - VALAFLAGS="$VALAFLAGS -D WITH_CGRAPH" 29 + - have_cgraph=yes 30 + - ], [ 31 + - AC_MSG_RESULT([no]) 32 + - have_cgraph=no 33 + - ] 34 + -) 35 + -LIBADD="$cgraph_tmp_LIBADD" 36 + -CFLAGS="$cgraph_tmp_CFLAGS" 37 + +AC_ARG_ENABLE(graphviz, AS_HELP_STRING([--disable-graphviz], [Disable graphviz usage for valadoc]), enable_graphviz=$enableval, enable_graphviz=yes) 38 + +if test x$enable_graphviz = xyes; then 39 + + PKG_CHECK_MODULES(LIBGVC, libgvc >= $LIBGVC_REQUIRED) 40 + + AC_MSG_CHECKING([for CGRAPH]) 41 + + VALAFLAGS="$VALAFLAGS -D HAVE_GRAPHVIZ" 42 + + cgraph_tmp_LIBADD="$LIBADD" 43 + + cgraph_tmp_CFLAGS="$CFLAGS" 44 + + LIBADD="$LIBADD $LIBGVC_LIBS" 45 + + CFLAGS="$CFLAGS $LIBGVC_CFLAGS" 46 + + AC_RUN_IFELSE( 47 + + [AC_LANG_SOURCE([ 48 + + #include <gvc.h> 49 + + int main(void) { 50 + + #ifdef WITH_CGRAPH 51 + + return 0; 52 + + #else 53 + + return -1; 54 + + #endif 55 + + } 56 + + ])], [ 57 + + AC_MSG_RESULT([yes]) 58 + + VALAFLAGS="$VALAFLAGS -D WITH_CGRAPH" 59 + + have_cgraph=yes 60 + + ], [ 61 + + AC_MSG_RESULT([no]) 62 + + have_cgraph=no 63 + + ] 64 + + ) 65 + + LIBADD="$cgraph_tmp_LIBADD" 66 + + CFLAGS="$cgraph_tmp_CFLAGS" 67 + +fi 68 + +AM_CONDITIONAL(ENABLE_GRAPHVIZ, test x$enable_graphviz = xyes) 69 + AM_CONDITIONAL(HAVE_CGRAPH, test "$have_cgraph" = "yes") 70 + 71 + AC_PATH_PROG([XSLTPROC], [xsltproc], :) 72 + diff --git i/libvaladoc/Makefile.am w/libvaladoc/Makefile.am 73 + index f3f790e76..3c5dc4c80 100644 74 + --- i/libvaladoc/Makefile.am 75 + +++ w/libvaladoc/Makefile.am 76 + @@ -128,10 +128,6 @@ libvaladoc_la_VALASOURCES = \ 77 + content/tablerow.vala \ 78 + content/taglet.vala \ 79 + content/text.vala \ 80 + - charts/chart.vala \ 81 + - charts/chartfactory.vala \ 82 + - charts/hierarchychart.vala \ 83 + - charts/simplechartfactory.vala \ 84 + parser/manyrule.vala \ 85 + parser/oneofrule.vala \ 86 + parser/optionalrule.vala \ 87 + @@ -158,13 +154,24 @@ libvaladoc_la_VALASOURCES = \ 88 + highlighter/codetoken.vala \ 89 + highlighter/highlighter.vala \ 90 + html/basicdoclet.vala \ 91 + - html/htmlchartfactory.vala \ 92 + html/linkhelper.vala \ 93 + html/cssclassresolver.vala \ 94 + html/htmlmarkupwriter.vala \ 95 + html/htmlrenderer.vala \ 96 + $(NULL) 97 + 98 + +if ENABLE_GRAPHVIZ 99 + +libvaladoc_la_VALASOURCES += \ 100 + + charts/chart.vala \ 101 + + charts/chartfactory.vala \ 102 + + charts/hierarchychart.vala \ 103 + + charts/simplechartfactory.vala \ 104 + + html/htmlchartfactory.vala \ 105 + + $(NULL) 106 + + 107 + +LIBGVC_PKG = --vapidir $(top_srcdir)/vapi --pkg libgvc 108 + +endif 109 + + 110 + libvaladoc@PACKAGE_SUFFIX@_la_SOURCES = \ 111 + libvaladoc.vala.stamp \ 112 + $(libvaladoc_la_VALASOURCES:.vala=.c) \ 113 + @@ -184,11 +191,11 @@ libvaladoc.vala.stamp: $(libvaladoc_la_VALASOURCES) 114 + --library valadoc \ 115 + --vapi valadoc@PACKAGE_SUFFIX@.vapi \ 116 + --vapidir $(top_srcdir)/vapi --pkg gmodule-2.0 \ 117 + - --vapidir $(top_srcdir)/vapi --pkg libgvc \ 118 + --vapidir $(top_srcdir)/gee --pkg gee \ 119 + --vapidir $(top_srcdir)/vala --pkg vala \ 120 + --vapidir $(top_srcdir)/ccode --pkg ccode \ 121 + --vapidir $(top_srcdir)/codegen --pkg codegen \ 122 + + $(LIBGVC_PKG) \ 123 + --pkg config \ 124 + $(filter %.vala %.c,$^) 125 + touch $@ 126 + @@ -217,6 +224,9 @@ nodist_pkgconfig_DATA = valadoc@PACKAGE_SUFFIX@.pc 127 + 128 + valadoc@PACKAGE_SUFFIX@.pc: valadoc.pc 129 + cp $< $@ 130 + +if !ENABLE_GRAPHVIZ 131 + + sed -i "s/libgvc //g" $@ 132 + +endif 133 + 134 + vapidir = $(datadir)/vala/vapi 135 + dist_vapi_DATA = valadoc@PACKAGE_SUFFIX@.vapi 136 + @@ -224,6 +234,9 @@ nodist_vapi_DATA = valadoc@PACKAGE_SUFFIX@.deps 137 + 138 + valadoc@PACKAGE_SUFFIX@.deps: valadoc.deps 139 + cp $< $@ 140 + +if !ENABLE_GRAPHVIZ 141 + + sed -i "s/libgvc//g" $@ 142 + +endif 143 + 144 + EXTRA_DIST = \ 145 + $(libvaladoc_la_VALASOURCES) \ 146 + diff --git i/libvaladoc/html/basicdoclet.vala w/libvaladoc/html/basicdoclet.vala 147 + index 192e488cd..ec0960222 100644 148 + --- i/libvaladoc/html/basicdoclet.vala 149 + +++ w/libvaladoc/html/basicdoclet.vala 150 + @@ -46,7 +46,11 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet { 151 + protected HtmlRenderer _renderer; 152 + protected Html.MarkupWriter writer; 153 + protected Html.CssClassResolver cssresolver; 154 + +#if HAVE_GRAPHVIZ 155 + protected Charts.Factory image_factory; 156 + +#else 157 + + protected void* image_factory; 158 + +#endif 159 + protected ErrorReporter reporter; 160 + protected string package_list_link = "../index.html"; 161 + 162 + @@ -120,7 +124,9 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet { 163 + this.linker = new LinkHelper (); 164 + 165 + _renderer = new HtmlRenderer (settings, this.linker, this.cssresolver); 166 + +#if HAVE_GRAPHVIZ 167 + this.image_factory = new SimpleChartFactory (settings, linker); 168 + +#endif 169 + } 170 + 171 + 172 + @@ -1026,6 +1032,7 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet { 173 + } 174 + 175 + protected void write_image_block (Api.Node element) { 176 + +#if HAVE_GRAPHVIZ 177 + if (element is Class || element is Interface || element is Struct) { 178 + unowned string format = (settings.use_svg_images ? "svg" : "png"); 179 + var chart = new Charts.Hierarchy (image_factory, element); 180 + @@ -1045,6 +1052,7 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet { 181 + this.get_img_path_html (element, format)}); 182 + writer.add_usemap (chart); 183 + } 184 + +#endif 185 + } 186 + 187 + public void write_namespace_content (Namespace node, Api.Node? parent) { 188 + diff --git i/libvaladoc/html/htmlmarkupwriter.vala w/libvaladoc/html/htmlmarkupwriter.vala 189 + index 5aa4afdea..e79b0b8f5 100644 190 + --- i/libvaladoc/html/htmlmarkupwriter.vala 191 + +++ w/libvaladoc/html/htmlmarkupwriter.vala 192 + @@ -51,12 +51,16 @@ public class Valadoc.Html.MarkupWriter : Valadoc.MarkupWriter { 193 + } 194 + } 195 + 196 + +#if HAVE_GRAPHVIZ 197 + public unowned MarkupWriter add_usemap (Charts.Chart chart) { 198 + string? buf = (string?) chart.write_buffer ("cmapx"); 199 + if (buf != null) { 200 + raw_text ("\n"); 201 + raw_text ((!) buf); 202 + } 203 + +#else 204 + + public unowned MarkupWriter add_usemap (void* chart) { 205 + +#endif 206 + 207 + return this; 208 + }

+19

pkgs/development/compilers/vala/gvc-compat.patch

··· 1 + diff --git i/libvaladoc/Makefile.am w/libvaladoc/Makefile.am 2 + index 8dc398cf1..a5d8a45b4 100644 3 + --- i/libvaladoc/Makefile.am 4 + +++ w/libvaladoc/Makefile.am 5 + @@ -176,9 +176,13 @@ endif 6 + libvaladoc@PACKAGE_SUFFIX@_la_SOURCES = \ 7 + libvaladoc.vala.stamp \ 8 + $(libvaladoc_la_VALASOURCES:.vala=.c) \ 9 + - gvc-compat.c \ 10 + $(NULL) 11 + 12 + +if ENABLE_GRAPHVIZ 13 + +libvaladoc@PACKAGE_SUFFIX@_la_SOURCES += \ 14 + + gvc-compat.c 15 + +endif 16 + + 17 + valadoc@PACKAGE_SUFFIX@.vapi valadoc.h: libvaladoc.vala.stamp 18 + libvaladoc.vala.stamp: $(libvaladoc_la_VALASOURCES) 19 + $(VALA_V)$(VALAC) \

Configure Feed

Configure Feed