[gimp] devel-docs: various documentation and build fixes

From: Michael Natterer <mitch src gnome org>
To: commits-list gnome org
Cc:
Subject: [gimp] devel-docs: various documentation and build fixes
Date: Tue, 23 Jul 2019 23:22:10 +0000 (UTC)
commit c2a38f0631b53d4221a0c43f86dbe7661db4f55f
Author: Michael Natterer <mitch gimp org>
Date:   Wed Jul 24 01:21:16 2019 +0200

    devel-docs: various documentation and build fixes

 devel-docs/libgimp/Makefile.am                         | 13 +++++++++----
 devel-docs/libgimp/libgimp3-docs.sgml                  | 11 -----------
 devel-docs/libgimpbase/libgimpbase3-sections.txt       |  2 --
 devel-docs/libgimpcolor/libgimpcolor3-docs.sgml        |  4 ++++
 devel-docs/libgimpcolor/libgimpcolor3-sections.txt     |  4 ++--
 devel-docs/libgimpcolor/libgimpcolor3.types            |  2 ++
 devel-docs/libgimpconfig/Makefile.am                   |  5 ++++-
 devel-docs/libgimpconfig/libgimpconfig3-sections.txt   |  2 +-
 devel-docs/libgimpthumb/Makefile.am                    |  3 ++-
 devel-docs/libgimpwidgets/Makefile.am                  |  8 ++++++--
 devel-docs/libgimpwidgets/libgimpwidgets3-docs.sgml    | 11 ++++-------
 devel-docs/libgimpwidgets/libgimpwidgets3-sections.txt |  1 -
 12 files changed, 34 insertions(+), 32 deletions(-)
---
diff --git a/devel-docs/libgimp/Makefile.am b/devel-docs/libgimp/Makefile.am
index a18db36a29..3b1f6934b0 100644
--- a/devel-docs/libgimp/Makefile.am
+++ b/devel-docs/libgimp/Makefile.am
@@ -19,7 +19,12 @@ SCAN_OPTIONS = --deprecated-guards="GIMP_DISABLE_DEPRECATED"
 MKDB_OPTIONS = --sgml-mode --output-format=xml --name-space=gimp
 
 # Extra options to supply to gtkdoc-fixref
-FIXXREF_OPTIONS = --extra-dir=../libgimpbase/html --extra-dir=../libgimpcolor/html 
--extra-dir=../libgimpconfig/html --extra-dir=../libgimpmath/html --extra-dir=../libgimpwidgets/html
+FIXXREF_OPTIONS = \
+       --extra-dir=../libgimpbase/html         \
+       --extra-dir=../libgimpcolor/html        \
+       --extra-dir=../libgimpconfig/html       \
+       --extra-dir=../libgimpmath/html         \
+       --extra-dir=../libgimpwidgets/html
 
 # Used for dependencies
 HFILE_GLOB = $(DOC_SOURCE_DIR)/*.h
@@ -48,9 +53,8 @@ GTKDOC_CFLAGS = \
        @CFLAGS@                \
        -I$(top_srcdir)         \
        -I$(top_builddir)       \
-       $(GEGL_CFLAGS)          \
-       @GTK_CFLAGS@            \
-       -UGTK_DISABLE_SINGLE_INCLUDES
+       @GEGL_CFLAGS@           \
+       @GTK_CFLAGS@
 
 GTKDOC_LIBS = \
        $(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la          \
@@ -60,6 +64,7 @@ GTKDOC_LIBS = \
        $(top_builddir)/libgimpwidgets/libgimpwidgets-$(GIMP_API_VERSION).la    \
        $(top_builddir)/libgimp/libgimp-$(GIMP_API_VERSION).la                  \
        $(top_builddir)/libgimp/libgimpui-$(GIMP_API_VERSION).la                \
+       @GEGL_LIBS@                                                             \
        @GTK_LIBS@
 
 
diff --git a/devel-docs/libgimp/libgimp3-docs.sgml b/devel-docs/libgimp/libgimp3-docs.sgml
index b5c4acae98..ebfe541117 100644
--- a/devel-docs/libgimp/libgimp3-docs.sgml
+++ b/devel-docs/libgimp/libgimp3-docs.sgml
@@ -40,7 +40,6 @@
     <chapter id="libgimp-image">
       <title>Manupulating Images and their Properties</title>
       <xi:include href="xml/gimpchannel.xml" />
-      <xi:include href="xml/gimpcolor.xml" />
       <xi:include href="xml/gimpdisplay.xml" />
       <xi:include href="xml/gimpdrawable.xml" />
       <xi:include href="xml/gimpdrawablecolor.xml" />
@@ -61,15 +60,11 @@
       <xi:include href="xml/gimpitem.xml" />
       <xi:include href="xml/gimpitemtransform.xml" />
       <xi:include href="xml/gimplayer.xml" />
-      <xi:include href="xml/gimppaths.xml" />
       <xi:include href="xml/gimppixbuf.xml" />
       <xi:include href="xml/gimpselection.xml" />
       <xi:include href="xml/gimptextlayer.xml" />
       <xi:include href="xml/gimptexttool.xml" />
-      <xi:include href="xml/gimptile.xml" />
       <xi:include href="xml/gimppainttools.xml" />
-      <xi:include href="xml/gimpselectiontools.xml" />
-      <xi:include href="xml/gimptransformtools.xml" />
       <xi:include href="xml/gimpvectors.xml" />
     </chapter>
 
@@ -120,12 +115,6 @@
     <xi:include href="xml/gimpitemcombobox.xml" />
     <xi:include href="xml/gimpimagecombobox.xml" />
     <xi:include href="xml/gimpprogressbar.xml" />
-    <xi:include href="xml/gimpmenu.xml" />
-    <xi:include href="xml/gimpbrushmenu.xml" />
-    <xi:include href="xml/gimpfontmenu.xml" />
-    <xi:include href="xml/gimpgradientmenu.xml" />
-    <xi:include href="xml/gimppalettemenu.xml" />
-    <xi:include href="xml/gimppatternmenu.xml" />
     <xi:include href="xml/gimpprocbrowserdialog.xml" />
     <xi:include href="xml/gimpprocview.xml" />
   </part>
diff --git a/devel-docs/libgimpbase/libgimpbase3-sections.txt 
b/devel-docs/libgimpbase/libgimpbase3-sections.txt
index 5ceaf8db49..98d747ff23 100644
--- a/devel-docs/libgimpbase/libgimpbase3-sections.txt
+++ b/devel-docs/libgimpbase/libgimpbase3-sections.txt
@@ -71,7 +71,6 @@ GimpTextJustification
 GimpTransferMode
 GimpTransformDirection
 GimpTransformResize
-GimpUserDirectory
 GimpVectorsStrokeType
 <SUBSECTION Standard>
 GIMP_TYPE_ADD_MASK_TYPE
@@ -219,7 +218,6 @@ gimp_data_directory_file
 gimp_locale_directory_file
 gimp_sysconf_directory_file
 gimp_plug_in_directory_file
-gimp_user_directory
 gimp_personal_rc_file
 gimp_gtkrc
 gimp_path_parse
diff --git a/devel-docs/libgimpcolor/libgimpcolor3-docs.sgml b/devel-docs/libgimpcolor/libgimpcolor3-docs.sgml
index b9be0dd8bf..661fc7fcd9 100644
--- a/devel-docs/libgimpcolor/libgimpcolor3-docs.sgml
+++ b/devel-docs/libgimpcolor/libgimpcolor3-docs.sgml
@@ -50,6 +50,10 @@
     <title>Index of new symbols in GIMP 2.10</title>
     <xi:include href="xml/api-index-2.10.xml"><xi:fallback /></xi:include>
   </index>
+  <index role="2.10.6" id="api-index-2-10-6">
+    <title>Index of new symbols in GIMP 2.10.6</title>
+    <xi:include href="xml/api-index-2.10.6.xml"><xi:fallback /></xi:include>
+  </index>
   <index role="deprecated" id="api-index-deprecated">
     <title>Index of deprecated symbols</title>
     <xi:include href="xml/api-index-deprecated.xml"><xi:fallback /></xi:include>
diff --git a/devel-docs/libgimpcolor/libgimpcolor3-sections.txt 
b/devel-docs/libgimpcolor/libgimpcolor3-sections.txt
index 5de01306a6..75c9780d16 100644
--- a/devel-docs/libgimpcolor/libgimpcolor3-sections.txt
+++ b/devel-docs/libgimpcolor/libgimpcolor3-sections.txt
@@ -121,6 +121,7 @@ gimp_color_managed_interface_get_type
 <SECTION>
 <FILE>gimpcolorprofile</FILE>
 <TITLE>GimpColorProfile</TITLE>
+GimpColorProfile
 gimp_color_profile_new_rgb_srgb
 gimp_color_profile_new_rgb_srgb_linear
 gimp_color_profile_new_rgb_adobe
@@ -156,7 +157,6 @@ GIMP_COLOR_PROFILE_GET_CLASS
 GIMP_IS_COLOR_PROFILE
 GIMP_IS_COLOR_PROFILE_CLASS
 GIMP_TYPE_COLOR_PROFILE
-GimpColorProfile
 GimpColorProfileClass
 GimpColorProfilePrivate
 gimp_color_profile_get_type
@@ -166,6 +166,7 @@ gimp_color_profile_get_type
 <FILE>gimpcolortransform</FILE>
 <TITLE>GimpColorTransform</TITLE>
 GimpColorTransformFlags
+GimpColorTransform
 gimp_color_transform_new
 gimp_color_transform_new_proofing
 gimp_color_transform_process_pixels
@@ -178,7 +179,6 @@ GIMP_COLOR_TRANSFORM_GET_CLASS
 GIMP_IS_COLOR_TRANSFORM
 GIMP_IS_COLOR_TRANSFORM_CLASS
 GIMP_TYPE_COLOR_TRANSFORM
-GimpColorTransform
 GimpColorTransformClass
 GimpColorTransformPrivate
 gimp_color_transform_get_type
diff --git a/devel-docs/libgimpcolor/libgimpcolor3.types b/devel-docs/libgimpcolor/libgimpcolor3.types
index fa366ac1a1..8d46eca1a7 100644
--- a/devel-docs/libgimpcolor/libgimpcolor3.types
+++ b/devel-docs/libgimpcolor/libgimpcolor3.types
@@ -1 +1,3 @@
 gimp_color_managed_get_type
+gimp_color_profile_get_type
+gimp_color_transform_get_type
diff --git a/devel-docs/libgimpconfig/Makefile.am b/devel-docs/libgimpconfig/Makefile.am
index d661a8b7d1..a4a4f90b06 100644
--- a/devel-docs/libgimpconfig/Makefile.am
+++ b/devel-docs/libgimpconfig/Makefile.am
@@ -19,7 +19,10 @@ SCAN_OPTIONS = --deprecated-guards="GIMP_DISABLE_DEPRECATED"
 MKDB_OPTIONS = --sgml-mode --output-format=xml --name-space=gimp
 
 # Extra options to supply to gtkdoc-fixref
-FIXXREF_OPTIONS = --extra-dir=../libgimpbase/html --extra-dir=../libgimpcolor/html 
--extra-dir=../libgimpmath/html
+FIXXREF_OPTIONS = \
+       --extra-dir=../libgimpbase/html         \
+       --extra-dir=../libgimpcolor/html        \
+       --extra-dir=../libgimpmath/html
 
 # Used for dependencies
 HFILE_GLOB = $(DOC_SOURCE_DIR)/*.h
diff --git a/devel-docs/libgimpconfig/libgimpconfig3-sections.txt 
b/devel-docs/libgimpconfig/libgimpconfig3-sections.txt
index 2b31301c13..db41412a27 100644
--- a/devel-docs/libgimpconfig/libgimpconfig3-sections.txt
+++ b/devel-docs/libgimpconfig/libgimpconfig3-sections.txt
@@ -160,6 +160,7 @@ gimp_scanner_parse_matrix2
 <TITLE>GimpColorConfig</TITLE>
 GimpColorManagementMode
 GimpColorRenderingIntent
+GimpColorConfig
 gimp_color_config_get_mode
 gimp_color_config_get_display_intent
 gimp_color_config_get_display_bpc
@@ -176,7 +177,6 @@ gimp_color_config_get_cmyk_color_profile
 gimp_color_config_get_display_color_profile
 gimp_color_config_get_simulation_color_profile
 <SUBSECTION Standard>
-GimpColorConfig
 GimpColorConfigClass
 GimpColorConfigPrivate
 GIMP_COLOR_CONFIG
diff --git a/devel-docs/libgimpthumb/Makefile.am b/devel-docs/libgimpthumb/Makefile.am
index 5ab6454b57..d6a161810a 100644
--- a/devel-docs/libgimpthumb/Makefile.am
+++ b/devel-docs/libgimpthumb/Makefile.am
@@ -19,7 +19,8 @@ SCAN_OPTIONS =
 MKDB_OPTIONS = --sgml-mode --output-format=xml --name-space=gimp
 
 # Extra options to supply to gtkdoc-fixref
-FIXXREF_OPTIONS = --extra-dir=../libgimpmath/html
+FIXXREF_OPTIONS = \
+       --extra-dir=../libgimpmath/html
 
 # Used for dependencies
 HFILE_GLOB = $(DOC_SOURCE_DIR)/*.h
diff --git a/devel-docs/libgimpwidgets/Makefile.am b/devel-docs/libgimpwidgets/Makefile.am
index 6d6b283b9b..59f7eee527 100644
--- a/devel-docs/libgimpwidgets/Makefile.am
+++ b/devel-docs/libgimpwidgets/Makefile.am
@@ -20,7 +20,12 @@ SCAN_OPTIONS = --deprecated-guards="GIMP_DISABLE_DEPRECATED"
 MKDB_OPTIONS = --sgml-mode --output-format=xml --name-space=gimp
 
 # Extra options to supply to gtkdoc-fixref
-FIXXREF_OPTIONS = --extra-dir=../libgimpbase/html --extra-dir=../libgimpcolor/html 
--extra-dir=../libgimpconfig/html --extra-dir=../libgimpmath/html --extra-dir=../libgimp/html
+FIXXREF_OPTIONS = \
+       --extra-dir=../libgimpbase/html         \
+       --extra-dir=../libgimpcolor/html        \
+       --extra-dir=../libgimpconfig/html       \
+       --extra-dir=../libgimpmath/html         \
+       --extra-dir=../libgimp/html
 
 # Used for dependencies
 HFILE_GLOB = $(DOC_SOURCE_DIR)/*.h
@@ -65,7 +70,6 @@ GTKDOC_CFLAGS = \
        @GEGL_CFLAGS@                                   \
        @GTK_CFLAGS@                                    \
        -DGIMP_ENABLE_CONTROLLER_UNDER_CONSTRUCTION     \
-       -UGTK_DISABLE_SINGLE_INCLUDES                   \
        -UGIMP_DISABLE_DEPRECATED
 
 GTKDOC_LIBS = \
diff --git a/devel-docs/libgimpwidgets/libgimpwidgets3-docs.sgml 
b/devel-docs/libgimpwidgets/libgimpwidgets3-docs.sgml
index b14fc2b0bd..5b6ad9ff05 100644
--- a/devel-docs/libgimpwidgets/libgimpwidgets3-docs.sgml
+++ b/devel-docs/libgimpwidgets/libgimpwidgets3-docs.sgml
@@ -102,13 +102,6 @@
     <xi:include href="xml/gimpwidgetsutils.xml" />
   </part>
 
-  <part id="libgimpwidgets-deprecated">
-    <title>Deprecated API</title>
-    <xi:include href="xml/gimpoldwidgets.xml" />
-    <xi:include href="xml/gimppixmap.xml" />
-    <xi:include href="xml/gimpunitmenu.xml" />
-  </part>
-
   <index id="api-index-full">
     <title>Index</title>
     <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
@@ -141,6 +134,10 @@
     <title>Index of new symbols in GIMP 2.10.10</title>
     <xi:include href="xml/api-index-2.10.10.xml"><xi:fallback /></xi:include>
   </index>
+  <index role="3.0" id="api-index-3-0">
+    <title>Index of new symbols in GIMP 3.0</title>
+    <xi:include href="xml/api-index-3.0.xml"><xi:fallback /></xi:include>
+  </index>
   <index role="deprecated" id="api-index-deprecated">
     <title>Index of deprecated symbols</title>
     <xi:include href="xml/api-index-deprecated.xml"><xi:fallback /></xi:include>
diff --git a/devel-docs/libgimpwidgets/libgimpwidgets3-sections.txt 
b/devel-docs/libgimpwidgets/libgimpwidgets3-sections.txt
index 15a17b3f0e..4ead755871 100644
--- a/devel-docs/libgimpwidgets/libgimpwidgets3-sections.txt
+++ b/devel-docs/libgimpwidgets/libgimpwidgets3-sections.txt
@@ -1200,7 +1200,6 @@ gimp_prop_spin_button_new
 gimp_prop_string_combo_box_new
 gimp_prop_text_buffer_new
 gimp_prop_unit_combo_box_new
-gimp_prop_unit_menu_new
 </SECTION>
 
 <SECTION>
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]