diff --git a/docs/Makefile.am b/docs/Makefile.am index ece0b947e..5c03209a3 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -34,10 +34,7 @@ SCAN_OPTIONS=--rebuild-types --deprecated-guards="HB_DISABLE_DEPRECATED" \ # Header files or dirs to ignore when scanning. Use base file/dir names # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h private_code IGNORE_HFILES=`cd $(top_srcdir)/src; find . -path './*/*.h' | sed 's@^.*/@@'` -if HAVE_GOBJECT -else IGNORE_HFILES+=hb-gobject.h hb-gobject-enums.h hb-gobject-structs.h -endif # Extra options to supply to gtkdoc-mkdb. # e.g. MKDB_OPTIONS=--xml-mode --output-format=xml diff --git a/docs/harfbuzz-docs.xml b/docs/harfbuzz-docs.xml index e7456d90a..111b054d2 100644 --- a/docs/harfbuzz-docs.xml +++ b/docs/harfbuzz-docs.xml @@ -90,7 +90,6 @@ - diff --git a/docs/harfbuzz-sections.txt b/docs/harfbuzz-sections.txt index 3e4171f23..6b5866223 100644 --- a/docs/harfbuzz-sections.txt +++ b/docs/harfbuzz-sections.txt @@ -394,78 +394,6 @@ hb_glib_script_to_script hb_glib_blob_create -
-hb-gobject -HB_GOBJECT_TYPE_BLOB -HB_GOBJECT_TYPE_BUFFER -HB_GOBJECT_TYPE_BUFFER_CONTENT_TYPE -HB_GOBJECT_TYPE_BUFFER_DIFF_FLAGS -HB_GOBJECT_TYPE_BUFFER_FLAGS -HB_GOBJECT_TYPE_BUFFER_SERIALIZE_FLAGS -HB_GOBJECT_TYPE_BUFFER_SERIALIZE_FORMAT -HB_GOBJECT_TYPE_DIRECTION -HB_GOBJECT_TYPE_FACE -HB_GOBJECT_TYPE_FONT -HB_GOBJECT_TYPE_FONT_FUNCS -HB_GOBJECT_TYPE_GLYPH_FLAGS -HB_GOBJECT_TYPE_MAP -HB_GOBJECT_TYPE_MEMORY_MODE -HB_GOBJECT_TYPE_OT_COLOR_PALETTE_FLAGS -HB_GOBJECT_TYPE_OT_LAYOUT_GLYPH_CLASS -HB_GOBJECT_TYPE_OT_MATH_CONSTANT -HB_GOBJECT_TYPE_OT_MATH_GLYPH_PART -HB_GOBJECT_TYPE_OT_MATH_GLYPH_PART_FLAGS -HB_GOBJECT_TYPE_OT_MATH_GLYPH_VARIANT -HB_GOBJECT_TYPE_OT_MATH_KERN -HB_GOBJECT_TYPE_SCRIPT -HB_GOBJECT_TYPE_SHAPE_PLAN -HB_GOBJECT_TYPE_UNICODE_COMBINING_CLASS -HB_GOBJECT_TYPE_UNICODE_FUNCS -HB_GOBJECT_TYPE_UNICODE_GENERAL_CATEGORY -HB_GOBJECT_TYPE_BUFFER_CLUSTER_LEVEL -HB_GOBJECT_TYPE_FEATURE -HB_GOBJECT_TYPE_GLYPH_INFO -HB_GOBJECT_TYPE_GLYPH_POSITION -HB_GOBJECT_TYPE_SEGMENT_PROPERTIES -HB_GOBJECT_TYPE_SET -HB_GOBJECT_TYPE_USER_DATA_KEY -hb_gobject_blob_get_type -hb_gobject_buffer_content_type_get_type -hb_gobject_buffer_diff_flags_get_type -hb_gobject_buffer_flags_get_type -hb_gobject_buffer_get_type -hb_gobject_buffer_serialize_flags_get_type -hb_gobject_buffer_serialize_format_get_type -hb_gobject_direction_get_type -hb_gobject_face_get_type -hb_gobject_font_funcs_get_type -hb_gobject_font_get_type -hb_gobject_glyph_flags_get_type -hb_gobject_map_get_type -hb_gobject_memory_mode_get_type -hb_gobject_ot_color_palette_flags_get_type -hb_gobject_ot_layout_glyph_class_get_type -hb_gobject_ot_math_constant_get_type -hb_gobject_ot_math_glyph_part_get_type -hb_gobject_ot_math_glyph_part_flags_get_type -hb_gobject_ot_math_glyph_variant_get_type -hb_gobject_ot_math_kern_get_type -hb_gobject_script_get_type -hb_gobject_shape_plan_get_type -hb_gobject_unicode_combining_class_get_type -hb_gobject_unicode_funcs_get_type -hb_gobject_unicode_general_category_get_type -hb_gobject_buffer_cluster_level_get_type -hb_gobject_feature_get_type -hb_gobject_glyph_info_get_type -hb_gobject_glyph_position_get_type -hb_gobject_segment_properties_get_type -hb_gobject_set_get_type -hb_gobject_user_data_key_get_type - -HB_GOBJECT_H_IN -
-
hb-graphite2 HB_GRAPHITE2_TAG_SILF diff --git a/docs/meson.build b/docs/meson.build index 9f2c84b64..73d9521fd 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -40,15 +40,12 @@ html_images = [ 'HarfBuzz.svg', ] -ignore_headers = [] -if not have_gobject - ignore_headers += [ - 'hb-gobject.h', - 'hb-gobject-enums.h', - 'hb-gobject-enums-tmp.h', - 'hb-gobject-structs.h', - ] -endif +ignore_headers = [ + 'hb-gobject.h', + 'hb-gobject-enums.h', + 'hb-gobject-enums-tmp.h', + 'hb-gobject-structs.h', +] gnome.gtkdoc('harfbuzz', main_sgml: 'harfbuzz-docs.xml', @@ -65,5 +62,5 @@ gnome.gtkdoc('harfbuzz', content_files: content_files, html_assets: html_images, ignore_headers: ignore_headers, - dependencies: [libharfbuzz_dep, libharfbuzz_gobject_dep], + dependencies: [libharfbuzz_dep], install: true) diff --git a/src/hb-gobject-structs.h b/src/hb-gobject-structs.h index 6fad8d701..9a6c6d855 100644 --- a/src/hb-gobject-structs.h +++ b/src/hb-gobject-structs.h @@ -40,47 +40,22 @@ HB_BEGIN_DECLS /* Object types */ -/** - * hb_gobject_blob_get_type: - * - * Since: 0.9.2 - **/ HB_EXTERN GType hb_gobject_blob_get_type (void); #define HB_GOBJECT_TYPE_BLOB (hb_gobject_blob_get_type ()) -/** - * hb_gobject_buffer_get_type: - * - * Since: 0.9.2 - **/ HB_EXTERN GType hb_gobject_buffer_get_type (void); #define HB_GOBJECT_TYPE_BUFFER (hb_gobject_buffer_get_type ()) -/** - * hb_gobject_face_get_type: - * - * Since: 0.9.2 - **/ HB_EXTERN GType hb_gobject_face_get_type (void); #define HB_GOBJECT_TYPE_FACE (hb_gobject_face_get_type ()) -/** - * hb_gobject_font_get_type: - * - * Since: 0.9.2 - **/ HB_EXTERN GType hb_gobject_font_get_type (void); #define HB_GOBJECT_TYPE_FONT (hb_gobject_font_get_type ()) -/** - * hb_gobject_font_funcs_get_type: - * - * Since: 0.9.2 - **/ HB_EXTERN GType hb_gobject_font_funcs_get_type (void); #define HB_GOBJECT_TYPE_FONT_FUNCS (hb_gobject_font_funcs_get_type ()) @@ -97,11 +72,6 @@ HB_EXTERN GType hb_gobject_shape_plan_get_type (void); #define HB_GOBJECT_TYPE_SHAPE_PLAN (hb_gobject_shape_plan_get_type ()) -/** - * hb_gobject_unicode_funcs_get_type: - * - * Since: 0.9.2 - **/ HB_EXTERN GType hb_gobject_unicode_funcs_get_type (void); #define HB_GOBJECT_TYPE_UNICODE_FUNCS (hb_gobject_unicode_funcs_get_type ())