wok-current annotate vala/stuff/disable-graphviz.patch @ rev 25701

Fix dep for libglamoregl.so (libepoxy), and miss file for amdgpu (thanks alanyih)
author Stanislas Leduc <shann@slitaz.org>
date Fri Apr 19 12:48:51 2024 +0000 (2 months ago)
parents
children
rev   line source
shann@25634 1 --- ./configure.ac.orig 2019-03-10 13:06:41.459005634 -0500
shann@25634 2 +++ ./configure.ac 2019-03-10 13:11:12.155008532 -0500
shann@25634 3 @@ -158,8 +158,11 @@
shann@25634 4
shann@25634 5 AC_ARG_ENABLE(valadoc, AS_HELP_STRING([--disable-valadoc], [Disable valadoc]), enable_valadoc=$enableval, enable_valadoc=yes)
shann@25634 6 if test x$enable_valadoc = xyes; then
shann@25634 7 +AC_ARG_ENABLE(graphviz, AS_HELP_STRING([--disable-graphviz], [Disable graphviz usage for valadoc]), enable_graphviz=$enableval, enable_graphviz=yes)
shann@25634 8 +if test x$enable_graphviz = xyes; then
shann@25634 9 PKG_CHECK_MODULES(LIBGVC, libgvc >= $LIBGVC_REQUIRED)
shann@25634 10 AC_MSG_CHECKING([for CGRAPH])
shann@25634 11 + VALAFLAGS="$VALAFLAGS -D HAVE_GRAPHVIZ"
shann@25634 12 cgraph_tmp_LIBADD="$LIBADD"
shann@25634 13 cgraph_tmp_CFLAGS="$CFLAGS"
shann@25634 14 LIBADD="$LIBADD $LIBGVC_LIBS"
shann@25634 15 @@ -186,6 +189,8 @@
shann@25634 16 LIBADD="$cgraph_tmp_LIBADD"
shann@25634 17 CFLAGS="$cgraph_tmp_CFLAGS"
shann@25634 18 fi
shann@25634 19 +AM_CONDITIONAL(ENABLE_GRAPHVIZ, test x$enable_graphviz = xyes)
shann@25634 20 +fi
shann@25634 21 AM_CONDITIONAL(HAVE_CGRAPH, test "$have_cgraph" = "yes")
shann@25634 22 AM_CONDITIONAL(ENABLE_VALADOC, test x$enable_valadoc = xyes)
shann@25634 23
shann@25634 24 --- ./libvaladoc/html/basicdoclet.vala.orig 2019-03-07 06:45:45.000000000 -0600
shann@25634 25 +++ ./libvaladoc/html/basicdoclet.vala 2019-03-10 13:06:41.513005635 -0500
shann@25634 26 @@ -46,7 +46,11 @@
shann@25634 27 protected HtmlRenderer _renderer;
shann@25634 28 protected Html.MarkupWriter writer;
shann@25634 29 protected Html.CssClassResolver cssresolver;
shann@25634 30 +#if HAVE_GRAPHVIZ
shann@25634 31 protected Charts.Factory image_factory;
shann@25634 32 +#else
shann@25634 33 + protected void* image_factory;
shann@25634 34 +#endif
shann@25634 35 protected ErrorReporter reporter;
shann@25634 36 protected string package_list_link = "../index.html";
shann@25634 37
shann@25634 38 @@ -120,7 +124,9 @@
shann@25634 39 this.linker = new LinkHelper ();
shann@25634 40
shann@25634 41 _renderer = new HtmlRenderer (settings, this.linker, this.cssresolver);
shann@25634 42 +#if HAVE_GRAPHVIZ
shann@25634 43 this.image_factory = new SimpleChartFactory (settings, linker);
shann@25634 44 +#endif
shann@25634 45 }
shann@25634 46
shann@25634 47
shann@25634 48 @@ -1025,6 +1031,7 @@
shann@25634 49 }
shann@25634 50
shann@25634 51 protected void write_image_block (Api.Node element) {
shann@25634 52 +#if HAVE_GRAPHVIZ
shann@25634 53 if (element is Class || element is Interface || element is Struct) {
shann@25634 54 unowned string format = (settings.use_svg_images ? "svg" : "png");
shann@25634 55 var chart = new Charts.Hierarchy (image_factory, element);
shann@25634 56 @@ -1044,6 +1051,7 @@
shann@25634 57 this.get_img_path_html (element, format)});
shann@25634 58 writer.add_usemap (chart);
shann@25634 59 }
shann@25634 60 +#endif
shann@25634 61 }
shann@25634 62
shann@25634 63 public void write_namespace_content (Namespace node, Api.Node? parent) {
shann@25634 64 --- ./libvaladoc/html/htmlmarkupwriter.vala.orig 2019-03-07 06:45:45.000000000 -0600
shann@25634 65 +++ ./libvaladoc/html/htmlmarkupwriter.vala 2019-03-10 13:06:41.528005635 -0500
shann@25634 66 @@ -51,12 +51,16 @@
shann@25634 67 }
shann@25634 68 }
shann@25634 69
shann@25634 70 +#if HAVE_GRAPHVIZ
shann@25634 71 public unowned MarkupWriter add_usemap (Charts.Chart chart) {
shann@25634 72 string? buf = (string?) chart.write_buffer ("cmapx");
shann@25634 73 if (buf != null) {
shann@25634 74 raw_text ("\n");
shann@25634 75 raw_text ((!) buf);
shann@25634 76 }
shann@25634 77 +#else
shann@25634 78 + public unowned MarkupWriter add_usemap (void* chart) {
shann@25634 79 +#endif
shann@25634 80
shann@25634 81 return this;
shann@25634 82 }
shann@25634 83 --- ./libvaladoc/Makefile.am.orig 2019-03-07 08:55:35.000000000 -0600
shann@25634 84 +++ ./libvaladoc/Makefile.am 2019-03-10 13:06:41.509005635 -0500
shann@25634 85 @@ -119,10 +119,6 @@
shann@25634 86 content/tablerow.vala \
shann@25634 87 content/taglet.vala \
shann@25634 88 content/text.vala \
shann@25634 89 - charts/chart.vala \
shann@25634 90 - charts/chartfactory.vala \
shann@25634 91 - charts/hierarchychart.vala \
shann@25634 92 - charts/simplechartfactory.vala \
shann@25634 93 parser/manyrule.vala \
shann@25634 94 parser/oneofrule.vala \
shann@25634 95 parser/optionalrule.vala \
shann@25634 96 @@ -149,13 +145,24 @@
shann@25634 97 highlighter/codetoken.vala \
shann@25634 98 highlighter/highlighter.vala \
shann@25634 99 html/basicdoclet.vala \
shann@25634 100 - html/htmlchartfactory.vala \
shann@25634 101 html/linkhelper.vala \
shann@25634 102 html/cssclassresolver.vala \
shann@25634 103 html/htmlmarkupwriter.vala \
shann@25634 104 html/htmlrenderer.vala \
shann@25634 105 $(NULL)
shann@25634 106
shann@25634 107 +if ENABLE_GRAPHVIZ
shann@25634 108 +libvaladoc_la_VALASOURCES += \
shann@25634 109 + charts/chart.vala \
shann@25634 110 + charts/chartfactory.vala \
shann@25634 111 + charts/hierarchychart.vala \
shann@25634 112 + charts/simplechartfactory.vala \
shann@25634 113 + html/htmlchartfactory.vala \
shann@25634 114 + $(NULL)
shann@25634 115 +
shann@25634 116 +LIBGVC_PKG = --vapidir $(top_srcdir)/vapi --pkg libgvc
shann@25634 117 +endif
shann@25634 118 +
shann@25634 119 libvaladoc@PACKAGE_SUFFIX@_la_SOURCES = \
shann@25634 120 libvaladoc.vala.stamp \
shann@25634 121 $(libvaladoc_la_VALASOURCES:.vala=.c) \
shann@25634 122 @@ -175,11 +182,11 @@
shann@25634 123 --library valadoc \
shann@25634 124 --vapi valadoc@PACKAGE_SUFFIX@.vapi \
shann@25634 125 --vapidir $(top_srcdir)/vapi --pkg gmodule-2.0 \
shann@25634 126 - --vapidir $(top_srcdir)/vapi --pkg libgvc \
shann@25634 127 --vapidir $(top_srcdir)/gee --pkg gee \
shann@25634 128 --vapidir $(top_srcdir)/vala --pkg vala \
shann@25634 129 --vapidir $(top_srcdir)/ccode --pkg ccode \
shann@25634 130 --vapidir $(top_srcdir)/codegen --pkg codegen \
shann@25634 131 + $(LIBGVC_PKG) \
shann@25634 132 --pkg config \
shann@25634 133 $(filter %.vala %.c,$^)
shann@25634 134 touch $@
shann@25634 135 @@ -207,6 +214,9 @@
shann@25634 136
shann@25634 137 valadoc@PACKAGE_SUFFIX@.pc: valadoc.pc
shann@25634 138 cp $< $@
shann@25634 139 +if !ENABLE_GRAPHVIZ
shann@25634 140 + sed -i "s/libgvc //g" $@
shann@25634 141 +endif
shann@25634 142
shann@25634 143 vapidir = $(datadir)/vala/vapi
shann@25634 144 dist_vapi_DATA = valadoc@PACKAGE_SUFFIX@.vapi
shann@25634 145 @@ -214,6 +224,9 @@
shann@25634 146
shann@25634 147 valadoc@PACKAGE_SUFFIX@.deps: valadoc.deps
shann@25634 148 cp $< $@
shann@25634 149 +if !ENABLE_GRAPHVIZ
shann@25634 150 + sed -i "s/libgvc//g" $@
shann@25634 151 +endif
shann@25634 152
shann@25634 153 EXTRA_DIST = \
shann@25634 154 $(libvaladoc_la_VALASOURCES) \