GNOME.org
 

[gitg/wip/valadoc: 12/12] Flatpak build vala to use valadoc without graphviz

commit 4ce0f5782451557f091892fcfd65d11966ac1957
Author: Alberto Fanjul <albertofanjul gmail com>
Date:   Fri Oct 12 12:11:32 2018 +0200

    Flatpak build vala to use valadoc without graphviz

 ...c-Allow-disabling-the-graphviz-dependency.patch | 214 +++++++++++++++++++++
 org.gnome.Gitg.json                                |  19 +-
 2 files changed, 232 insertions(+), 1 deletion(-)
---
diff --git a/libvaladoc-Allow-disabling-the-graphviz-dependency.patch 
b/libvaladoc-Allow-disabling-the-graphviz-dependency.patch
new file mode 100644
index 00000000..177dbdce
--- /dev/null
+++ b/libvaladoc-Allow-disabling-the-graphviz-dependency.patch
@@ -0,0 +1,214 @@
+From c4885385c5fa0372920d0afbbaa85842f2b14460 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
+---
+ configure.ac                          | 60 +++++++++++++++++++----------------
+ libvaladoc/Makefile.am                | 24 ++++++++++----
+ libvaladoc/html/basicdoclet.vala      |  8 +++++
+ libvaladoc/html/htmlmarkupwriter.vala |  5 ++-
+ 4 files changed, 62 insertions(+), 35 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 24b3bcd79..bc7235fdf 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -112,34 +112,38 @@ PKG_CHECK_MODULES(GMODULE, gmodule-2.0 >= $GLIB_REQUIRED)
+ AC_SUBST(GMODULE_CFLAGS)
+ AC_SUBST(GMODULE_LIBS)
+ 
+-PKG_CHECK_MODULES(LIBGVC, libgvc >= $LIBGVC_REQUIRED)
+-AC_MSG_CHECKING([for CGRAPH])
+-cgraph_tmp_LIBADD="$LIBADD"
+-cgraph_tmp_CFLAGS="$CFLAGS"
+-LIBADD="$LIBADD $LIBGVC_LIBS"
+-CFLAGS="$CFLAGS $LIBGVC_CFLAGS"
+-AC_RUN_IFELSE(
+-      [AC_LANG_SOURCE([
+-              #include <gvc.h>
+-
+-              int main(void) {
+-                      #ifdef WITH_CGRAPH
+-                              return 0;
+-                      #else
+-                              return -1;
+-                      #endif
+-              }
+-      ])], [
+-              AC_MSG_RESULT([yes])
+-              VALAFLAGS="$VALAFLAGS -D WITH_CGRAPH"
+-              have_cgraph=yes
+-      ], [
+-              AC_MSG_RESULT([no])
+-              have_cgraph=no
+-      ]
+-)
+-LIBADD="$cgraph_tmp_LIBADD"
+-CFLAGS="$cgraph_tmp_CFLAGS"
++AC_ARG_ENABLE(graphviz, AS_HELP_STRING([--disable-graphviz], [Disable graphviz usage for valadoc]), 
enable_graphviz=$enableval, enable_graphviz=yes)
++if test x$enable_graphviz = xyes; then
++      PKG_CHECK_MODULES(LIBGVC, libgvc >= $LIBGVC_REQUIRED)
++      AC_MSG_CHECKING([for CGRAPH])
++      VALAFLAGS="$VALAFLAGS -D HAVE_GRAPHVIZ"
++      cgraph_tmp_LIBADD="$LIBADD"
++      cgraph_tmp_CFLAGS="$CFLAGS"
++      LIBADD="$LIBADD $LIBGVC_LIBS"
++      CFLAGS="$CFLAGS $LIBGVC_CFLAGS"
++      AC_RUN_IFELSE(
++              [AC_LANG_SOURCE([
++                      #include <gvc.h>
++                      int main(void) {
++                              #ifdef WITH_CGRAPH
++                                      return 0;
++                              #else
++                                      return -1;
++                              #endif
++                      }
++              ])], [
++                      AC_MSG_RESULT([yes])
++                      VALAFLAGS="$VALAFLAGS -D WITH_CGRAPH"
++                      have_cgraph=yes
++              ], [
++                      AC_MSG_RESULT([no])
++                      have_cgraph=no
++              ]
++      )
++      LIBADD="$cgraph_tmp_LIBADD"
++      CFLAGS="$cgraph_tmp_CFLAGS"
++fi
++AM_CONDITIONAL(ENABLE_GRAPHVIZ, test x$enable_graphviz = xyes)
+ AM_CONDITIONAL(HAVE_CGRAPH, test "$have_cgraph" = "yes")
+ 
+ AC_PATH_PROG([XSLTPROC], [xsltproc], :)
+diff --git a/libvaladoc/Makefile.am b/libvaladoc/Makefile.am
+index 384292f57..a59e728ca 100644
+--- a/libvaladoc/Makefile.am
++++ b/libvaladoc/Makefile.am
+@@ -126,10 +126,6 @@ libvaladoc_la_VALASOURCES = \
+       content/tablerow.vala \
+       content/taglet.vala \
+       content/text.vala \
+-      charts/chart.vala \
+-      charts/chartfactory.vala \
+-      charts/hierarchychart.vala \
+-      charts/simplechartfactory.vala \
+       parser/manyrule.vala \
+       parser/oneofrule.vala \
+       parser/optionalrule.vala \
+@@ -156,18 +152,34 @@ libvaladoc_la_VALASOURCES = \
+       highlighter/codetoken.vala \
+       highlighter/highlighter.vala \
+       html/basicdoclet.vala \
+-      html/htmlchartfactory.vala \
+       html/linkhelper.vala \
+       html/cssclassresolver.vala \
+       html/htmlmarkupwriter.vala \
+       html/htmlrenderer.vala \
+       $(NULL)
+ 
++if ENABLE_GRAPHVIZ
++libvaladoc_la_VALASOURCES += \
++      charts/chart.vala \
++      charts/chartfactory.vala \
++      charts/hierarchychart.vala \
++      charts/simplechartfactory.vala \
++      html/htmlchartfactory.vala \
++      $(NULL)
++
++LIBGVC_PKG = --vapidir $(top_srcdir)/vapi --pkg libgvc
++endif
++
+ libvaladoc@PACKAGE_SUFFIX@_la_SOURCES = \
+       libvaladoc.vala.stamp \
+       $(libvaladoc_la_VALASOURCES:.vala=.c) \
++      $(NULL)
++
++if ENABLE_GRAPHVIZ
++libvaladoc@PACKAGE_SUFFIX@_la_SOURCES += \
+       gvc-compat.c \
+       $(NULL)
++endif
+ 
+ valadoc@PACKAGE_SUFFIX@.vapi valadoc.h: libvaladoc.vala.stamp
+ libvaladoc.vala.stamp: $(libvaladoc_la_VALASOURCES)
+@@ -182,9 +194,9 @@ libvaladoc.vala.stamp: $(libvaladoc_la_VALASOURCES)
+               --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 \
++              $(LIBGVC_PKG) \
+               --pkg config \
+               $(filter %.vala %.c,$^)
+       touch $@
+diff --git a/libvaladoc/html/basicdoclet.vala b/libvaladoc/html/basicdoclet.vala
+index cc9ea4ed7..432c3818f 100644
+--- a/libvaladoc/html/basicdoclet.vala
++++ b/libvaladoc/html/basicdoclet.vala
+@@ -46,7 +46,11 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet {
+       protected HtmlRenderer _renderer;
+       protected Html.MarkupWriter writer;
+       protected Html.CssClassResolver cssresolver;
++#if HAVE_GRAPHVIZ
+       protected Charts.Factory image_factory;
++#else
++      protected void* image_factory;
++#endif
+       protected ErrorReporter reporter;
+       protected string package_list_link = "../index.html";
+ 
+@@ -120,7 +124,9 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet {
+               this.linker = new LinkHelper ();
+ 
+               _renderer = new HtmlRenderer (settings, this.linker, this.cssresolver);
++#if HAVE_GRAPHVIZ
+               this.image_factory = new SimpleChartFactory (settings, linker);
++#endif
+       }
+ 
+ 
+@@ -1025,6 +1031,7 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet {
+       }
+ 
+       protected void write_image_block (Api.Node element) {
++#if HAVE_GRAPHVIZ
+               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 {
+                                                                          this.get_img_path_html (element, 
format)});
+                       writer.add_usemap (chart);
+               }
++#endif
+       }
+ 
+       public void write_namespace_content (Namespace node, Api.Node? parent) {
+diff --git a/libvaladoc/html/htmlmarkupwriter.vala b/libvaladoc/html/htmlmarkupwriter.vala
+index 3a3be3de0..0969b7289 100644
+--- a/libvaladoc/html/htmlmarkupwriter.vala
++++ b/libvaladoc/html/htmlmarkupwriter.vala
+@@ -43,13 +43,16 @@ public class Valadoc.Html.MarkupWriter : Valadoc.MarkupWriter {
+               }, xml_declaration);
+       }
+ 
++#if HAVE_GRAPHVIZ
+       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 unowned MarkupWriter add_usemap (void* chart) {
++#endif
+               return this;
+       }
+ 
+-- 
+2.11.0
+
diff --git a/org.gnome.Gitg.json b/org.gnome.Gitg.json
index ba170cc7..8a09041d 100644
--- a/org.gnome.Gitg.json
+++ b/org.gnome.Gitg.json
@@ -47,6 +47,23 @@
         "*.a"
     ],
     "modules" : [
+        {
+            "name" : "vala",
+            "config-opts" : [
+                "--disable-graphviz"
+            ],
+            "sources" : [
+                {
+                    "type" : "git",
+                    "url" : "https://gitlab.gnome.org/GNOME/vala.git";,
+                    "tag" : "0.42.1"
+                },
+                {
+                    "type" : "patch",
+                    "path" : "libvaladoc-Allow-disabling-the-graphviz-dependency.patch"
+                }
+            ]
+        },
         {
             "name" : "libssh2",
             "buildsystem" : "cmake",
@@ -158,4 +175,4 @@
             ]
         }
     ]
-}
\ No newline at end of file
+}
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]