diff --git a/docs/reference/gio/concat-files-helper.py b/docs/reference/gio/concat-files-helper.py new file mode 100644 index 000000000..94d64c345 --- /dev/null +++ b/docs/reference/gio/concat-files-helper.py @@ -0,0 +1,31 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- + +# Copyright (C) 2018 Collabora Inc. +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General +# Public License along with this library; if not, see . +# +# Author: Xavier Claessens + +import sys + +if len(sys.argv) < 3: + print('Usage: {} ...'.format(os.path.basename(sys.argv[0]))) + sys.exit(1) + +with open(sys.argv[1], 'w') as outfile: + for fname in sys.argv[2:]: + with open(fname) as infile: + for line in infile: + outfile.write(line) diff --git a/docs/reference/gio/gio-docs-unix.xml b/docs/reference/gio/gio-docs-unix.xml new file mode 100644 index 000000000..b78eddaa8 --- /dev/null +++ b/docs/reference/gio/gio-docs-unix.xml @@ -0,0 +1,3 @@ + + + diff --git a/docs/reference/gio/gio-docs-win32.xml b/docs/reference/gio/gio-docs-win32.xml new file mode 100644 index 000000000..f34a6e65e --- /dev/null +++ b/docs/reference/gio/gio-docs-win32.xml @@ -0,0 +1,6 @@ + + Win32 support + + + + diff --git a/docs/reference/gio/gio-docs.xml b/docs/reference/gio/gio-docs.xml index 98889ef60..0ce0e2d42 100644 --- a/docs/reference/gio/gio-docs.xml +++ b/docs/reference/gio/gio-docs.xml @@ -72,8 +72,6 @@ - - @@ -124,6 +122,7 @@ + @@ -219,10 +218,7 @@ - - Win32 registry support - - + Application support @@ -264,6 +260,7 @@ GIO Testing + diff --git a/docs/reference/gio/gio-sections.txt b/docs/reference/gio/gio-sections-common.txt similarity index 97% rename from docs/reference/gio/gio-sections.txt rename to docs/reference/gio/gio-sections-common.txt index 6aa07b462..95433ce43 100644 --- a/docs/reference/gio/gio-sections.txt +++ b/docs/reference/gio/gio-sections-common.txt @@ -719,27 +719,6 @@ g_unix_input_stream_get_type GUnixInputStreamPrivate -
-gwin32inputstream -GWin32InputStream -GWin32InputStream -g_win32_input_stream_new -g_win32_input_stream_set_close_handle -g_win32_input_stream_get_close_handle -g_win32_input_stream_get_handle - -GWin32InputStreamClass -G_WIN32_INPUT_STREAM -G_IS_WIN32_INPUT_STREAM -G_TYPE_WIN32_INPUT_STREAM -G_WIN32_INPUT_STREAM_CLASS -G_IS_WIN32_INPUT_STREAM_CLASS -G_WIN32_INPUT_STREAM_GET_CLASS - -g_win32_input_stream_get_type -GWin32InputStreamPrivate -
-
gmemoryinputstream GMemoryInputStream @@ -1024,27 +1003,6 @@ g_unix_output_stream_get_type GUnixOutputStreamPrivate
-
-gwin32outputstream -GWin32OutputStream -GWin32OutputStream -g_win32_output_stream_new -g_win32_output_stream_set_close_handle -g_win32_output_stream_get_close_handle -g_win32_output_stream_get_handle - -GWin32OutputStreamClass -G_WIN32_OUTPUT_STREAM -G_IS_WIN32_OUTPUT_STREAM -G_TYPE_WIN32_OUTPUT_STREAM -G_WIN32_OUTPUT_STREAM_CLASS -G_IS_WIN32_OUTPUT_STREAM_CLASS -G_WIN32_OUTPUT_STREAM_GET_CLASS - -g_win32_output_stream_get_type -GWin32OutputStreamPrivate -
-
giostream GIOStream @@ -1959,6 +1917,7 @@ G_RESOLVER_GET_CLASS G_TYPE_RESOLVER G_TYPE_RESOLVER_ERROR G_TYPE_RESOLVER_RECORD_TYPE +G_TYPE_RESOLVER_NAME_LOOKUP_FLAGS GResolverPrivate @@ -1966,6 +1925,7 @@ g_resolver_get_type g_resolver_error_quark g_resolver_record_type_get_type g_resolver_error_get_type +g_resolver_name_lookup_flags_get_type
@@ -3679,6 +3639,10 @@ g_pollable_source_new_full g_pollable_stream_read g_pollable_stream_write g_pollable_stream_write_all + +G_TYPE_POLLABLE_RETURN + +g_pollable_return_get_type
@@ -4693,74 +4657,3 @@ G_TYPE_LIST_STORE g_list_store_get_type
- -
-gwin32registrykey - - -GWin32RegistrySubkeyIter -g_win32_registry_subkey_iter_copy -g_win32_registry_subkey_iter_free -g_win32_registry_subkey_iter_assign - - -GWin32RegistryValueIter -g_win32_registry_value_iter_copy -g_win32_registry_value_iter_free -g_win32_registry_value_iter_assign - - -GWin32RegistryKey -g_win32_registry_key_new -g_win32_registry_key_new_w -g_win32_registry_key_get_child -g_win32_registry_key_get_child_w - - -g_win32_registry_subkey_iter_init -g_win32_registry_subkey_iter_clear -g_win32_registry_subkey_iter_n_subkeys -g_win32_registry_subkey_iter_next -g_win32_registry_subkey_iter_get_name -g_win32_registry_subkey_iter_get_name_w - - -g_win32_registry_value_iter_init -g_win32_registry_value_iter_clear -g_win32_registry_value_iter_n_values -g_win32_registry_value_iter_next -GWin32RegistryValueType -g_win32_registry_value_iter_get_value_type -g_win32_registry_value_iter_get_name -g_win32_registry_value_iter_get_name_w -g_win32_registry_value_iter_get_data -g_win32_registry_value_iter_get_data_w - - -g_win32_registry_key_get_value -g_win32_registry_key_get_value_w -g_win32_registry_key_get_path -g_win32_registry_key_get_path_w -GWin32RegistryKeyWatchCallbackFunc -GWin32RegistryKeyWatcherFlags -g_win32_registry_key_watch -g_win32_registry_key_has_changed -g_win32_registry_key_erase_change_indicator - - -GWin32RegistryKeyClass - - -GWin32RegistryKeyPrivate -g_win32_registry_key_get_type -g_win32_registry_subkey_iter_get_type -g_win32_registry_value_iter_get_type -G_TYPE_WIN32_REGISTRY_KEY -G_WIN32_REGISTRY_KEY -G_WIN32_REGISTRY_KEY_CLASS -G_IS_WIN32_REGISTRY_KEY -G_IS_WIN32_REGISTRY_KEY_CLASS -G_WIN32_REGISTRY_KEY_GET_CLASS -G_TYPE_WIN32_REGISTRY_SUBKEY_ITER -G_TYPE_WIN32_REGISTRY_VALUE_ITER -
diff --git a/docs/reference/gio/gio-sections-win32.txt b/docs/reference/gio/gio-sections-win32.txt new file mode 100644 index 000000000..52d137e93 --- /dev/null +++ b/docs/reference/gio/gio-sections-win32.txt @@ -0,0 +1,112 @@ +
+gwin32inputstream +GWin32InputStream +GWin32InputStream +g_win32_input_stream_new +g_win32_input_stream_set_close_handle +g_win32_input_stream_get_close_handle +g_win32_input_stream_get_handle + +GWin32InputStreamClass +G_WIN32_INPUT_STREAM +G_IS_WIN32_INPUT_STREAM +G_TYPE_WIN32_INPUT_STREAM +G_WIN32_INPUT_STREAM_CLASS +G_IS_WIN32_INPUT_STREAM_CLASS +G_WIN32_INPUT_STREAM_GET_CLASS + +g_win32_input_stream_get_type +GWin32InputStreamPrivate +
+ +
+gwin32outputstream +GWin32OutputStream +GWin32OutputStream +g_win32_output_stream_new +g_win32_output_stream_set_close_handle +g_win32_output_stream_get_close_handle +g_win32_output_stream_get_handle + +GWin32OutputStreamClass +G_WIN32_OUTPUT_STREAM +G_IS_WIN32_OUTPUT_STREAM +G_TYPE_WIN32_OUTPUT_STREAM +G_WIN32_OUTPUT_STREAM_CLASS +G_IS_WIN32_OUTPUT_STREAM_CLASS +G_WIN32_OUTPUT_STREAM_GET_CLASS + +g_win32_output_stream_get_type +GWin32OutputStreamPrivate +
+ +
+gwin32registrykey + + +GWin32RegistrySubkeyIter +g_win32_registry_subkey_iter_copy +g_win32_registry_subkey_iter_free +g_win32_registry_subkey_iter_assign + + +GWin32RegistryValueIter +g_win32_registry_value_iter_copy +g_win32_registry_value_iter_free +g_win32_registry_value_iter_assign + + +GWin32RegistryKey +g_win32_registry_key_new +g_win32_registry_key_new_w +g_win32_registry_key_get_child +g_win32_registry_key_get_child_w + + +g_win32_registry_subkey_iter_init +g_win32_registry_subkey_iter_clear +g_win32_registry_subkey_iter_n_subkeys +g_win32_registry_subkey_iter_next +g_win32_registry_subkey_iter_get_name +g_win32_registry_subkey_iter_get_name_w + + +g_win32_registry_value_iter_init +g_win32_registry_value_iter_clear +g_win32_registry_value_iter_n_values +g_win32_registry_value_iter_next +GWin32RegistryValueType +g_win32_registry_value_iter_get_value_type +g_win32_registry_value_iter_get_name +g_win32_registry_value_iter_get_name_w +g_win32_registry_value_iter_get_data +g_win32_registry_value_iter_get_data_w + + +g_win32_registry_key_get_value +g_win32_registry_key_get_value_w +g_win32_registry_key_get_path +g_win32_registry_key_get_path_w +GWin32RegistryKeyWatchCallbackFunc +GWin32RegistryKeyWatcherFlags +g_win32_registry_key_watch +g_win32_registry_key_has_changed +g_win32_registry_key_erase_change_indicator + + +GWin32RegistryKeyClass + + +GWin32RegistryKeyPrivate +g_win32_registry_key_get_type +g_win32_registry_subkey_iter_get_type +g_win32_registry_value_iter_get_type +G_TYPE_WIN32_REGISTRY_KEY +G_WIN32_REGISTRY_KEY +G_WIN32_REGISTRY_KEY_CLASS +G_IS_WIN32_REGISTRY_KEY +G_IS_WIN32_REGISTRY_KEY_CLASS +G_WIN32_REGISTRY_KEY_GET_CLASS +G_TYPE_WIN32_REGISTRY_SUBKEY_ITER +G_TYPE_WIN32_REGISTRY_VALUE_ITER +
diff --git a/docs/reference/gio/meson.build b/docs/reference/gio/meson.build index 930a3b75c..860ab4d08 100644 --- a/docs/reference/gio/meson.build +++ b/docs/reference/gio/meson.build @@ -81,15 +81,17 @@ if get_option('gtk_doc') 'gunixresolver.h', 'gunixvolume.h', 'gunixvolumemonitor.h', + 'gwin32networkmonitor.h', 'gwin32appinfo.h', 'gwin32mount.h', - 'gwin32registrykey.h', 'gwin32resolver.h', 'gwin32volumemonitor.h', 'thumbnail-verify.h', 'xdp-dbus.h', ] + sections_files = files('gio-sections-common.txt') + if host_system == 'windows' ignore_headers += [ 'gfiledescriptorbased.h', @@ -104,6 +106,8 @@ if get_option('gtk_doc') 'gdesktopappinfo.h', 'gosxappinfo.h', ] + sections_files += files('gio-sections-win32.txt') + platform_file = files('gio-docs-win32.xml') else if glib_have_cocoa ignore_headers += ['gdesktopappinfo.h'] @@ -112,10 +116,11 @@ if get_option('gtk_doc') endif ignore_headers += [ - 'gwin32networkmonitor.h', 'gwin32inputstream.h', 'gwin32outputstream.h', + 'gwin32registrykey.h', ] + platform_file = files('gio-docs-unix.xml') endif ignore_sources = [ @@ -125,8 +130,6 @@ if get_option('gtk_doc') 'xdp-dbus.c', ] - # FIXME: More win32 headers were added to fix building gio-scan - # FIXME: ExampleAnimal docs aren't built docpath = join_paths(glib_datadir, 'gtk-doc', 'html') @@ -138,6 +141,19 @@ if get_option('gtk_doc') configuration: version_conf ) + concat_files_helper = find_program('concat-files-helper.py') + configure_file( + output : 'gio-sections.txt', + input : sections_files, + command : [concat_files_helper, '@OUTPUT@', '@INPUT@'], + ) + + configure_file( + output : 'gio-docs-platform.xml', + input : platform_file, + copy : true, + ) + gnome.gtkdoc('gio', main_xml : 'gio-docs.xml', namespace : 'g', diff --git a/docs/reference/glib/glib-sections.txt b/docs/reference/glib/glib-sections.txt index 142cc7773..f70d86977 100644 --- a/docs/reference/glib/glib-sections.txt +++ b/docs/reference/glib/glib-sections.txt @@ -141,6 +141,25 @@ GLIB_DISABLE_DEPRECATION_WARNINGS G_ENCODE_VERSION +GLIB_AVAILABLE_ENUMERATOR_IN_2_26 +GLIB_AVAILABLE_ENUMERATOR_IN_2_28 +GLIB_AVAILABLE_ENUMERATOR_IN_2_30 +GLIB_AVAILABLE_ENUMERATOR_IN_2_32 +GLIB_AVAILABLE_ENUMERATOR_IN_2_34 +GLIB_AVAILABLE_ENUMERATOR_IN_2_36 +GLIB_AVAILABLE_ENUMERATOR_IN_2_38 +GLIB_AVAILABLE_ENUMERATOR_IN_2_40 +GLIB_AVAILABLE_ENUMERATOR_IN_2_42 +GLIB_AVAILABLE_ENUMERATOR_IN_2_44 +GLIB_AVAILABLE_ENUMERATOR_IN_2_46 +GLIB_AVAILABLE_ENUMERATOR_IN_2_48 +GLIB_AVAILABLE_ENUMERATOR_IN_2_50 +GLIB_AVAILABLE_ENUMERATOR_IN_2_52 +GLIB_AVAILABLE_ENUMERATOR_IN_2_54 +GLIB_AVAILABLE_ENUMERATOR_IN_2_56 +GLIB_AVAILABLE_ENUMERATOR_IN_2_58 +GLIB_AVAILABLE_ENUMERATOR_IN_2_60 +GLIB_AVAILABLE_ENUMERATOR_IN_2_62 GLIB_AVAILABLE_IN_ALL GLIB_AVAILABLE_IN_2_26 GLIB_AVAILABLE_IN_2_28 @@ -161,6 +180,84 @@ GLIB_AVAILABLE_IN_2_56 GLIB_AVAILABLE_IN_2_58 GLIB_AVAILABLE_IN_2_60 GLIB_AVAILABLE_IN_2_62 +GLIB_AVAILABLE_MACRO_IN_2_26 +GLIB_AVAILABLE_MACRO_IN_2_28 +GLIB_AVAILABLE_MACRO_IN_2_30 +GLIB_AVAILABLE_MACRO_IN_2_32 +GLIB_AVAILABLE_MACRO_IN_2_34 +GLIB_AVAILABLE_MACRO_IN_2_36 +GLIB_AVAILABLE_MACRO_IN_2_38 +GLIB_AVAILABLE_MACRO_IN_2_40 +GLIB_AVAILABLE_MACRO_IN_2_42 +GLIB_AVAILABLE_MACRO_IN_2_44 +GLIB_AVAILABLE_MACRO_IN_2_46 +GLIB_AVAILABLE_MACRO_IN_2_48 +GLIB_AVAILABLE_MACRO_IN_2_50 +GLIB_AVAILABLE_MACRO_IN_2_52 +GLIB_AVAILABLE_MACRO_IN_2_54 +GLIB_AVAILABLE_MACRO_IN_2_56 +GLIB_AVAILABLE_MACRO_IN_2_58 +GLIB_AVAILABLE_MACRO_IN_2_60 +GLIB_AVAILABLE_MACRO_IN_2_62 +GLIB_AVAILABLE_TYPE_IN_2_26 +GLIB_AVAILABLE_TYPE_IN_2_28 +GLIB_AVAILABLE_TYPE_IN_2_30 +GLIB_AVAILABLE_TYPE_IN_2_32 +GLIB_AVAILABLE_TYPE_IN_2_34 +GLIB_AVAILABLE_TYPE_IN_2_36 +GLIB_AVAILABLE_TYPE_IN_2_38 +GLIB_AVAILABLE_TYPE_IN_2_40 +GLIB_AVAILABLE_TYPE_IN_2_42 +GLIB_AVAILABLE_TYPE_IN_2_44 +GLIB_AVAILABLE_TYPE_IN_2_46 +GLIB_AVAILABLE_TYPE_IN_2_48 +GLIB_AVAILABLE_TYPE_IN_2_50 +GLIB_AVAILABLE_TYPE_IN_2_52 +GLIB_AVAILABLE_TYPE_IN_2_54 +GLIB_AVAILABLE_TYPE_IN_2_56 +GLIB_AVAILABLE_TYPE_IN_2_58 +GLIB_AVAILABLE_TYPE_IN_2_60 +GLIB_AVAILABLE_TYPE_IN_2_62 +GLIB_DEPRECATED_ENUMERATOR +GLIB_DEPRECATED_ENUMERATOR_FOR +GLIB_DEPRECATED_ENUMERATOR_IN_2_26 +GLIB_DEPRECATED_ENUMERATOR_IN_2_26_FOR +GLIB_DEPRECATED_ENUMERATOR_IN_2_28 +GLIB_DEPRECATED_ENUMERATOR_IN_2_28_FOR +GLIB_DEPRECATED_ENUMERATOR_IN_2_30 +GLIB_DEPRECATED_ENUMERATOR_IN_2_30_FOR +GLIB_DEPRECATED_ENUMERATOR_IN_2_32 +GLIB_DEPRECATED_ENUMERATOR_IN_2_32_FOR +GLIB_DEPRECATED_ENUMERATOR_IN_2_34 +GLIB_DEPRECATED_ENUMERATOR_IN_2_34_FOR +GLIB_DEPRECATED_ENUMERATOR_IN_2_36 +GLIB_DEPRECATED_ENUMERATOR_IN_2_36_FOR +GLIB_DEPRECATED_ENUMERATOR_IN_2_38 +GLIB_DEPRECATED_ENUMERATOR_IN_2_38_FOR +GLIB_DEPRECATED_ENUMERATOR_IN_2_40 +GLIB_DEPRECATED_ENUMERATOR_IN_2_40_FOR +GLIB_DEPRECATED_ENUMERATOR_IN_2_42 +GLIB_DEPRECATED_ENUMERATOR_IN_2_42_FOR +GLIB_DEPRECATED_ENUMERATOR_IN_2_44 +GLIB_DEPRECATED_ENUMERATOR_IN_2_44_FOR +GLIB_DEPRECATED_ENUMERATOR_IN_2_46 +GLIB_DEPRECATED_ENUMERATOR_IN_2_46_FOR +GLIB_DEPRECATED_ENUMERATOR_IN_2_48 +GLIB_DEPRECATED_ENUMERATOR_IN_2_48_FOR +GLIB_DEPRECATED_ENUMERATOR_IN_2_50 +GLIB_DEPRECATED_ENUMERATOR_IN_2_50_FOR +GLIB_DEPRECATED_ENUMERATOR_IN_2_52 +GLIB_DEPRECATED_ENUMERATOR_IN_2_52_FOR +GLIB_DEPRECATED_ENUMERATOR_IN_2_54 +GLIB_DEPRECATED_ENUMERATOR_IN_2_54_FOR +GLIB_DEPRECATED_ENUMERATOR_IN_2_56 +GLIB_DEPRECATED_ENUMERATOR_IN_2_56_FOR +GLIB_DEPRECATED_ENUMERATOR_IN_2_58 +GLIB_DEPRECATED_ENUMERATOR_IN_2_58_FOR +GLIB_DEPRECATED_ENUMERATOR_IN_2_60 +GLIB_DEPRECATED_ENUMERATOR_IN_2_60_FOR +GLIB_DEPRECATED_ENUMERATOR_IN_2_62 +GLIB_DEPRECATED_ENUMERATOR_IN_2_62_FOR GLIB_DEPRECATED_IN_2_26 GLIB_DEPRECATED_IN_2_26_FOR GLIB_DEPRECATED_IN_2_28 @@ -199,6 +296,86 @@ GLIB_DEPRECATED_IN_2_60 GLIB_DEPRECATED_IN_2_60_FOR GLIB_DEPRECATED_IN_2_62 GLIB_DEPRECATED_IN_2_62_FOR +GLIB_DEPRECATED_MACRO +GLIB_DEPRECATED_MACRO_FOR +GLIB_DEPRECATED_MACRO_IN_2_26 +GLIB_DEPRECATED_MACRO_IN_2_26_FOR +GLIB_DEPRECATED_MACRO_IN_2_28 +GLIB_DEPRECATED_MACRO_IN_2_28_FOR +GLIB_DEPRECATED_MACRO_IN_2_30 +GLIB_DEPRECATED_MACRO_IN_2_30_FOR +GLIB_DEPRECATED_MACRO_IN_2_32 +GLIB_DEPRECATED_MACRO_IN_2_32_FOR +GLIB_DEPRECATED_MACRO_IN_2_34 +GLIB_DEPRECATED_MACRO_IN_2_34_FOR +GLIB_DEPRECATED_MACRO_IN_2_36 +GLIB_DEPRECATED_MACRO_IN_2_36_FOR +GLIB_DEPRECATED_MACRO_IN_2_38 +GLIB_DEPRECATED_MACRO_IN_2_38_FOR +GLIB_DEPRECATED_MACRO_IN_2_40 +GLIB_DEPRECATED_MACRO_IN_2_40_FOR +GLIB_DEPRECATED_MACRO_IN_2_42 +GLIB_DEPRECATED_MACRO_IN_2_42_FOR +GLIB_DEPRECATED_MACRO_IN_2_44 +GLIB_DEPRECATED_MACRO_IN_2_44_FOR +GLIB_DEPRECATED_MACRO_IN_2_46 +GLIB_DEPRECATED_MACRO_IN_2_46_FOR +GLIB_DEPRECATED_MACRO_IN_2_48 +GLIB_DEPRECATED_MACRO_IN_2_48_FOR +GLIB_DEPRECATED_MACRO_IN_2_50 +GLIB_DEPRECATED_MACRO_IN_2_50_FOR +GLIB_DEPRECATED_MACRO_IN_2_52 +GLIB_DEPRECATED_MACRO_IN_2_52_FOR +GLIB_DEPRECATED_MACRO_IN_2_54 +GLIB_DEPRECATED_MACRO_IN_2_54_FOR +GLIB_DEPRECATED_MACRO_IN_2_56 +GLIB_DEPRECATED_MACRO_IN_2_56_FOR +GLIB_DEPRECATED_MACRO_IN_2_58 +GLIB_DEPRECATED_MACRO_IN_2_58_FOR +GLIB_DEPRECATED_MACRO_IN_2_60 +GLIB_DEPRECATED_MACRO_IN_2_60_FOR +GLIB_DEPRECATED_MACRO_IN_2_62 +GLIB_DEPRECATED_MACRO_IN_2_62_FOR +GLIB_DEPRECATED_TYPE +GLIB_DEPRECATED_TYPE_FOR +GLIB_DEPRECATED_TYPE_IN_2_26 +GLIB_DEPRECATED_TYPE_IN_2_26_FOR +GLIB_DEPRECATED_TYPE_IN_2_28 +GLIB_DEPRECATED_TYPE_IN_2_28_FOR +GLIB_DEPRECATED_TYPE_IN_2_30 +GLIB_DEPRECATED_TYPE_IN_2_30_FOR +GLIB_DEPRECATED_TYPE_IN_2_32 +GLIB_DEPRECATED_TYPE_IN_2_32_FOR +GLIB_DEPRECATED_TYPE_IN_2_34 +GLIB_DEPRECATED_TYPE_IN_2_34_FOR +GLIB_DEPRECATED_TYPE_IN_2_36 +GLIB_DEPRECATED_TYPE_IN_2_36_FOR +GLIB_DEPRECATED_TYPE_IN_2_38 +GLIB_DEPRECATED_TYPE_IN_2_38_FOR +GLIB_DEPRECATED_TYPE_IN_2_40 +GLIB_DEPRECATED_TYPE_IN_2_40_FOR +GLIB_DEPRECATED_TYPE_IN_2_42 +GLIB_DEPRECATED_TYPE_IN_2_42_FOR +GLIB_DEPRECATED_TYPE_IN_2_44 +GLIB_DEPRECATED_TYPE_IN_2_44_FOR +GLIB_DEPRECATED_TYPE_IN_2_46 +GLIB_DEPRECATED_TYPE_IN_2_46_FOR +GLIB_DEPRECATED_TYPE_IN_2_48 +GLIB_DEPRECATED_TYPE_IN_2_48_FOR +GLIB_DEPRECATED_TYPE_IN_2_50 +GLIB_DEPRECATED_TYPE_IN_2_50_FOR +GLIB_DEPRECATED_TYPE_IN_2_52 +GLIB_DEPRECATED_TYPE_IN_2_52_FOR +GLIB_DEPRECATED_TYPE_IN_2_54 +GLIB_DEPRECATED_TYPE_IN_2_54_FOR +GLIB_DEPRECATED_TYPE_IN_2_56 +GLIB_DEPRECATED_TYPE_IN_2_56_FOR +GLIB_DEPRECATED_TYPE_IN_2_58 +GLIB_DEPRECATED_TYPE_IN_2_58_FOR +GLIB_DEPRECATED_TYPE_IN_2_60 +GLIB_DEPRECATED_TYPE_IN_2_60_FOR +GLIB_DEPRECATED_TYPE_IN_2_62 +GLIB_DEPRECATED_TYPE_IN_2_62_FOR GLIB_VERSION_CUR_STABLE GLIB_VERSION_PREV_STABLE @@ -500,6 +677,9 @@ G_VA_COPY_AS_ARRAY GLIB_DEPRECATED GLIB_DEPRECATED_FOR GLIB_UNAVAILABLE +GLIB_UNAVAILABLE_ENUMERATOR +GLIB_UNAVAILABLE_MACRO +GLIB_UNAVAILABLE_TYPE G_ANALYZER_ANALYZING G_ANALYZER_NORETURN g_autoptr_cleanup_generic_gfree diff --git a/docs/reference/glib/meson.build b/docs/reference/glib/meson.build index 1d4009f8d..bba7649f0 100644 --- a/docs/reference/glib/meson.build +++ b/docs/reference/glib/meson.build @@ -38,6 +38,7 @@ if get_option('gtk_doc') 'valgrind.h', 'gutilsprivate.h', 'gvalgrind.h', + 'dirent.h', ] docpath = join_paths(glib_datadir, 'gtk-doc', 'html') diff --git a/docs/reference/gobject/gobject-docs.xml b/docs/reference/gobject/gobject-docs.xml index f045df5b3..14c8eb4e1 100644 --- a/docs/reference/gobject/gobject-docs.xml +++ b/docs/reference/gobject/gobject-docs.xml @@ -196,6 +196,10 @@ Index of new symbols in 2.56 + + Index of new symbols in 2.62 + + diff --git a/gio/gasyncinitable.h b/gio/gasyncinitable.h index 1c713a13f..f30d2cec7 100644 --- a/gio/gasyncinitable.h +++ b/gio/gasyncinitable.h @@ -97,6 +97,7 @@ void g_async_initable_new_async (GType object_type, ...); G_GNUC_BEGIN_IGNORE_DEPRECATIONS + GLIB_DEPRECATED_IN_2_54_FOR(g_object_new_with_properties and g_async_initable_init_async) void g_async_initable_newv_async (GType object_type, guint n_parameters, @@ -105,6 +106,7 @@ void g_async_initable_newv_async (GType object_type, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); + G_GNUC_END_IGNORE_DEPRECATIONS GLIB_AVAILABLE_IN_ALL diff --git a/gio/gcontenttype.h b/gio/gcontenttype.h index d970acbe1..db2c974f3 100644 --- a/gio/gcontenttype.h +++ b/gio/gcontenttype.h @@ -70,10 +70,12 @@ GLIB_AVAILABLE_IN_ALL GList * g_content_types_get_registered (void); /*< private >*/ +#ifndef __GTK_DOC_IGNORE__ GLIB_AVAILABLE_IN_2_60 const gchar * const *g_content_type_get_mime_dirs (void); GLIB_AVAILABLE_IN_2_60 void g_content_type_set_mime_dirs (const gchar * const *dirs); +#endif /* __GTK_DOC_IGNORE__ */ G_END_DECLS diff --git a/gio/ginitable.h b/gio/ginitable.h index 3124f028f..463bfcc5a 100644 --- a/gio/ginitable.h +++ b/gio/ginitable.h @@ -82,12 +82,14 @@ gpointer g_initable_new (GType object_type, ...); G_GNUC_BEGIN_IGNORE_DEPRECATIONS + GLIB_DEPRECATED_IN_2_54_FOR(g_object_new_with_properties and g_initable_init) gpointer g_initable_newv (GType object_type, guint n_parameters, GParameter *parameters, GCancellable *cancellable, GError **error); + G_GNUC_END_IGNORE_DEPRECATIONS GLIB_AVAILABLE_IN_ALL diff --git a/gio/gnetworkaddress.c b/gio/gnetworkaddress.c index 614c033ab..f12f93585 100644 --- a/gio/gnetworkaddress.c +++ b/gio/gnetworkaddress.c @@ -224,7 +224,7 @@ g_network_address_get_property (GObject *object, } -/** +/* * inet_addresses_to_inet_socket_addresses: * @addresses: (transfer full): #GList of #GInetAddress * diff --git a/glib/garcbox.c b/glib/garcbox.c index 6784f0057..0fa207c3f 100644 --- a/glib/garcbox.c +++ b/glib/garcbox.c @@ -155,7 +155,7 @@ * G_DEFINE_AUTOPTR_CLEANUP_FUNC (MyDataStruct, my_data_struct_release) * ]| * - * Since: 2.58. + * Since: 2.58 */ /** diff --git a/glib/grcbox.c b/glib/grcbox.c index 22a373b15..68bb73da7 100644 --- a/glib/grcbox.c +++ b/glib/grcbox.c @@ -159,7 +159,7 @@ * G_DEFINE_AUTOPTR_CLEANUP_FUNC (MyDataStruct, my_data_struct_release) * ]| * - * Since: 2.58. + * Since: 2.58 */ /* We use the same alignment as GTypeInstance and GNU libc's malloc */ diff --git a/glib/gtestutils.h b/glib/gtestutils.h index 114d0554b..26de21216 100644 --- a/glib/gtestutils.h +++ b/glib/gtestutils.h @@ -367,9 +367,11 @@ typedef enum { } GTestTrapFlags GLIB_DEPRECATED_TYPE_IN_2_38_FOR(GTestSubprocessFlags); G_GNUC_BEGIN_IGNORE_DEPRECATIONS + GLIB_DEPRECATED_IN_2_38_FOR (g_test_trap_subprocess) gboolean g_test_trap_fork (guint64 usec_timeout, GTestTrapFlags test_trap_flags); + G_GNUC_END_IGNORE_DEPRECATIONS typedef enum { diff --git a/glib/gtypes.h b/glib/gtypes.h index 000c4ca31..ca80c81fc 100644 --- a/glib/gtypes.h +++ b/glib/gtypes.h @@ -451,6 +451,9 @@ typedef const gchar * (*GTranslateFunc) (const gchar *str, _GLIB_CHECKED_MUL_U32(dest, a, b) #endif +/* FIXME: Hide this from gtkdoc scanner because it confuses its poor regexes. + * https://gitlab.gnome.org/GNOME/gtk-doc/issues/90 */ +#ifndef __GTK_DOC_IGNORE__ /* The names of the following inlines are private. Use the macro * definitions above. */ @@ -474,6 +477,7 @@ static inline gboolean _GLIB_CHECKED_ADD_U64 (guint64 *dest, guint64 a, guint64 static inline gboolean _GLIB_CHECKED_MUL_U64 (guint64 *dest, guint64 a, guint64 b) { *dest = a * b; return !a || *dest / a == b; } #endif +#endif /* __GTK_DOC_IGNORE__ */ /* IEEE Standard 754 Single Precision Storage Format (gfloat): * diff --git a/glib/gunicode.h b/glib/gunicode.h index c48a8be2e..5663aec7e 100644 --- a/glib/gunicode.h +++ b/glib/gunicode.h @@ -420,6 +420,10 @@ typedef enum * @G_UNICODE_SCRIPT_MEDEFAIDRIN: Medefaidrin. Since: 2.58 * @G_UNICODE_SCRIPT_OLD_SOGDIAN: Old Sogdian. Since: 2.58 * @G_UNICODE_SCRIPT_SOGDIAN: Sogdian. Since: 2.58 + * @G_UNICODE_SCRIPT_ELYMAIC: Elym. Since: 2.62 + * @G_UNICODE_SCRIPT_NANDINAGARI: Nand. Since: 2.62 + * @G_UNICODE_SCRIPT_NYIAKENG_PUACHUE_HMONG: Rohg. Since: 2.62 + * @G_UNICODE_SCRIPT_WANCHO: Wcho. Since: 2.62 * * The #GUnicodeScript enumeration identifies different writing * systems. The values correspond to the names as defined in the diff --git a/gobject/gobject.h b/gobject/gobject.h index 5f5c2a944..12e0882c6 100644 --- a/gobject/gobject.h +++ b/gobject/gobject.h @@ -426,10 +426,12 @@ GObject* g_object_new_with_properties (GType object_type, const GValue values[]); G_GNUC_BEGIN_IGNORE_DEPRECATIONS + GLIB_DEPRECATED_IN_2_54_FOR(g_object_new_with_properties) gpointer g_object_newv (GType object_type, guint n_parameters, GParameter *parameters); + G_GNUC_END_IGNORE_DEPRECATIONS GLIB_AVAILABLE_IN_ALL