[goffice] Fix documentation build with recent gtk-doc. [#788710]



commit bb14b288be3dcce3a212dc364b2362a11e139dae
Author: Jean Brefort <jean brefort normalesup org>
Date:   Mon Oct 30 10:35:36 2017 +0100

    Fix documentation build with recent gtk-doc. [#788710]

 ChangeLog                  |    6 ++++++
 NEWS                       |    1 +
 docs/reference/Makefile.am |    2 +-
 goffice/goffice.c          |    2 +-
 4 files changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 8218450..5772909 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2017-10-30  Jean Brefort  <jean brefort normalesup org>
+
+       * docs/reference/Makefile.am: fix documentation build with recent gtk-doc.
+       [#788710]
+       * goffice/goffice.c:
+
 2017-10-23  Jean Brefort  <jean brefort normalesup org>
 
        * plugins/plot_surface/xl-surface.c (xl_contour_plot_build_matrix): fix
diff --git a/NEWS b/NEWS
index a9d5dd6..6cb8ef8 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,7 @@ Jean:
        * Fix crash in 3D plots when X or Y values are missing. [#788437]
        * Don't use invalid styles in legend from contour or surface plots imported
        from Excel. [#788861]
+       * Fix documentation build with recent gtk-doc. [#788710]
 
 --------------------------------------------------------------------------
 goffice 0.10.35:
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index 7e2978d..3d3099b 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -8,7 +8,7 @@ DOC_MAIN_SGML_FILE=goffice-docs.xml
 
 DOC_SOURCE_DIR=../../goffice
 
-SCANGOBJ_OPTIONS= --nogtkinit --type-init-func="g_type_init ()"
+SCANGOBJ_OPTIONS=
 
 SCAN_OPTIONS= --deprecated-guards="GOFFICE_DISABLE_DEPRECATED" --rebuild-types
 
diff --git a/goffice/goffice.c b/goffice/goffice.c
index 31e51b6..5d2b450 100644
--- a/goffice/goffice.c
+++ b/goffice/goffice.c
@@ -73,7 +73,7 @@ static char const *libgoffice_extern_plugin_dir = GOFFICE_EXTERNPLUGINDIR;
  * To include GOffice use:
  * <informalexample>
  * <programlisting>
- * #include <goffice/goffice.h>
+ * #include &lt;goffice/goffice.h&gt;
  * </programlisting>
  * </informalexample>
  * GOffice provides a pkg-config metadata file named


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]