mirror of
git://slackware.nl/current.git
synced 2024-12-27 09:59:16 +01:00
e235a93fe5
a/kernel-generic-4.19.28-x86_64-1.txz: Upgraded. a/kernel-huge-4.19.28-x86_64-1.txz: Upgraded. a/kernel-modules-4.19.28-x86_64-1.txz: Upgraded. d/kernel-headers-4.19.28-x86-1.txz: Upgraded. d/vala-0.44.0-x86_64-1.txz: Upgraded. Shared library .so-version bump. k/kernel-source-4.19.28-noarch-1.txz: Upgraded. l/gobject-introspection-1.60.0-x86_64-1.txz: Upgraded. l/imagemagick-6.9.10_33-x86_64-1.txz: Upgraded. l/pygobject3-3.32.0-x86_64-1.txz: Upgraded. x/xfd-1.1.3-x86_64-1.txz: Upgraded. x/xprop-1.2.4-x86_64-1.txz: Upgraded. isolinux/initrd.img: Rebuilt. kernels/*: Upgraded. usb-and-pxe-installers/usbboot.img: Rebuilt.
154 lines
4.5 KiB
Diff
154 lines
4.5 KiB
Diff
--- ./configure.ac.orig 2019-03-10 13:06:41.459005634 -0500
|
|
+++ ./configure.ac 2019-03-10 13:11:12.155008532 -0500
|
|
@@ -158,8 +158,11 @@
|
|
|
|
AC_ARG_ENABLE(valadoc, AS_HELP_STRING([--disable-valadoc], [Disable valadoc]), enable_valadoc=$enableval, enable_valadoc=yes)
|
|
if test x$enable_valadoc = xyes; then
|
|
+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"
|
|
@@ -186,6 +189,8 @@
|
|
LIBADD="$cgraph_tmp_LIBADD"
|
|
CFLAGS="$cgraph_tmp_CFLAGS"
|
|
fi
|
|
+AM_CONDITIONAL(ENABLE_GRAPHVIZ, test x$enable_graphviz = xyes)
|
|
+fi
|
|
AM_CONDITIONAL(HAVE_CGRAPH, test "$have_cgraph" = "yes")
|
|
AM_CONDITIONAL(ENABLE_VALADOC, test x$enable_valadoc = xyes)
|
|
|
|
--- ./libvaladoc/html/basicdoclet.vala.orig 2019-03-07 06:45:45.000000000 -0600
|
|
+++ ./libvaladoc/html/basicdoclet.vala 2019-03-10 13:06:41.513005635 -0500
|
|
@@ -46,7 +46,11 @@
|
|
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 @@
|
|
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 @@
|
|
}
|
|
|
|
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 @@
|
|
this.get_img_path_html (element, format)});
|
|
writer.add_usemap (chart);
|
|
}
|
|
+#endif
|
|
}
|
|
|
|
public void write_namespace_content (Namespace node, Api.Node? parent) {
|
|
--- ./libvaladoc/html/htmlmarkupwriter.vala.orig 2019-03-07 06:45:45.000000000 -0600
|
|
+++ ./libvaladoc/html/htmlmarkupwriter.vala 2019-03-10 13:06:41.528005635 -0500
|
|
@@ -51,12 +51,16 @@
|
|
}
|
|
}
|
|
|
|
+#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;
|
|
}
|
|
--- ./libvaladoc/Makefile.am.orig 2019-03-07 08:55:35.000000000 -0600
|
|
+++ ./libvaladoc/Makefile.am 2019-03-10 13:06:41.509005635 -0500
|
|
@@ -119,10 +119,6 @@
|
|
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 \
|
|
@@ -149,13 +145,24 @@
|
|
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) \
|
|
@@ -175,11 +182,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 $@
|
|
@@ -207,6 +214,9 @@
|
|
|
|
valadoc@PACKAGE_SUFFIX@.pc: valadoc.pc
|
|
cp $< $@
|
|
+if !ENABLE_GRAPHVIZ
|
|
+ sed -i "s/libgvc //g" $@
|
|
+endif
|
|
|
|
vapidir = $(datadir)/vala/vapi
|
|
dist_vapi_DATA = valadoc@PACKAGE_SUFFIX@.vapi
|
|
@@ -214,6 +224,9 @@
|
|
|
|
valadoc@PACKAGE_SUFFIX@.deps: valadoc.deps
|
|
cp $< $@
|
|
+if !ENABLE_GRAPHVIZ
|
|
+ sed -i "s/libgvc//g" $@
|
|
+endif
|
|
|
|
EXTRA_DIST = \
|
|
$(libvaladoc_la_VALASOURCES) \
|