From 8ec9bfacdf5cc1ed5ee3869380b7b1b45deb9c66 Mon Sep 17 00:00:00 2001 From: DongHun Kwak Date: Fri, 18 Sep 2020 14:39:45 +0900 Subject: [PATCH] Imported Upstream version 1.60.1 --- NEWS | 10 + aclocal.m4 | 944 +++++++++++------------ configure | 24 +- configure.ac | 2 +- docs/g-ir-scanner.1 | 4 + docs/reference/html/GIBaseInfo.html | 52 +- docs/reference/html/GIRepository.html | 218 +++--- docs/reference/html/annotation-glossary.html | 4 +- docs/reference/html/api-index-1-30.html | 4 +- docs/reference/html/api-index-1-32.html | 4 +- docs/reference/html/api-index-1-34.html | 4 +- docs/reference/html/api-index-1-36.html | 4 +- docs/reference/html/api-index-1-42.html | 4 +- docs/reference/html/api-index-1-44.html | 4 +- docs/reference/html/api-index-1-46.html | 4 +- docs/reference/html/api-index-1-60.html | 4 +- docs/reference/html/api-index-deprecated.html | 4 +- docs/reference/html/api-index-full.html | 4 +- docs/reference/html/ch01.html | 4 +- docs/reference/html/ch02.html | 4 +- docs/reference/html/ch03.html | 4 +- docs/reference/html/gi-Common-Types.html | 64 +- docs/reference/html/gi-GIArgInfo.html | 58 +- docs/reference/html/gi-GICallableInfo.html | 68 +- docs/reference/html/gi-GICallbackInfo.html | 4 +- docs/reference/html/gi-GIConstantInfo.html | 8 +- docs/reference/html/gi-GIEnumInfo.html | 28 +- docs/reference/html/gi-GIFieldInfo.html | 28 +- docs/reference/html/gi-GIFunctionInfo.html | 40 +- docs/reference/html/gi-GIInterfaceInfo.html | 60 +- docs/reference/html/gi-GIObjectInfo.html | 118 +-- docs/reference/html/gi-GIPropertyInfo.html | 10 +- docs/reference/html/gi-GIRegisteredTypeInfo.html | 24 +- docs/reference/html/gi-GISignalInfo.html | 20 +- docs/reference/html/gi-GIStructInfo.html | 42 +- docs/reference/html/gi-GITypeInfo.html | 32 +- docs/reference/html/gi-GITypelib-Internals.html | 594 +++++++------- docs/reference/html/gi-GITypelib.html | 46 +- docs/reference/html/gi-GIUnionInfo.html | 38 +- docs/reference/html/gi-GIVFuncInfo.html | 48 +- docs/reference/html/gi-GIValueInfo.html | 4 +- docs/reference/html/gi-Version-Information.html | 20 +- docs/reference/html/gi-girffi.html | 32 +- docs/reference/html/gi-struct-hierarchy.html | 4 +- docs/reference/html/home.png | Bin 256 -> 256 bytes docs/reference/html/index.html | 6 +- docs/reference/html/left-insensitive.png | Bin 395 -> 395 bytes docs/reference/html/left.png | Bin 262 -> 262 bytes docs/reference/html/right-insensitive.png | Bin 373 -> 373 bytes docs/reference/html/right.png | Bin 261 -> 261 bytes docs/reference/html/up-insensitive.png | Bin 374 -> 374 bytes docs/reference/html/up.png | Bin 260 -> 260 bytes docs/reference/version.xml | 2 +- gir/gio-2.0.c | 10 +- gir/meson.build | 1 + girepository/giversion.h | 2 +- giscanner/_version.py | 2 +- giscanner/shlibs.py | 25 +- gobject-introspection-1.0.pc | 2 +- gobject-introspection-no-export-1.0.pc | 2 +- meson.build | 2 +- tests/meson.build | 3 + tests/offsets/meson.build | 1 + tests/scanner/meson.build | 11 + tests/scanner/test_ccompiler.py | 4 +- tests/scanner/test_shlibs.py | 31 +- 66 files changed, 1433 insertions(+), 1371 deletions(-) diff --git a/NEWS b/NEWS index df4b1fb..315e5d3 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,13 @@ +1.60.1 - 2019-04-07 +------------------- + +* Update glib annotations (glib-2-60) +* shlibs: fall back to basename on macOS for relative paths :issue:`222` +* meson: always pass --quiet to g-ir-scanner +* docs: include '--c-include' in g-ir-scanner man page :issue:`275` +* tests: Fix compatibility with Python 3.5 :issue:`274` (:user:`Tomasz Miąsko `) + + 1.60.0 - 2019-03-10 ------------------- diff --git a/aclocal.m4 b/aclocal.m4 index f7ed483..db7a76c 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -20,282 +20,6 @@ You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically 'autoreconf'.])]) -dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -dnl serial 11 (pkg-config-0.29) -dnl -dnl Copyright © 2004 Scott James Remnant . -dnl Copyright © 2012-2015 Dan Nicholson -dnl -dnl This program is free software; you can redistribute it and/or modify -dnl it under the terms of the GNU General Public License as published by -dnl the Free Software Foundation; either version 2 of the License, or -dnl (at your option) any later version. -dnl -dnl This program is distributed in the hope that it will be useful, but -dnl WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl General Public License for more details. -dnl -dnl You should have received a copy of the GNU General Public License -dnl along with this program; if not, write to the Free Software -dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -dnl 02111-1307, USA. -dnl -dnl As a special exception to the GNU General Public License, if you -dnl distribute this file as part of a program that contains a -dnl configuration script generated by Autoconf, you may include it under -dnl the same distribution terms that you use for the rest of that -dnl program. - -dnl PKG_PREREQ(MIN-VERSION) -dnl ----------------------- -dnl Since: 0.29 -dnl -dnl Verify that the version of the pkg-config macros are at least -dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's -dnl installed version of pkg-config, this checks the developer's version -dnl of pkg.m4 when generating configure. -dnl -dnl To ensure that this macro is defined, also add: -dnl m4_ifndef([PKG_PREREQ], -dnl [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])]) -dnl -dnl See the "Since" comment for each macro you use to see what version -dnl of the macros you require. -m4_defun([PKG_PREREQ], -[m4_define([PKG_MACROS_VERSION], [0.29]) -m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1, - [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])]) -])dnl PKG_PREREQ - -dnl PKG_PROG_PKG_CONFIG([MIN-VERSION]) -dnl ---------------------------------- -dnl Since: 0.16 -dnl -dnl Search for the pkg-config tool and set the PKG_CONFIG variable to -dnl first found in the path. Checks that the version of pkg-config found -dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is -dnl used since that's the first version where most current features of -dnl pkg-config existed. -AC_DEFUN([PKG_PROG_PKG_CONFIG], -[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) -m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) -m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) -AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) -AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) -AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) - -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then - AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) -fi -if test -n "$PKG_CONFIG"; then - _pkg_min_version=m4_default([$1], [0.9.0]) - AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - PKG_CONFIG="" - fi -fi[]dnl -])dnl PKG_PROG_PKG_CONFIG - -dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -dnl ------------------------------------------------------------------- -dnl Since: 0.18 -dnl -dnl Check to see whether a particular set of modules exists. Similar to -dnl PKG_CHECK_MODULES(), but does not set variables or print errors. -dnl -dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -dnl only at the first occurence in configure.ac, so if the first place -dnl it's called might be skipped (such as if it is within an "if", you -dnl have to call PKG_CHECK_EXISTS manually -AC_DEFUN([PKG_CHECK_EXISTS], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -if test -n "$PKG_CONFIG" && \ - AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then - m4_default([$2], [:]) -m4_ifvaln([$3], [else - $3])dnl -fi]) - -dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) -dnl --------------------------------------------- -dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting -dnl pkg_failed based on the result. -m4_define([_PKG_CONFIG], -[if test -n "$$1"; then - pkg_cv_[]$1="$$1" - elif test -n "$PKG_CONFIG"; then - PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes ], - [pkg_failed=yes]) - else - pkg_failed=untried -fi[]dnl -])dnl _PKG_CONFIG - -dnl _PKG_SHORT_ERRORS_SUPPORTED -dnl --------------------------- -dnl Internal check to see if pkg-config supports short errors. -AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi[]dnl -])dnl _PKG_SHORT_ERRORS_SUPPORTED - - -dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], -dnl [ACTION-IF-NOT-FOUND]) -dnl -------------------------------------------------------------- -dnl Since: 0.4.0 -dnl -dnl Note that if there is a possibility the first call to -dnl PKG_CHECK_MODULES might not happen, you should be sure to include an -dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac -AC_DEFUN([PKG_CHECK_MODULES], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl -AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl - -pkg_failed=no -AC_MSG_CHECKING([for $1]) - -_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) -_PKG_CONFIG([$1][_LIBS], [libs], [$2]) - -m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS -and $1[]_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details.]) - -if test $pkg_failed = yes; then - AC_MSG_RESULT([no]) - _PKG_SHORT_ERRORS_SUPPORTED - if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` - else - $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD - - m4_default([$4], [AC_MSG_ERROR( -[Package requirements ($2) were not met: - -$$1_PKG_ERRORS - -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. - -_PKG_TEXT])[]dnl - ]) -elif test $pkg_failed = untried; then - AC_MSG_RESULT([no]) - m4_default([$4], [AC_MSG_FAILURE( -[The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -_PKG_TEXT - -To get pkg-config, see .])[]dnl - ]) -else - $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS - $1[]_LIBS=$pkg_cv_[]$1[]_LIBS - AC_MSG_RESULT([yes]) - $3 -fi[]dnl -])dnl PKG_CHECK_MODULES - - -dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], -dnl [ACTION-IF-NOT-FOUND]) -dnl --------------------------------------------------------------------- -dnl Since: 0.29 -dnl -dnl Checks for existence of MODULES and gathers its build flags with -dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags -dnl and VARIABLE-PREFIX_LIBS from --libs. -dnl -dnl Note that if there is a possibility the first call to -dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to -dnl include an explicit call to PKG_PROG_PKG_CONFIG in your -dnl configure.ac. -AC_DEFUN([PKG_CHECK_MODULES_STATIC], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -_save_PKG_CONFIG=$PKG_CONFIG -PKG_CONFIG="$PKG_CONFIG --static" -PKG_CHECK_MODULES($@) -PKG_CONFIG=$_save_PKG_CONFIG[]dnl -])dnl PKG_CHECK_MODULES_STATIC - - -dnl PKG_INSTALLDIR([DIRECTORY]) -dnl ------------------------- -dnl Since: 0.27 -dnl -dnl Substitutes the variable pkgconfigdir as the location where a module -dnl should install pkg-config .pc files. By default the directory is -dnl $libdir/pkgconfig, but the default can be changed by passing -dnl DIRECTORY. The user can override through the --with-pkgconfigdir -dnl parameter. -AC_DEFUN([PKG_INSTALLDIR], -[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) -m4_pushdef([pkg_description], - [pkg-config installation directory @<:@]pkg_default[@:>@]) -AC_ARG_WITH([pkgconfigdir], - [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],, - [with_pkgconfigdir=]pkg_default) -AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) -m4_popdef([pkg_default]) -m4_popdef([pkg_description]) -])dnl PKG_INSTALLDIR - - -dnl PKG_NOARCH_INSTALLDIR([DIRECTORY]) -dnl -------------------------------- -dnl Since: 0.27 -dnl -dnl Substitutes the variable noarch_pkgconfigdir as the location where a -dnl module should install arch-independent pkg-config .pc files. By -dnl default the directory is $datadir/pkgconfig, but the default can be -dnl changed by passing DIRECTORY. The user can override through the -dnl --with-noarch-pkgconfigdir parameter. -AC_DEFUN([PKG_NOARCH_INSTALLDIR], -[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) -m4_pushdef([pkg_description], - [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@]) -AC_ARG_WITH([noarch-pkgconfigdir], - [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],, - [with_noarch_pkgconfigdir=]pkg_default) -AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) -m4_popdef([pkg_default]) -m4_popdef([pkg_description]) -])dnl PKG_NOARCH_INSTALLDIR - - -dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, -dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -dnl ------------------------------------------- -dnl Since: 0.28 -dnl -dnl Retrieves the value of the pkg-config variable for the given module. -AC_DEFUN([PKG_CHECK_VAR], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl - -_PKG_CONFIG([$1], [variable="][$3]["], [$2]) -AS_VAR_COPY([$1], [pkg_cv_][$1]) - -AS_VAR_IF([$1], [""], [$5], [$4])dnl -])dnl PKG_CHECK_VAR - # ============================================================================ # https://www.gnu.org/software/autoconf-archive/ax_append_compile_flags.html # ============================================================================ @@ -945,243 +669,519 @@ AC_DEFUN([AX_COMPILER_FLAGS_CFLAGS],[ # # suggest-attribute=format is disabled because it gives too many false # positives - AX_APPEND_FLAG([-Werror],ax_warn_cflags_variable) - - AX_APPEND_COMPILE_FLAGS([ dnl - [$ax_compiler_no_suggest_attribute_flags] dnl - ],ax_warn_cflags_variable,[$ax_compiler_flags_test]) + AX_APPEND_FLAG([-Werror],ax_warn_cflags_variable) + + AX_APPEND_COMPILE_FLAGS([ dnl + [$ax_compiler_no_suggest_attribute_flags] dnl + ],ax_warn_cflags_variable,[$ax_compiler_flags_test]) + ]) + + # In the flags below, when disabling specific flags, always add *both* + # -Wno-foo and -Wno-error=foo. This fixes the situation where (for example) + # we enable -Werror, disable a flag, and a build bot passes CFLAGS=-Wall, + # which effectively turns that flag back on again as an error. + for flag in $ax_warn_cflags_variable; do + AS_CASE([$flag], + [-Wno-*=*],[], + [-Wno-*],[ + AX_APPEND_COMPILE_FLAGS([-Wno-error=$(AS_ECHO([$flag]) | $SED 's/^-Wno-//')], + ax_warn_cflags_variable, + [$ax_compiler_flags_test]) + ]) + done + + AC_LANG_POP([C]) + + # Substitute the variables + AC_SUBST(ax_warn_cflags_variable) +])dnl AX_COMPILER_FLAGS + +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_compiler_flags_gir.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_COMPILER_FLAGS_GIR([VARIABLE], [IS-RELEASE], [EXTRA-BASE-FLAGS], [EXTRA-YES-FLAGS]) +# +# DESCRIPTION +# +# Add warning flags for the g-ir-scanner (from GObject Introspection) to +# VARIABLE, which defaults to WARN_SCANNERFLAGS. VARIABLE is AC_SUBST-ed +# by this macro, but must be manually added to the SCANNERFLAGS variable +# for each GIR target in the code base. +# +# This macro depends on the environment set up by AX_COMPILER_FLAGS. +# Specifically, it uses the value of $ax_enable_compile_warnings to decide +# which flags to enable. +# +# LICENSE +# +# Copyright (c) 2015 Philip Withnall +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 6 + +AC_DEFUN([AX_COMPILER_FLAGS_GIR],[ + AX_REQUIRE_DEFINED([AX_APPEND_FLAG]) + + # Variable names + m4_define([ax_warn_scannerflags_variable], + [m4_normalize(ifelse([$1],,[WARN_SCANNERFLAGS],[$1]))]) + + # Base flags + AX_APPEND_FLAG([$3],ax_warn_scannerflags_variable) + + AS_IF([test "$ax_enable_compile_warnings" != "no"],[ + # "yes" flags + AX_APPEND_FLAG([ dnl + --warn-all dnl + $4 dnl + $5 dnl + $6 dnl + $7 dnl + ],ax_warn_scannerflags_variable) + ]) + AS_IF([test "$ax_enable_compile_warnings" = "error"],[ + # "error" flags + AX_APPEND_FLAG([ dnl + --warn-error dnl + ],ax_warn_scannerflags_variable) + ]) + + # Substitute the variables + AC_SUBST(ax_warn_scannerflags_variable) +])dnl AX_COMPILER_FLAGS + +# ============================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_compiler_flags_ldflags.html +# ============================================================================== +# +# SYNOPSIS +# +# AX_COMPILER_FLAGS_LDFLAGS([VARIABLE], [IS-RELEASE], [EXTRA-BASE-FLAGS], [EXTRA-YES-FLAGS]) +# +# DESCRIPTION +# +# Add warning flags for the linker to VARIABLE, which defaults to +# WARN_LDFLAGS. VARIABLE is AC_SUBST-ed by this macro, but must be +# manually added to the LDFLAGS variable for each target in the code base. +# +# This macro depends on the environment set up by AX_COMPILER_FLAGS. +# Specifically, it uses the value of $ax_enable_compile_warnings to decide +# which flags to enable. +# +# LICENSE +# +# Copyright (c) 2014, 2015 Philip Withnall +# Copyright (c) 2017, 2018 Reini Urban +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 9 + +AC_DEFUN([AX_COMPILER_FLAGS_LDFLAGS],[ + AX_REQUIRE_DEFINED([AX_APPEND_LINK_FLAGS]) + AX_REQUIRE_DEFINED([AX_APPEND_FLAG]) + AX_REQUIRE_DEFINED([AX_CHECK_COMPILE_FLAG]) + AX_REQUIRE_DEFINED([AX_CHECK_LINK_FLAG]) + + # Variable names + m4_define([ax_warn_ldflags_variable], + [m4_normalize(ifelse([$1],,[WARN_LDFLAGS],[$1]))]) + + # Always pass -Werror=unknown-warning-option to get Clang to fail on bad + # flags, otherwise they are always appended to the warn_ldflags variable, + # and Clang warns on them for every compilation unit. + # If this is passed to GCC, it will explode, so the flag must be enabled + # conditionally. + AX_CHECK_COMPILE_FLAG([-Werror=unknown-warning-option],[ + ax_compiler_flags_test="-Werror=unknown-warning-option" + ],[ + ax_compiler_flags_test="" + ]) + + AX_CHECK_LINK_FLAG([-Wl,--as-needed], [ + AX_APPEND_LINK_FLAGS([-Wl,--as-needed], + [AM_LDFLAGS],[$ax_compiler_flags_test]) + ]) + AX_CHECK_LINK_FLAG([-Wl,-z,relro], [ + AX_APPEND_LINK_FLAGS([-Wl,-z,relro], + [AM_LDFLAGS],[$ax_compiler_flags_test]) + ]) + AX_CHECK_LINK_FLAG([-Wl,-z,now], [ + AX_APPEND_LINK_FLAGS([-Wl,-z,now], + [AM_LDFLAGS],[$ax_compiler_flags_test]) + ]) + AX_CHECK_LINK_FLAG([-Wl,-z,noexecstack], [ + AX_APPEND_LINK_FLAGS([-Wl,-z,noexecstack], + [AM_LDFLAGS],[$ax_compiler_flags_test]) + ]) + # textonly, retpolineplt not yet + + # macOS and cygwin linker do not have --as-needed + AX_CHECK_LINK_FLAG([-Wl,--no-as-needed], [ + ax_compiler_flags_as_needed_option="-Wl,--no-as-needed" + ], [ + ax_compiler_flags_as_needed_option="" + ]) + + # macOS linker speaks with a different accent + ax_compiler_flags_fatal_warnings_option="" + AX_CHECK_LINK_FLAG([-Wl,--fatal-warnings], [ + ax_compiler_flags_fatal_warnings_option="-Wl,--fatal-warnings" + ]) + AX_CHECK_LINK_FLAG([-Wl,-fatal_warnings], [ + ax_compiler_flags_fatal_warnings_option="-Wl,-fatal_warnings" + ]) + + # Base flags + AX_APPEND_LINK_FLAGS([ dnl + $ax_compiler_flags_as_needed_option dnl + $3 dnl + ],ax_warn_ldflags_variable,[$ax_compiler_flags_test]) + + AS_IF([test "$ax_enable_compile_warnings" != "no"],[ + # "yes" flags + AX_APPEND_LINK_FLAGS([$4 $5 $6 $7], + ax_warn_ldflags_variable, + [$ax_compiler_flags_test]) + ]) + AS_IF([test "$ax_enable_compile_warnings" = "error"],[ + # "error" flags; -Werror has to be appended unconditionally because + # it's not possible to test for + # + # suggest-attribute=format is disabled because it gives too many false + # positives + AX_APPEND_LINK_FLAGS([ dnl + $ax_compiler_flags_fatal_warnings_option dnl + ],ax_warn_ldflags_variable,[$ax_compiler_flags_test]) ]) - # In the flags below, when disabling specific flags, always add *both* - # -Wno-foo and -Wno-error=foo. This fixes the situation where (for example) - # we enable -Werror, disable a flag, and a build bot passes CFLAGS=-Wall, - # which effectively turns that flag back on again as an error. - for flag in $ax_warn_cflags_variable; do - AS_CASE([$flag], - [-Wno-*=*],[], - [-Wno-*],[ - AX_APPEND_COMPILE_FLAGS([-Wno-error=$(AS_ECHO([$flag]) | $SED 's/^-Wno-//')], - ax_warn_cflags_variable, - [$ax_compiler_flags_test]) - ]) - done - - AC_LANG_POP([C]) - # Substitute the variables - AC_SUBST(ax_warn_cflags_variable) + AC_SUBST(ax_warn_ldflags_variable) ])dnl AX_COMPILER_FLAGS # =========================================================================== -# https://www.gnu.org/software/autoconf-archive/ax_compiler_flags_gir.html +# https://www.gnu.org/software/autoconf-archive/ax_require_defined.html # =========================================================================== # # SYNOPSIS # -# AX_COMPILER_FLAGS_GIR([VARIABLE], [IS-RELEASE], [EXTRA-BASE-FLAGS], [EXTRA-YES-FLAGS]) +# AX_REQUIRE_DEFINED(MACRO) # # DESCRIPTION # -# Add warning flags for the g-ir-scanner (from GObject Introspection) to -# VARIABLE, which defaults to WARN_SCANNERFLAGS. VARIABLE is AC_SUBST-ed -# by this macro, but must be manually added to the SCANNERFLAGS variable -# for each GIR target in the code base. +# AX_REQUIRE_DEFINED is a simple helper for making sure other macros have +# been defined and thus are available for use. This avoids random issues +# where a macro isn't expanded. Instead the configure script emits a +# non-fatal: # -# This macro depends on the environment set up by AX_COMPILER_FLAGS. -# Specifically, it uses the value of $ax_enable_compile_warnings to decide -# which flags to enable. +# ./configure: line 1673: AX_CFLAGS_WARN_ALL: command not found +# +# It's like AC_REQUIRE except it doesn't expand the required macro. +# +# Here's an example: +# +# AX_REQUIRE_DEFINED([AX_CHECK_LINK_FLAG]) # # LICENSE # -# Copyright (c) 2015 Philip Withnall +# Copyright (c) 2014 Mike Frysinger # # Copying and distribution of this file, with or without modification, are # permitted in any medium without royalty provided the copyright notice -# and this notice are preserved. This file is offered as-is, without any +# and this notice are preserved. This file is offered as-is, without any # warranty. -#serial 6 +#serial 2 -AC_DEFUN([AX_COMPILER_FLAGS_GIR],[ - AX_REQUIRE_DEFINED([AX_APPEND_FLAG]) +AC_DEFUN([AX_REQUIRE_DEFINED], [dnl + m4_ifndef([$1], [m4_fatal([macro ]$1[ is not defined; is a m4 file missing?])]) +])dnl AX_REQUIRE_DEFINED - # Variable names - m4_define([ax_warn_scannerflags_variable], - [m4_normalize(ifelse([$1],,[WARN_SCANNERFLAGS],[$1]))]) +dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +dnl serial 11 (pkg-config-0.29) +dnl +dnl Copyright © 2004 Scott James Remnant . +dnl Copyright © 2012-2015 Dan Nicholson +dnl +dnl This program is free software; you can redistribute it and/or modify +dnl it under the terms of the GNU General Public License as published by +dnl the Free Software Foundation; either version 2 of the License, or +dnl (at your option) any later version. +dnl +dnl This program is distributed in the hope that it will be useful, but +dnl WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +dnl General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License +dnl along with this program; if not, write to the Free Software +dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +dnl 02111-1307, USA. +dnl +dnl As a special exception to the GNU General Public License, if you +dnl distribute this file as part of a program that contains a +dnl configuration script generated by Autoconf, you may include it under +dnl the same distribution terms that you use for the rest of that +dnl program. - # Base flags - AX_APPEND_FLAG([$3],ax_warn_scannerflags_variable) +dnl PKG_PREREQ(MIN-VERSION) +dnl ----------------------- +dnl Since: 0.29 +dnl +dnl Verify that the version of the pkg-config macros are at least +dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's +dnl installed version of pkg-config, this checks the developer's version +dnl of pkg.m4 when generating configure. +dnl +dnl To ensure that this macro is defined, also add: +dnl m4_ifndef([PKG_PREREQ], +dnl [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])]) +dnl +dnl See the "Since" comment for each macro you use to see what version +dnl of the macros you require. +m4_defun([PKG_PREREQ], +[m4_define([PKG_MACROS_VERSION], [0.29]) +m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1, + [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])]) +])dnl PKG_PREREQ + +dnl PKG_PROG_PKG_CONFIG([MIN-VERSION]) +dnl ---------------------------------- +dnl Since: 0.16 +dnl +dnl Search for the pkg-config tool and set the PKG_CONFIG variable to +dnl first found in the path. Checks that the version of pkg-config found +dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is +dnl used since that's the first version where most current features of +dnl pkg-config existed. +AC_DEFUN([PKG_PROG_PKG_CONFIG], +[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) +m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) +m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) +AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) +AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) +AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) + +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=m4_default([$1], [0.9.0]) + AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + PKG_CONFIG="" + fi +fi[]dnl +])dnl PKG_PROG_PKG_CONFIG + +dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +dnl ------------------------------------------------------------------- +dnl Since: 0.18 +dnl +dnl Check to see whether a particular set of modules exists. Similar to +dnl PKG_CHECK_MODULES(), but does not set variables or print errors. +dnl +dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +dnl only at the first occurence in configure.ac, so if the first place +dnl it's called might be skipped (such as if it is within an "if", you +dnl have to call PKG_CHECK_EXISTS manually +AC_DEFUN([PKG_CHECK_EXISTS], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +if test -n "$PKG_CONFIG" && \ + AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then + m4_default([$2], [:]) +m4_ifvaln([$3], [else + $3])dnl +fi]) + +dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) +dnl --------------------------------------------- +dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting +dnl pkg_failed based on the result. +m4_define([_PKG_CONFIG], +[if test -n "$$1"; then + pkg_cv_[]$1="$$1" + elif test -n "$PKG_CONFIG"; then + PKG_CHECK_EXISTS([$3], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes ], + [pkg_failed=yes]) + else + pkg_failed=untried +fi[]dnl +])dnl _PKG_CONFIG + +dnl _PKG_SHORT_ERRORS_SUPPORTED +dnl --------------------------- +dnl Internal check to see if pkg-config supports short errors. +AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi[]dnl +])dnl _PKG_SHORT_ERRORS_SUPPORTED + + +dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +dnl [ACTION-IF-NOT-FOUND]) +dnl -------------------------------------------------------------- +dnl Since: 0.4.0 +dnl +dnl Note that if there is a possibility the first call to +dnl PKG_CHECK_MODULES might not happen, you should be sure to include an +dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac +AC_DEFUN([PKG_CHECK_MODULES], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl +AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl + +pkg_failed=no +AC_MSG_CHECKING([for $1]) + +_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) +_PKG_CONFIG([$1][_LIBS], [libs], [$2]) + +m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS +and $1[]_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details.]) + +if test $pkg_failed = yes; then + AC_MSG_RESULT([no]) + _PKG_SHORT_ERRORS_SUPPORTED + if test $_pkg_short_errors_supported = yes; then + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` + else + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD - AS_IF([test "$ax_enable_compile_warnings" != "no"],[ - # "yes" flags - AX_APPEND_FLAG([ dnl - --warn-all dnl - $4 dnl - $5 dnl - $6 dnl - $7 dnl - ],ax_warn_scannerflags_variable) - ]) - AS_IF([test "$ax_enable_compile_warnings" = "error"],[ - # "error" flags - AX_APPEND_FLAG([ dnl - --warn-error dnl - ],ax_warn_scannerflags_variable) - ]) + m4_default([$4], [AC_MSG_ERROR( +[Package requirements ($2) were not met: - # Substitute the variables - AC_SUBST(ax_warn_scannerflags_variable) -])dnl AX_COMPILER_FLAGS +$$1_PKG_ERRORS -# ============================================================================== -# https://www.gnu.org/software/autoconf-archive/ax_compiler_flags_ldflags.html -# ============================================================================== -# -# SYNOPSIS -# -# AX_COMPILER_FLAGS_LDFLAGS([VARIABLE], [IS-RELEASE], [EXTRA-BASE-FLAGS], [EXTRA-YES-FLAGS]) -# -# DESCRIPTION -# -# Add warning flags for the linker to VARIABLE, which defaults to -# WARN_LDFLAGS. VARIABLE is AC_SUBST-ed by this macro, but must be -# manually added to the LDFLAGS variable for each target in the code base. -# -# This macro depends on the environment set up by AX_COMPILER_FLAGS. -# Specifically, it uses the value of $ax_enable_compile_warnings to decide -# which flags to enable. -# -# LICENSE -# -# Copyright (c) 2014, 2015 Philip Withnall -# Copyright (c) 2017, 2018 Reini Urban -# -# Copying and distribution of this file, with or without modification, are -# permitted in any medium without royalty provided the copyright notice -# and this notice are preserved. This file is offered as-is, without any -# warranty. +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. -#serial 9 +_PKG_TEXT])[]dnl + ]) +elif test $pkg_failed = untried; then + AC_MSG_RESULT([no]) + m4_default([$4], [AC_MSG_FAILURE( +[The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. -AC_DEFUN([AX_COMPILER_FLAGS_LDFLAGS],[ - AX_REQUIRE_DEFINED([AX_APPEND_LINK_FLAGS]) - AX_REQUIRE_DEFINED([AX_APPEND_FLAG]) - AX_REQUIRE_DEFINED([AX_CHECK_COMPILE_FLAG]) - AX_REQUIRE_DEFINED([AX_CHECK_LINK_FLAG]) +_PKG_TEXT - # Variable names - m4_define([ax_warn_ldflags_variable], - [m4_normalize(ifelse([$1],,[WARN_LDFLAGS],[$1]))]) +To get pkg-config, see .])[]dnl + ]) +else + $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS + $1[]_LIBS=$pkg_cv_[]$1[]_LIBS + AC_MSG_RESULT([yes]) + $3 +fi[]dnl +])dnl PKG_CHECK_MODULES - # Always pass -Werror=unknown-warning-option to get Clang to fail on bad - # flags, otherwise they are always appended to the warn_ldflags variable, - # and Clang warns on them for every compilation unit. - # If this is passed to GCC, it will explode, so the flag must be enabled - # conditionally. - AX_CHECK_COMPILE_FLAG([-Werror=unknown-warning-option],[ - ax_compiler_flags_test="-Werror=unknown-warning-option" - ],[ - ax_compiler_flags_test="" - ]) - AX_CHECK_LINK_FLAG([-Wl,--as-needed], [ - AX_APPEND_LINK_FLAGS([-Wl,--as-needed], - [AM_LDFLAGS],[$ax_compiler_flags_test]) - ]) - AX_CHECK_LINK_FLAG([-Wl,-z,relro], [ - AX_APPEND_LINK_FLAGS([-Wl,-z,relro], - [AM_LDFLAGS],[$ax_compiler_flags_test]) - ]) - AX_CHECK_LINK_FLAG([-Wl,-z,now], [ - AX_APPEND_LINK_FLAGS([-Wl,-z,now], - [AM_LDFLAGS],[$ax_compiler_flags_test]) - ]) - AX_CHECK_LINK_FLAG([-Wl,-z,noexecstack], [ - AX_APPEND_LINK_FLAGS([-Wl,-z,noexecstack], - [AM_LDFLAGS],[$ax_compiler_flags_test]) - ]) - # textonly, retpolineplt not yet +dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +dnl [ACTION-IF-NOT-FOUND]) +dnl --------------------------------------------------------------------- +dnl Since: 0.29 +dnl +dnl Checks for existence of MODULES and gathers its build flags with +dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags +dnl and VARIABLE-PREFIX_LIBS from --libs. +dnl +dnl Note that if there is a possibility the first call to +dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to +dnl include an explicit call to PKG_PROG_PKG_CONFIG in your +dnl configure.ac. +AC_DEFUN([PKG_CHECK_MODULES_STATIC], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +_save_PKG_CONFIG=$PKG_CONFIG +PKG_CONFIG="$PKG_CONFIG --static" +PKG_CHECK_MODULES($@) +PKG_CONFIG=$_save_PKG_CONFIG[]dnl +])dnl PKG_CHECK_MODULES_STATIC - # macOS and cygwin linker do not have --as-needed - AX_CHECK_LINK_FLAG([-Wl,--no-as-needed], [ - ax_compiler_flags_as_needed_option="-Wl,--no-as-needed" - ], [ - ax_compiler_flags_as_needed_option="" - ]) - # macOS linker speaks with a different accent - ax_compiler_flags_fatal_warnings_option="" - AX_CHECK_LINK_FLAG([-Wl,--fatal-warnings], [ - ax_compiler_flags_fatal_warnings_option="-Wl,--fatal-warnings" - ]) - AX_CHECK_LINK_FLAG([-Wl,-fatal_warnings], [ - ax_compiler_flags_fatal_warnings_option="-Wl,-fatal_warnings" - ]) +dnl PKG_INSTALLDIR([DIRECTORY]) +dnl ------------------------- +dnl Since: 0.27 +dnl +dnl Substitutes the variable pkgconfigdir as the location where a module +dnl should install pkg-config .pc files. By default the directory is +dnl $libdir/pkgconfig, but the default can be changed by passing +dnl DIRECTORY. The user can override through the --with-pkgconfigdir +dnl parameter. +AC_DEFUN([PKG_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([pkgconfigdir], + [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],, + [with_pkgconfigdir=]pkg_default) +AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +])dnl PKG_INSTALLDIR - # Base flags - AX_APPEND_LINK_FLAGS([ dnl - $ax_compiler_flags_as_needed_option dnl - $3 dnl - ],ax_warn_ldflags_variable,[$ax_compiler_flags_test]) - AS_IF([test "$ax_enable_compile_warnings" != "no"],[ - # "yes" flags - AX_APPEND_LINK_FLAGS([$4 $5 $6 $7], - ax_warn_ldflags_variable, - [$ax_compiler_flags_test]) - ]) - AS_IF([test "$ax_enable_compile_warnings" = "error"],[ - # "error" flags; -Werror has to be appended unconditionally because - # it's not possible to test for - # - # suggest-attribute=format is disabled because it gives too many false - # positives - AX_APPEND_LINK_FLAGS([ dnl - $ax_compiler_flags_fatal_warnings_option dnl - ],ax_warn_ldflags_variable,[$ax_compiler_flags_test]) - ]) +dnl PKG_NOARCH_INSTALLDIR([DIRECTORY]) +dnl -------------------------------- +dnl Since: 0.27 +dnl +dnl Substitutes the variable noarch_pkgconfigdir as the location where a +dnl module should install arch-independent pkg-config .pc files. By +dnl default the directory is $datadir/pkgconfig, but the default can be +dnl changed by passing DIRECTORY. The user can override through the +dnl --with-noarch-pkgconfigdir parameter. +AC_DEFUN([PKG_NOARCH_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([noarch-pkgconfigdir], + [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],, + [with_noarch_pkgconfigdir=]pkg_default) +AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +])dnl PKG_NOARCH_INSTALLDIR - # Substitute the variables - AC_SUBST(ax_warn_ldflags_variable) -])dnl AX_COMPILER_FLAGS -# =========================================================================== -# https://www.gnu.org/software/autoconf-archive/ax_require_defined.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_REQUIRE_DEFINED(MACRO) -# -# DESCRIPTION -# -# AX_REQUIRE_DEFINED is a simple helper for making sure other macros have -# been defined and thus are available for use. This avoids random issues -# where a macro isn't expanded. Instead the configure script emits a -# non-fatal: -# -# ./configure: line 1673: AX_CFLAGS_WARN_ALL: command not found -# -# It's like AC_REQUIRE except it doesn't expand the required macro. -# -# Here's an example: -# -# AX_REQUIRE_DEFINED([AX_CHECK_LINK_FLAG]) -# -# LICENSE -# -# Copyright (c) 2014 Mike Frysinger -# -# Copying and distribution of this file, with or without modification, are -# permitted in any medium without royalty provided the copyright notice -# and this notice are preserved. This file is offered as-is, without any -# warranty. +dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, +dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +dnl ------------------------------------------- +dnl Since: 0.28 +dnl +dnl Retrieves the value of the pkg-config variable for the given module. +AC_DEFUN([PKG_CHECK_VAR], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl -#serial 2 +_PKG_CONFIG([$1], [variable="][$3]["], [$2]) +AS_VAR_COPY([$1], [pkg_cv_][$1]) -AC_DEFUN([AX_REQUIRE_DEFINED], [dnl - m4_ifndef([$1], [m4_fatal([macro ]$1[ is not defined; is a m4 file missing?])]) -])dnl AX_REQUIRE_DEFINED +AS_VAR_IF([$1], [""], [$5], [$4])dnl +])dnl PKG_CHECK_VAR # Copyright (C) 2002-2018 Free Software Foundation, Inc. # diff --git a/configure b/configure index 63e4745..7b085b2 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for gobject-introspection 1.60.0. +# Generated by GNU Autoconf 2.69 for gobject-introspection 1.60.1. # # Report bugs to . # @@ -591,8 +591,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='gobject-introspection' PACKAGE_TARNAME='gobject-introspection' -PACKAGE_VERSION='1.60.0' -PACKAGE_STRING='gobject-introspection 1.60.0' +PACKAGE_VERSION='1.60.1' +PACKAGE_STRING='gobject-introspection 1.60.1' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gobject-introspection' PACKAGE_URL='' @@ -1462,7 +1462,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures gobject-introspection 1.60.0 to adapt to many kinds of systems. +\`configure' configures gobject-introspection 1.60.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1534,7 +1534,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of gobject-introspection 1.60.0:";; + short | recursive ) echo "Configuration of gobject-introspection 1.60.1:";; esac cat <<\_ACEOF @@ -1701,7 +1701,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -gobject-introspection configure 1.60.0 +gobject-introspection configure 1.60.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2253,7 +2253,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by gobject-introspection $as_me 1.60.0, which was +It was created by gobject-introspection $as_me 1.60.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3121,7 +3121,7 @@ fi # Define the identity of the package. PACKAGE='gobject-introspection' - VERSION='1.60.0' + VERSION='1.60.1' cat >>confdefs.h <<_ACEOF @@ -3395,12 +3395,12 @@ AM_BACKSLASH='\' # Used in docs/reference/version.xml -GI_VERSION=1.60.0 +GI_VERSION=1.60.1 GI_MAJOR_VERSION=1 GI_MINOR_VERSION=60 -GI_MICRO_VERSION=0 +GI_MICRO_VERSION=1 @@ -18001,7 +18001,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by gobject-introspection $as_me 1.60.0, which was +This file was extended by gobject-introspection $as_me 1.60.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -18067,7 +18067,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -gobject-introspection config.status 1.60.0 +gobject-introspection config.status 1.60.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 885da70..c6dca84 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl the gi version number m4_define(gi_major_version, 1) m4_define(gi_minor_version, 60) -m4_define(gi_micro_version, 0) +m4_define(gi_micro_version, 1) m4_define(gi_version, gi_major_version.gi_minor_version.gi_micro_version) AC_PREREQ([2.63]) diff --git a/docs/g-ir-scanner.1 b/docs/g-ir-scanner.1 index 2078d92..c890291 100644 --- a/docs/g-ir-scanner.1 +++ b/docs/g-ir-scanner.1 @@ -90,6 +90,10 @@ Include this directory in the list of directories to be searched for header files. You need to pass to the scanner all the directories you\(aqd normally pass to the compiler when using the specified source files. .TP +.BI \-\-c\-include\fB= C_INCLUDES +Headers which should be included in C programs. This option can be +specified multiple times to include more than one header. +.TP .BI \-n\fP,\fB \-\-namespace\fB= NAME The namespace name. This name should be capitalized, eg the first letter should be upper case. Examples: Gtk, Clutter, WebKit. diff --git a/docs/reference/html/GIBaseInfo.html b/docs/reference/html/GIBaseInfo.html index b054fb7..cc77165 100644 --- a/docs/reference/html/GIBaseInfo.html +++ b/docs/reference/html/GIBaseInfo.html @@ -8,7 +8,7 @@ - + @@ -66,7 +66,7 @@ -gboolean +gboolean g_base_info_equal () @@ -89,21 +89,21 @@ -const gchar * +const gchar * g_base_info_get_namespace () -const gchar * +const gchar * g_base_info_get_name () -const gchar * +const gchar * g_base_info_get_attribute () @@ -111,7 +111,7 @@ -gboolean +gboolean g_base_info_iterate_attributes () @@ -127,14 +127,14 @@ -gboolean +gboolean g_base_info_is_deprecated () -const gchar * +const gchar * g_info_type_to_string () @@ -168,7 +168,7 @@

Object Hierarchy

-
    GBoxed
+
    GBoxed
     ╰── GIBaseInfo
 
@@ -237,7 +237,7 @@ GIBaseInfos are normally accessed by calling either g_info_new (GIInfoType type, GIBaseInfo *container, GITypelib *typelib, - guint32 offset); + guint32 offset);

TODO

Parameters

@@ -333,7 +333,7 @@ drops to 0, the info is freed.


g_base_info_equal ()

-
gboolean
+
gboolean
 g_base_info_equal (GIBaseInfo *info1,
                    GIBaseInfo *info2);

Compare two GIBaseInfo.

@@ -364,7 +364,7 @@ TypeLib; use this function instead to do

Returns

-

TRUE if and only if info1 +

TRUE if and only if info1 equals info2 .

@@ -427,7 +427,7 @@ g_base_info_get_typelib (

g_base_info_get_namespace ()

-
const gchar *
+
const gchar *
 g_base_info_get_namespace (GIBaseInfo *info);

Obtain the namespace of info .

@@ -454,7 +454,7 @@ g_base_info_get_namespace (

g_base_info_get_name ()

-
const gchar *
+
const gchar *
 g_base_info_get_name (GIBaseInfo *info);

Obtain the name of the info . What the name represents depends on @@ -479,15 +479,15 @@ the name of the function.

Returns

the name of info -or NULL if it lacks a name.

+or NULL if it lacks a name.


g_base_info_get_attribute ()

-
const gchar *
+
const gchar *
 g_base_info_get_attribute (GIBaseInfo *info,
-                           const gchar *name);
+ const gchar *name);

Retrieve an arbitrary attribute associated with this node.

Parameters

@@ -513,20 +513,20 @@ g_base_info_get_attribute (

Returns

-

The value of the attribute, or NULL if no such attribute exists

+

The value of the attribute, or NULL if no such attribute exists


g_base_info_iterate_attributes ()

-
gboolean
+
gboolean
 g_base_info_iterate_attributes (GIBaseInfo *info,
                                 GIAttributeIter *iterator,
                                 char **name,
                                 char **value);

Iterate over all attributes associated with this node. The iterator structure is typically stack allocated, and must have its first -member initialized to NULL. Attributes are arbitrary namespaced key–value +member initialized to NULL. Attributes are arbitrary namespaced key–value pairs which can be attached to almost any item. They are intended for use by software higher in the toolchain than bindings, and are distinct from normal GIR annotations.

@@ -559,7 +559,7 @@ and must not be freed.

char *value; while (g_base_info_iterate_attributes (info, &iter, &name, &value)) { - g_print ("attribute name: %s value: %s", name, value); + g_print ("attribute name: %s value: %s", name, value); } }
@@ -602,7 +602,7 @@ and must not be freed.

Returns

-

TRUE if there are more attributes

+

TRUE if there are more attributes


@@ -638,7 +638,7 @@ GIBaseInfo. For instance, the parent of a

g_base_info_is_deprecated ()

-
gboolean
+
gboolean
 g_base_info_is_deprecated (GIBaseInfo *info);

Obtain whether the info is represents a metadata which is @@ -660,13 +660,13 @@ deprecated or not.

Returns

-

TRUE if deprecated

+

TRUE if deprecated


g_info_type_to_string ()

-
const gchar *
+
const gchar *
 g_info_type_to_string (GIInfoType type);

Obtain a string representation of type

@@ -869,6 +869,6 @@ in a -
Generated by GTK-Doc V1.29.1
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/docs/reference/html/GIRepository.html b/docs/reference/html/GIRepository.html index af21d73..8324bc9 100644 --- a/docs/reference/html/GIRepository.html +++ b/docs/reference/html/GIRepository.html @@ -8,7 +8,7 @@ - + @@ -50,7 +50,7 @@ -gchar ** +
gchar ** g_irepository_get_dependencies () @@ -58,7 +58,7 @@ -gchar ** +gchar ** g_irepository_get_immediate_dependencies () @@ -66,7 +66,7 @@ -gchar ** +gchar ** g_irepository_get_loaded_namespaces () @@ -74,7 +74,7 @@ -gint +gint g_irepository_get_n_infos () @@ -90,7 +90,7 @@ -GOptionGroup * +GOptionGroup * g_irepository_get_option_group () @@ -98,7 +98,7 @@ -GList * +GList * g_irepository_enumerate_versions () @@ -122,7 +122,7 @@ -GSList * +GSList * g_irepository_get_search_path () @@ -136,7 +136,7 @@ -const gchar * +const gchar * g_irepository_get_typelib_path () @@ -144,7 +144,7 @@ -gboolean +gboolean g_irepository_is_registered () @@ -167,21 +167,21 @@ -const gchar * +const gchar * g_irepository_get_c_prefix () -const gchar * +const gchar * g_irepository_get_shared_library () -const gchar * +const gchar * g_irepository_get_version () @@ -221,7 +221,7 @@ -gboolean +gboolean g_irepository_dump () @@ -267,7 +267,7 @@

Object Hierarchy

-
    GObject
+
    GObject
     ╰── GIRepository
 
@@ -301,7 +301,7 @@ particular process, but this function is provided in the unlikely eventuality that it would become possible, and as a convenience for higher level language bindings to conform to the GObject method call conventions.

-

All methods on GIRepository also accept NULL as an instance +

All methods on GIRepository also accept NULL as an instance parameter to mean this default repository, which is usually more convenient for C.

@@ -313,9 +313,9 @@ convenient for C.


g_irepository_get_dependencies ()

-
gchar **
+
gchar **
 g_irepository_get_dependencies (GIRepository *repository,
-                                const gchar *namespace_);
+ const gchar *namespace_);

Return an array of all (transitive) versioned dependencies for namespace_ . Returned strings are of the form

@@ -337,7 +337,7 @@ such as

repository

-

A GIRepository or NULL for the singleton +

A GIRepository or NULL for the singleton process-global default GIRepository.

[allow-none] @@ -359,10 +359,10 @@ dependencies.


g_irepository_get_immediate_dependencies ()

-
gchar **
+
gchar **
 g_irepository_get_immediate_dependencies
                                (GIRepository *repository,
-                                const gchar *namespace_);
+ const gchar *namespace_);

Return an array of the immediate versioned dependencies for namespace_ . Returned strings are of the form namespace-version.

@@ -383,7 +383,7 @@ such as

repository

-

A GIRepository or NULL for the singleton +

A GIRepository or NULL for the singleton process-global default GIRepository.

[nullable] @@ -406,7 +406,7 @@ dependencies.


g_irepository_get_loaded_namespaces ()

-
gchar **
+
gchar **
 g_irepository_get_loaded_namespaces (GIRepository *repository);

Return the list of currently loaded namespaces.

@@ -419,7 +419,7 @@ g_irepository_get_loaded_namespaces (

repository

-

A GIRepository or NULL for the singleton +

A GIRepository or NULL for the singleton process-global default GIRepository.

[allow-none] @@ -434,9 +434,9 @@ process-global default

g_irepository_get_n_infos ()

-
gint
+
gint
 g_irepository_get_n_infos (GIRepository *repository,
-                           const gchar *namespace_);
+ const gchar *namespace_);

This function returns the number of metadata entries in given namespace namespace_ . The namespace must have @@ -452,7 +452,7 @@ already been loaded before calling this function.

repository

-

A GIRepository or NULL for the singleton +

A GIRepository or NULL for the singleton process-global default GIRepository.

[allow-none] @@ -474,8 +474,8 @@ process-global default

g_irepository_get_info ()

GIBaseInfo *
 g_irepository_get_info (GIRepository *repository,
-                        const gchar *namespace_,
-                        gint index);
+ const gchar *namespace_, + gint index);

This function returns a particular metadata entry in the given namespace namespace_ . The namespace must have @@ -493,7 +493,7 @@ entries.

repository

-

A GIRepository or NULL for the singleton +

A GIRepository or NULL for the singleton process-global default GIRepository.

[allow-none] @@ -519,7 +519,7 @@ process-global default

g_irepository_get_option_group ()

-
GOptionGroup *
+
GOptionGroup *
 g_irepository_get_option_group (void);

Obtain the option group for girepository, it's used by the dumper and for programs that wants to provide @@ -533,9 +533,9 @@ introspection information


g_irepository_enumerate_versions ()

-
GList *
+
GList *
 g_irepository_enumerate_versions (GIRepository *repository,
-                                  const gchar *namespace_);
+ const gchar *namespace_);

Obtain an unordered list of versions (either currently loaded or available) for namespace_ in this repository @@ -551,7 +551,7 @@ available) for namespace_

repository

-

A GIRepository or NULL for the singleton +

A GIRepository or NULL for the singleton process-global default GIRepository.

[allow-none] @@ -631,14 +631,14 @@ search path.


g_irepository_get_search_path ()

-
GSList *
+
GSList *
 g_irepository_get_search_path (void);

Returns the current search path GIRepository will use when loading typelib files. The list is internal to GIRepository and should not be freed, nor should its string elements.

Returns

-

GSList of strings.

+

GSList of strings.

[element-type filename][transfer none]

@@ -649,7 +649,7 @@ be freed, nor should its string elements.

g_irepository_load_typelib (GIRepository *repository, GITypelib *typelib, GIRepositoryLoadFlags flags, - GError **error);
+ GError **error);

TODO

Parameters

@@ -662,7 +662,7 @@ g_irepository_load_typelib (

repository

-

A GIRepository or NULL for the singleton +

A GIRepository or NULL for the singleton process-global default GIRepository.

[allow-none] @@ -688,9 +688,9 @@ process-global default

g_irepository_get_typelib_path ()

-
const gchar *
+
const gchar *
 g_irepository_get_typelib_path (GIRepository *repository,
-                                const gchar *namespace_);
+ const gchar *namespace_);

If namespace namespace_ is loaded, return the full path to the .typelib file it was loaded from. If the typelib for @@ -708,7 +708,7 @@ the special string "<builtin>".

repository

-

A GIRepository or NULL for the singleton +

A GIRepository or NULL for the singleton process-global default GIRepository.

[allow-none] @@ -722,16 +722,16 @@ process-global default

Returns

-

Filesystem path (or $lt;builtin$gt;) if successful, NULL if namespace is not loaded

+

Filesystem path (or $lt;builtin$gt;) if successful, NULL if namespace is not loaded


g_irepository_is_registered ()

-
gboolean
+
gboolean
 g_irepository_is_registered (GIRepository *repository,
-                             const gchar *namespace_,
-                             const gchar *version);
+ const gchar *namespace_, + const gchar *version);

Check whether a particular namespace (and optionally, a specific version thereof) is currently loaded. This function is likely to only be useful in unusual circumstances; in order to act upon @@ -749,7 +749,7 @@ quickly as this function will if it has already been loaded.

repository

-

A GIRepository or NULL for the singleton +

A GIRepository or NULL for the singleton process-global default GIRepository.

[allow-none] @@ -760,7 +760,7 @@ process-global default

version

-

Required version, may be NULL for latest.

+

Required version, may be NULL for latest.

[allow-none] @@ -768,7 +768,7 @@ process-global default

Returns

-

TRUE if namespace-version is loaded, FALSE otherwise

+

TRUE if namespace-version is loaded, FALSE otherwise


@@ -776,10 +776,10 @@ process-global default

g_irepository_require ()

GITypelib *
 g_irepository_require (GIRepository *repository,
-                       const gchar *namespace_,
-                       const gchar *version,
+                       const gchar *namespace_,
+                       const gchar *version,
                        GIRepositoryLoadFlags flags,
-                       GError **error);
+ GError **error);

Force the namespace namespace_ to be loaded if it isn't already. If namespace_ @@ -800,7 +800,7 @@ not specified, the latest will be used.

repository

-

A GIRepository or NULL for the singleton +

A GIRepository or NULL for the singleton process-global default GIRepository.

[allow-none] @@ -811,7 +811,7 @@ process-global default

version

-

Version of namespace, may be NULL for latest.

+

Version of namespace, may be NULL for latest.

[allow-none] @@ -821,7 +821,7 @@ process-global default

error

-

a GError.

+

a GError.

  @@ -829,7 +829,7 @@ process-global default

Returns

-

a pointer to the GITypelib if successful, NULL otherwise.

+

a pointer to the GITypelib if successful, NULL otherwise.

[transfer none]

@@ -838,11 +838,11 @@ process-global default

g_irepository_require_private ()

GITypelib *
 g_irepository_require_private (GIRepository *repository,
-                               const gchar *typelib_dir,
-                               const gchar *namespace_,
-                               const gchar *version,
+                               const gchar *typelib_dir,
+                               const gchar *namespace_,
+                               const gchar *version,
                                GIRepositoryLoadFlags flags,
-                               GError **error);
+ GError **error);

Force the namespace namespace_ to be loaded if it isn't already. If namespace_ @@ -863,7 +863,7 @@ not specified, the latest will be used.

repository

-

A GIRepository or NULL for the singleton +

A GIRepository or NULL for the singleton process-global default GIRepository.

[allow-none] @@ -879,7 +879,7 @@ process-global default

version

-

Version of namespace, may be NULL for latest.

+

Version of namespace, may be NULL for latest.

[allow-none] @@ -889,7 +889,7 @@ process-global default

error

-

a GError.

+

a GError.

  @@ -897,19 +897,19 @@ process-global default

Returns

-

a pointer to the GITypelib if successful, NULL otherwise.

+

a pointer to the GITypelib if successful, NULL otherwise.

[transfer none]


g_irepository_get_c_prefix ()

-
const gchar *
+
const gchar *
 g_irepository_get_c_prefix (GIRepository *repository,
-                            const gchar *namespace_);
+ const gchar *namespace_);

This function returns the "C prefix", or the C level namespace associated with the given introspection namespace. Each C symbol -starts with this prefix, as well each GType in the library.

+starts with this prefix, as well each GType in the library.

Note: The namespace must have already been loaded using a function such as g_irepository_require() before calling this function.

@@ -923,7 +923,7 @@ such as

repository

-

A GIRepository or NULL for the singleton +

A GIRepository or NULL for the singleton process-global default GIRepository.

[allow-none] @@ -937,20 +937,20 @@ process-global default

Returns

-

C namespace prefix, or NULL if none associated

+

C namespace prefix, or NULL if none associated


g_irepository_get_shared_library ()

-
const gchar *
+
const gchar *
 g_irepository_get_shared_library (GIRepository *repository,
-                                  const gchar *namespace_);
+ const gchar *namespace_);

This function returns a comma-separated list of paths to the shared C libraries associated with the given namespace namespace_ . There may be no shared library path associated, in which case this -function will return NULL.

+function will return NULL.

Note: The namespace must have already been loaded using a function such as g_irepository_require() before calling this function.

@@ -964,7 +964,7 @@ such as

repository

-

A GIRepository or NULL for the singleton +

A GIRepository or NULL for the singleton process-global default GIRepository.

[allow-none] @@ -979,15 +979,15 @@ process-global default

Returns

Comma-separated list of paths to shared libraries, -or NULL if none are associated

+or NULL if none are associated


g_irepository_get_version ()

-
const gchar *
+
const gchar *
 g_irepository_get_version (GIRepository *repository,
-                           const gchar *namespace_);
+ const gchar *namespace_);

This function returns the loaded version associated with the given namespace namespace_ .

@@ -1004,7 +1004,7 @@ such as

repository

-

A GIRepository or NULL for the singleton +

A GIRepository or NULL for the singleton process-global default GIRepository.

[allow-none] @@ -1026,8 +1026,8 @@ process-global default

g_irepository_find_by_gtype ()

GIBaseInfo *
 g_irepository_find_by_gtype (GIRepository *repository,
-                             GType gtype);
-

Searches all loaded namespaces for a particular GType. Note that + GType gtype); +

Searches all loaded namespaces for a particular GType. Note that in order to locate the metadata, the namespace corresponding to the type must first have been loaded. There is currently no mechanism for determining the namespace which corresponds to an @@ -1044,7 +1044,7 @@ when you know the GType to originate from be from a loaded namespace.

repository

-

A GIRepository or NULL for the singleton +

A GIRepository or NULL for the singleton process-global default GIRepository.

[allow-none] @@ -1059,7 +1059,7 @@ process-global default

Returns

GIBaseInfo representing metadata about type -, or NULL.

+, or NULL.

[transfer full]

@@ -1068,8 +1068,8 @@ process-global default

g_irepository_find_by_error_domain ()

GIEnumInfo *
 g_irepository_find_by_error_domain (GIRepository *repository,
-                                    GQuark domain);
-

Searches for the enum type corresponding to the given GError + GQuark domain); +

Searches for the enum type corresponding to the given GError domain. Before calling this function for a particular namespace, you must call g_irepository_require() once to load the namespace, or otherwise ensure the namespace has already been loaded.

@@ -1084,13 +1084,13 @@ otherwise ensure the namespace has already been loaded.

repository

-

A GIRepository or NULL for the singleton +

A GIRepository or NULL for the singleton process-global default GIRepository.

[allow-none]

domain

-

a GError domain

+

a GError domain

  @@ -1100,7 +1100,7 @@ process-global default

Returns

GIEnumInfo representing metadata about domain 's -enum type, or NULL.

+enum type, or NULL.

[transfer full]

Since: 1.30

@@ -1110,8 +1110,8 @@ enum type, or NULL.

g_irepository_find_by_name ()

GIBaseInfo *
 g_irepository_find_by_name (GIRepository *repository,
-                            const gchar *namespace_,
-                            const gchar *name);
+ const gchar *namespace_, + const gchar *name);

Searches for a particular entry in a namespace. Before calling this function for a particular namespace, you must call g_irepository_require() once to load the namespace, or otherwise @@ -1127,7 +1127,7 @@ ensure the namespace has already been loaded.

repository

-

A GIRepository or NULL for the singleton +

A GIRepository or NULL for the singleton process-global default GIRepository.

[allow-none] @@ -1147,7 +1147,7 @@ process-global default

Returns

GIBaseInfo representing metadata about name -, or NULL.

+, or NULL.

[transfer full]

@@ -1157,19 +1157,19 @@ process-global default void g_irepository_get_object_gtype_interfaces (GIRepository *repository, - GType gtype, - guint *n_interfaces_out, + GType gtype, + guint *n_interfaces_out, GIInterfaceInfo **interfaces_out);

Look up the implemented interfaces for gtype . This function -cannot fail per se; but for a totally "unknown" GType, it may +cannot fail per se; but for a totally "unknown" GType, it may return 0 implemented interfaces.

The semantics of this function are designed for a dynamic binding, where in certain cases (such as a function which returns an interface which may have "hidden" implementation classes), not all data may be statically known, and will have to be determined from -the GType of the object. An example is g_file_new_for_path() -returning a concrete class of GLocalFile, which is a GType we +the GType of the object. An example is g_file_new_for_path() +returning a concrete class of GLocalFile, which is a GType we see at runtime, but not statically.

Parameters

@@ -1182,12 +1182,12 @@ see at runtime, but not statically.

repository

-

a GIRepository, or NULL for the default repository.

+

a GIRepository, or NULL for the default repository.

[nullable]

gtype

-

a GType whose fundamental type is G_TYPE_OBJECT

+

a GType whose fundamental type is G_TYPE_OBJECT

  @@ -1209,9 +1209,9 @@ see at runtime, but not statically.


g_irepository_dump ()

-
gboolean
+
gboolean
 g_irepository_dump (const char *arg,
-                    GError **error);
+ GError **error);

Argument specified is a comma-separated pair of filenames; i.e. of the form "input.txt,output.xml". The input file should be a UTF-8 Unix-line-ending text file, with each line containing either @@ -1236,7 +1236,7 @@ overwrite its contents.

error

-

a GError

+

a GError

  @@ -1244,19 +1244,19 @@ overwrite its contents.

Returns

-

TRUE on success, FALSE on error

+

TRUE on success, FALSE on error


gi_cclosure_marshal_generic ()

void
-gi_cclosure_marshal_generic (GClosure *closure,
-                             GValue *return_gvalue,
-                             guint n_param_values,
-                             const GValue *param_values,
-                             gpointer invocation_hint,
-                             gpointer marshal_data);
+gi_cclosure_marshal_generic (GClosure *closure, + GValue *return_gvalue, + guint n_param_values, + const GValue *param_values, + gpointer invocation_hint, + gpointer marshal_data);

TODO

[skip]

@@ -1339,13 +1339,13 @@ accessed using the provided API.

#define G_IREPOSITORY_ERROR (g_irepository_error_quark ())
 

Error domain for GIRepository. Errors in this domain will be from the -GIRepositoryError enumeration. See GError for more information on +GIRepositoryError enumeration. See GError for more information on error domains.


enum GIRepositoryError

-

An error code used with G_IREPOSITORY_ERROR in a GError returned +

An error code used with G_IREPOSITORY_ERROR in a GError returned from a GIRepository routine.

Members

@@ -1394,6 +1394,6 @@ from a
+
Generated by GTK-Doc V1.28
\ No newline at end of file diff --git a/docs/reference/html/annotation-glossary.html b/docs/reference/html/annotation-glossary.html index 6bc0195..e824fb8 100644 --- a/docs/reference/html/annotation-glossary.html +++ b/docs/reference/html/annotation-glossary.html @@ -7,7 +7,7 @@ - + @@ -72,6 +72,6 @@ justifications.

Override the parsed C type with given type.

+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/docs/reference/html/api-index-1-30.html b/docs/reference/html/api-index-1-30.html index fd6ea34..6c38873 100644 --- a/docs/reference/html/api-index-1-30.html +++ b/docs/reference/html/api-index-1-30.html @@ -8,7 +8,7 @@ - + @@ -51,6 +51,6 @@
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/docs/reference/html/api-index-1-32.html b/docs/reference/html/api-index-1-32.html index 272d1d1..2953c96 100644 --- a/docs/reference/html/api-index-1-32.html +++ b/docs/reference/html/api-index-1-32.html @@ -8,7 +8,7 @@ - + @@ -29,6 +29,6 @@
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/docs/reference/html/api-index-1-34.html b/docs/reference/html/api-index-1-34.html index 4eef6ee..154aa2f 100644 --- a/docs/reference/html/api-index-1-34.html +++ b/docs/reference/html/api-index-1-34.html @@ -8,7 +8,7 @@ - + @@ -40,6 +40,6 @@
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/docs/reference/html/api-index-1-36.html b/docs/reference/html/api-index-1-36.html index 71654ca..3540358 100644 --- a/docs/reference/html/api-index-1-36.html +++ b/docs/reference/html/api-index-1-36.html @@ -8,7 +8,7 @@ - + @@ -29,6 +29,6 @@
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/docs/reference/html/api-index-1-42.html b/docs/reference/html/api-index-1-42.html index 7a67893..83e58c3 100644 --- a/docs/reference/html/api-index-1-42.html +++ b/docs/reference/html/api-index-1-42.html @@ -8,7 +8,7 @@ - + @@ -29,6 +29,6 @@
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/docs/reference/html/api-index-1-44.html b/docs/reference/html/api-index-1-44.html index ceb8e8f..292d5f1 100644 --- a/docs/reference/html/api-index-1-44.html +++ b/docs/reference/html/api-index-1-44.html @@ -8,7 +8,7 @@ - + @@ -29,6 +29,6 @@
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/docs/reference/html/api-index-1-46.html b/docs/reference/html/api-index-1-46.html index 422ed2e..8fffc34 100644 --- a/docs/reference/html/api-index-1-46.html +++ b/docs/reference/html/api-index-1-46.html @@ -8,7 +8,7 @@ - + @@ -29,6 +29,6 @@
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/docs/reference/html/api-index-1-60.html b/docs/reference/html/api-index-1-60.html index 59e6f34..a296072 100644 --- a/docs/reference/html/api-index-1-60.html +++ b/docs/reference/html/api-index-1-60.html @@ -8,7 +8,7 @@ - + @@ -57,6 +57,6 @@
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/docs/reference/html/api-index-deprecated.html b/docs/reference/html/api-index-deprecated.html index fbf3a57..09e919d 100644 --- a/docs/reference/html/api-index-deprecated.html +++ b/docs/reference/html/api-index-deprecated.html @@ -8,7 +8,7 @@ - + @@ -25,6 +25,6 @@
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/docs/reference/html/api-index-full.html b/docs/reference/html/api-index-full.html index 3dc4dcc..8fd47d8 100644 --- a/docs/reference/html/api-index-full.html +++ b/docs/reference/html/api-index-full.html @@ -8,7 +8,7 @@ - + @@ -1279,6 +1279,6 @@
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/docs/reference/html/ch01.html b/docs/reference/html/ch01.html index 4a8e0f6..da213ad 100644 --- a/docs/reference/html/ch01.html +++ b/docs/reference/html/ch01.html @@ -8,7 +8,7 @@ - + @@ -83,6 +83,6 @@ +
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/docs/reference/html/ch02.html b/docs/reference/html/ch02.html index f7e13dc..38223c4 100644 --- a/docs/reference/html/ch02.html +++ b/docs/reference/html/ch02.html @@ -8,7 +8,7 @@ - + @@ -27,6 +27,6 @@ +
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/docs/reference/html/ch03.html b/docs/reference/html/ch03.html index 800c54f..250f94a 100644 --- a/docs/reference/html/ch03.html +++ b/docs/reference/html/ch03.html @@ -8,7 +8,7 @@ - + @@ -27,6 +27,6 @@ +
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/docs/reference/html/gi-Common-Types.html b/docs/reference/html/gi-Common-Types.html index 80d3c55..40c9a7e 100644 --- a/docs/reference/html/gi-Common-Types.html +++ b/docs/reference/html/gi-Common-Types.html @@ -8,7 +8,7 @@ - + @@ -46,7 +46,7 @@ -const gchar * +const gchar * g_type_tag_to_string () @@ -113,7 +113,7 @@

g_type_tag_to_string ()

-
const gchar *
+
const gchar *
 g_type_tag_to_string (GITypeTag type);

Obtain a string representation of type

@@ -153,107 +153,107 @@ g_type_tag_to_string (

gboolean v_boolean;

+

gboolean v_boolean;

TODO

  -

gint8 v_int8;

+

gint8 v_int8;

TODO

  -

guint8 v_uint8;

+

guint8 v_uint8;

TODO

  -

gint16 v_int16;

+

gint16 v_int16;

TODO

  -

guint16 v_uint16;

+

guint16 v_uint16;

TODO

  -

gint32 v_int32;

+

gint32 v_int32;

TODO

  -

guint32 v_uint32;

+

guint32 v_uint32;

TODO

  -

gint64 v_int64;

+

gint64 v_int64;

TODO

  -

guint64 v_uint64;

+

guint64 v_uint64;

TODO

  -

gfloat v_float;

+

gfloat v_float;

TODO

  -

gdouble v_double;

+

gdouble v_double;

TODO

  -

gshort v_short;

+

gshort v_short;

TODO

  -

gushort v_ushort;

+

gushort v_ushort;

TODO

  -

gint v_int;

+

gint v_int;

TODO

  -

guint v_uint;

+

guint v_uint;

TODO

  -

glong v_long;

+

glong v_long;

TODO

  -

gulong v_ulong;

+

gulong v_ulong;

TODO

  -

gssize v_ssize;

+

gssize v_ssize;

TODO

  -

gsize v_size;

+

gsize v_size;

TODO

  -

gchar *v_string;

+

gchar *v_string;

TODO

  -

gpointer v_pointer;

+

gpointer v_pointer;

TODO

  @@ -361,7 +361,7 @@ g_type_tag_to_string (

GI_TYPE_TAG_GTYPE

-

a GType

+

a GType

  @@ -397,28 +397,28 @@ g_type_tag_to_string (

GI_TYPE_TAG_GLIST

-

a GList

+

a GList

 

GI_TYPE_TAG_GSLIST

-

a GSList

+

a GSList

 

GI_TYPE_TAG_GHASH

-

a GHashTable

+

a GHashTable

 

GI_TYPE_TAG_ERROR

-

a GError

+

a GError

  @@ -464,14 +464,14 @@ g_type_tag_to_string (

GI_ARRAY_TYPE_PTR_ARRAY

-

a GPtrArray array

+

a GPtrArray array

 

GI_ARRAY_TYPE_BYTE_ARRAY

-

a GByteArray array

+

a GByteArray array

  @@ -489,6 +489,6 @@ g_type_tag_to_string ( -
Generated by GTK-Doc V1.29.1
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/docs/reference/html/gi-GIArgInfo.html b/docs/reference/html/gi-GIArgInfo.html index 8dda174..79d702f 100644 --- a/docs/reference/html/gi-GIArgInfo.html +++ b/docs/reference/html/gi-GIArgInfo.html @@ -8,7 +8,7 @@ - + @@ -47,7 +47,7 @@ -gint +
gint g_arg_info_get_closure () @@ -55,7 +55,7 @@ -gint +gint g_arg_info_get_destroy () @@ -103,7 +103,7 @@ -gboolean +gboolean g_arg_info_may_be_null () @@ -111,7 +111,7 @@ -gboolean +gboolean g_arg_info_is_caller_allocates () @@ -119,7 +119,7 @@ -gboolean +gboolean g_arg_info_is_optional () @@ -127,7 +127,7 @@ -gboolean +gboolean g_arg_info_is_return_value () @@ -135,7 +135,7 @@ -gboolean +gboolean g_arg_info_is_skip () @@ -209,7 +209,7 @@ part of a

g_arg_info_get_closure ()

-
gint
+
gint
 g_arg_info_get_closure (GIArgInfo *info);

Obtain the index of the user data argument. This is only valid for arguments which are callbacks.

@@ -236,9 +236,9 @@ for arguments which are callbacks.


g_arg_info_get_destroy ()

-
gint
+
gint
 g_arg_info_get_destroy (GIArgInfo *info);
-

Obtains the index of the GDestroyNotify argument. This is only valid +

Obtains the index of the GDestroyNotify argument. This is only valid for arguments which are callbacks.

Parameters

@@ -257,7 +257,7 @@ for arguments which are callbacks.

Returns

-

index of the GDestroyNotify argument or -1 if there is none

+

index of the GDestroyNotify argument or -1 if there is none


@@ -414,11 +414,11 @@ allocation.


g_arg_info_may_be_null ()

-
gboolean
+
gboolean
 g_arg_info_may_be_null (GIArgInfo *info);
-

Obtain if the type of the argument includes the possibility of NULL. -For 'in' values this means that NULL is a valid value. For 'out' -values, this means that NULL may be returned.

+

Obtain if the type of the argument includes the possibility of NULL. +For 'in' values this means that NULL is a valid value. For 'out' +values, this means that NULL may be returned.

See also g_arg_info_is_optional().

Parameters

@@ -437,18 +437,18 @@ values, this means that NULL may be returned.

Returns

-

TRUE if the value may be NULL

+

TRUE if the value may be NULL


g_arg_info_is_caller_allocates ()

-
gboolean
+
gboolean
 g_arg_info_is_caller_allocates (GIArgInfo *info);

Obtain if the argument is a pointer to a struct or object that will receive an output of a function. The default assumption for GI_DIRECTION_OUT arguments which have allocation is that the -callee allocates; if this is TRUE, then the caller must allocate.

+callee allocates; if this is TRUE, then the caller must allocate.

Parameters

@@ -466,16 +466,16 @@ callee allocates; if this is TRUE, then the caller

Returns

-

TRUE if caller is required to have allocated the argument

+

TRUE if caller is required to have allocated the argument


g_arg_info_is_optional ()

-
gboolean
+
gboolean
 g_arg_info_is_optional (GIArgInfo *info);

Obtain if the argument is optional. For 'out' arguments this means -that you can pass NULL in order to ignore the result.

+that you can pass NULL in order to ignore the result.

Parameters

@@ -493,13 +493,13 @@ that you can pass NULL in order to ignore the resul

Returns

-

TRUE if it is an optional argument

+

TRUE if it is an optional argument


g_arg_info_is_return_value ()

-
gboolean
+
gboolean
 g_arg_info_is_return_value (GIArgInfo *info);

Obtain if the argument is a return value. It can either be a parameter or a return value.

@@ -520,13 +520,13 @@ parameter or a return value.

Returns

-

TRUE if it is a return value

+

TRUE if it is a return value


g_arg_info_is_skip ()

-
gboolean
+
gboolean
 g_arg_info_is_skip (GIArgInfo *info);

Obtain if an argument is only useful in C.

@@ -546,7 +546,7 @@ g_arg_info_is_skip (

Returns

-

TRUE if argument is only useful in C.

+

TRUE if argument is only useful in C.

Since: 1.30

@@ -686,7 +686,7 @@ up the resources of this transfer.

transfer the container (list, array, hash table) from the callee to the caller. The callee retains the ownership of the individual items in the container and the caller has to free up the container resources -(g_list_free()/g_hash_table_destroy() etc) of this transfer.

+(g_list_free()/g_hash_table_destroy() etc) of this transfer.

@@ -707,6 +707,6 @@ cleaning up the container and item resources of this transfer.

+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/docs/reference/html/gi-GICallableInfo.html b/docs/reference/html/gi-GICallableInfo.html index b8658bd..65dab44 100644 --- a/docs/reference/html/gi-GICallableInfo.html +++ b/docs/reference/html/gi-GICallableInfo.html @@ -8,7 +8,7 @@ - + @@ -47,7 +47,7 @@
-
 
-gboolean +gboolean g_callable_info_can_throw_gerror () @@ -55,7 +55,7 @@
-gint +gint g_callable_info_get_n_args () @@ -86,7 +86,7 @@
const gchar * +const gchar * g_callable_info_get_return_attribute () @@ -102,7 +102,7 @@
-gboolean +gboolean g_callable_info_invoke () @@ -110,7 +110,7 @@
-gboolean +gboolean g_callable_info_is_method () @@ -118,7 +118,7 @@
-gboolean +gboolean g_callable_info_iterate_return_attributes () @@ -142,7 +142,7 @@
-gboolean +gboolean g_callable_info_may_return_null () @@ -150,7 +150,7 @@
-gboolean +gboolean g_callable_info_skip_return () @@ -216,7 +216,7 @@ direction and a flag which decides if it returns null.


g_callable_info_can_throw_gerror ()

-
gboolean
+
gboolean
 g_callable_info_can_throw_gerror (GICallableInfo *info);

TODO

@@ -236,14 +236,14 @@ g_callable_info_can_throw_gerror (

Returns

-

TRUE if this GICallableInfo can throw a GError

+

TRUE if this GICallableInfo can throw a GError

Since: 1.34


g_callable_info_get_n_args ()

-
gint
+
gint
 g_callable_info_get_n_args (GICallableInfo *info);

Obtain the number of arguments (both IN and OUT) for this callable.

@@ -271,7 +271,7 @@ g_callable_info_get_n_args (

g_callable_info_get_arg ()

GIArgInfo *
 g_callable_info_get_arg (GICallableInfo *info,
-                         gint n);
+ gint n);

Obtain information about a particular argument of this callable.

Parameters

@@ -361,9 +361,9 @@ g_callable_info_get_instance_ownership_transfer

g_callable_info_get_return_attribute ()

-
const gchar *
+
const gchar *
 g_callable_info_get_return_attribute (GICallableInfo *info,
-                                      const gchar *name);
+ const gchar *name);

Retrieve an arbitrary attribute associated with the return value.

Parameters

@@ -389,7 +389,7 @@ g_callable_info_get_return_attribute (

Returns

-

The value of the attribute, or NULL if no such attribute exists

+

The value of the attribute, or NULL if no such attribute exists


@@ -423,17 +423,17 @@ g_callable_info_get_return_type (

g_callable_info_invoke ()

-
gboolean
+
gboolean
 g_callable_info_invoke (GICallableInfo *info,
-                        gpointer function,
+                        gpointer function,
                         const GIArgument *in_args,
                         int n_in_args,
                         const GIArgument *out_args,
                         int n_out_args,
                         GIArgument *return_value,
-                        gboolean is_method,
-                        gboolean throws,
-                        GError **error);
+ gboolean is_method, + gboolean throws, + GError **error);

TODO

Parameters

@@ -501,7 +501,7 @@ g_callable_info_invoke (

g_callable_info_is_method ()

-
gboolean
+
gboolean
 g_callable_info_is_method (GICallableInfo *info);

Determines if the callable info is a method. For GIVFuncInfos, GICallbackInfos, and GISignalInfos, @@ -528,15 +528,15 @@ or "this" object.

Returns

-

TRUE if info -is a method, FALSE otherwise

+

TRUE if info +is a method, FALSE otherwise

Since: 1.34


g_callable_info_iterate_return_attributes ()

-
gboolean
+
gboolean
 g_callable_info_iterate_return_attributes
                                (GICallableInfo *info,
                                 GIAttributeIter *iterator,
@@ -544,7 +544,7 @@ g_callable_info_iterate_return_attributes
                                 char **value);

Iterate over all attributes associated with the return value. The iterator structure is typically stack allocated, and must have its -first member initialized to NULL.

+first member initialized to NULL.

Both the name and value should be treated as constants @@ -585,7 +585,7 @@ similar API.

Returns

-

TRUE if there are more attributes

+

TRUE if there are more attributes


@@ -593,7 +593,7 @@ similar API.

g_callable_info_load_arg ()

void
 g_callable_info_load_arg (GICallableInfo *info,
-                          gint n,
+                          gint n,
                           GIArgInfo *arg);

Obtain information about a particular argument of this callable; this function is a variant of g_callable_info_get_arg() designed for stack @@ -669,9 +669,9 @@ allocation.


g_callable_info_may_return_null ()

-
gboolean
+
gboolean
 g_callable_info_may_return_null (GICallableInfo *info);
-

See if a callable could return NULL.

+

See if a callable could return NULL.

Parameters

@@ -689,13 +689,13 @@ g_callable_info_may_return_null (

Returns

-

TRUE if callable could return NULL

+

TRUE if callable could return NULL


g_callable_info_skip_return ()

-
gboolean
+
gboolean
 g_callable_info_skip_return (GICallableInfo *info);

See if a callable's return value is only useful in C.

@@ -715,7 +715,7 @@ g_callable_info_skip_return (

Returns

-

TRUE if return value is only useful in C.

+

TRUE if return value is only useful in C.

@@ -731,6 +731,6 @@ g_callable_info_skip_return ( -
Generated by GTK-Doc V1.29.1 +
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/docs/reference/html/gi-GICallbackInfo.html b/docs/reference/html/gi-GICallbackInfo.html index e50c68f..d240b9a 100644 --- a/docs/reference/html/gi-GICallbackInfo.html +++ b/docs/reference/html/gi-GICallbackInfo.html @@ -8,7 +8,7 @@ - + @@ -73,6 +73,6 @@ +
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/docs/reference/html/gi-GIConstantInfo.html b/docs/reference/html/gi-GIConstantInfo.html index 72c2676..0676064 100644 --- a/docs/reference/html/gi-GIConstantInfo.html +++ b/docs/reference/html/gi-GIConstantInfo.html @@ -8,7 +8,7 @@ - + @@ -63,7 +63,7 @@
- -
-gint +gint g_constant_info_get_value () @@ -184,7 +184,7 @@ g_constant_info_get_type (

g_constant_info_get_value ()

-
gint
+
gint
 g_constant_info_get_value (GIConstantInfo *info,
                            GIArgument *value);

Obtain the value associated with the GIConstantInfo and store it in the @@ -234,6 +234,6 @@ Free the value with -


Generated by GTK-Doc V1.29.1 +
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/docs/reference/html/gi-GIEnumInfo.html b/docs/reference/html/gi-GIEnumInfo.html index 7c02e4b..28f3306 100644 --- a/docs/reference/html/gi-GIEnumInfo.html +++ b/docs/reference/html/gi-GIEnumInfo.html @@ -8,7 +8,7 @@ - + @@ -53,7 +53,7 @@
-gint +gint g_enum_info_get_n_values () @@ -69,7 +69,7 @@
-gint +gint g_enum_info_get_n_methods () @@ -92,7 +92,7 @@
const gchar * +const gchar * g_enum_info_get_error_domain () @@ -100,7 +100,7 @@
-gint64 +gint64 g_value_info_get_value () @@ -184,7 +184,7 @@ The GIValueInfo is fetched by calling

g_enum_info_get_n_values ()

-
gint
+
gint
 g_enum_info_get_n_values (GIEnumInfo *info);

Obtain the number of values this enumeration contains.

@@ -212,7 +212,7 @@ g_enum_info_get_n_values (

g_enum_info_get_value ()

GIValueInfo *
 g_enum_info_get_value (GIEnumInfo *info,
-                       gint n);
+ gint n);

Obtain a value for this enumeration.

Parameters

@@ -238,7 +238,7 @@ g_enum_info_get_value (

Returns

-

the enumeration value or NULL if type tag is wrong, +

the enumeration value or NULL if type tag is wrong, free the struct with g_base_info_unref() when done.

[transfer full]

@@ -246,7 +246,7 @@ free the struct with

g_enum_info_get_n_methods ()

-
gint
+
gint
 g_enum_info_get_n_methods (GIEnumInfo *info);

Obtain the number of methods that this enum type has.

@@ -275,7 +275,7 @@ g_enum_info_get_n_methods (

g_enum_info_get_method ()

GIFunctionInfo *
 g_enum_info_get_method (GIEnumInfo *info,
-                        gint n);
+ gint n);

Obtain an enum type method at index n .

@@ -341,7 +341,7 @@ may not match the sign of the type used by the C compiler.


g_enum_info_get_error_domain ()

-
const gchar *
+
const gchar *
 g_enum_info_get_error_domain (GIEnumInfo *info);

Obtain the string form of the quark for the error domain associated with this enum, if any.

@@ -363,7 +363,7 @@ this enum, if any.

Returns

the string form of the error domain associated -with this enum, or NULL.

+with this enum, or NULL.

[transfer none]

Since: 1.30

@@ -371,7 +371,7 @@ with this enum, or NULL.


g_value_info_get_value ()

-
gint64
+
gint64
 g_value_info_get_value (GIValueInfo *info);

Obtain the enumeration value of the GIValueInfo.

@@ -408,6 +408,6 @@ return type is to allow both.

+
Generated by GTK-Doc V1.28
\ No newline at end of file diff --git a/docs/reference/html/gi-GIFieldInfo.html b/docs/reference/html/gi-GIFieldInfo.html index 8bb754f..e40090c 100644 --- a/docs/reference/html/gi-GIFieldInfo.html +++ b/docs/reference/html/gi-GIFieldInfo.html @@ -8,7 +8,7 @@ - + @@ -47,7 +47,7 @@
-gboolean +gboolean g_field_info_get_field () @@ -55,7 +55,7 @@
-gboolean +gboolean g_field_info_set_field () @@ -71,7 +71,7 @@
-gint +gint g_field_info_get_offset () @@ -79,7 +79,7 @@
-gint +gint g_field_info_get_size () @@ -157,9 +157,9 @@ which is currently

g_field_info_get_field ()

-
gboolean
+
gboolean
 g_field_info_get_field (GIFieldInfo *field_info,
-                        gpointer mem,
+                        gpointer mem,
                         GIArgument *value);

Reads a field identified by a GIFieldInfo from a C structure or union. This only handles fields of simple C types. It will fail @@ -195,15 +195,15 @@ even if that is actually readable.

Returns

-

TRUE if reading the field succeeded, otherwise FALSE

+

TRUE if reading the field succeeded, otherwise FALSE


g_field_info_set_field ()

-
gboolean
+
gboolean
 g_field_info_set_field (GIFieldInfo *field_info,
-                        gpointer mem,
+                        gpointer mem,
                         const GIArgument *value);

Writes a field identified by a GIFieldInfo to a C structure or union. This only handles fields of simple C types. It will fail @@ -241,7 +241,7 @@ with a type such as 'char *' must be set with a setter function.

Returns

-

TRUE if writing the field succeeded, otherwise FALSE

+

TRUE if writing the field succeeded, otherwise FALSE


@@ -274,7 +274,7 @@ flag values.


g_field_info_get_offset ()

-
gint
+
gint
 g_field_info_get_offset (GIFieldInfo *info);

Obtain the offset in bytes of the field member, this is relative to the beginning of the struct or union.

@@ -301,7 +301,7 @@ to the beginning of the struct or union.


g_field_info_get_size ()

-
gint
+
gint
 g_field_info_get_size (GIFieldInfo *info);

Obtain the size in bits of the field member, this is how much space you need to allocate to store the field.

@@ -396,6 +396,6 @@ g_field_info_get_type ( -
Generated by GTK-Doc V1.29.1
+
Generated by GTK-Doc V1.28
\ No newline at end of file diff --git a/docs/reference/html/gi-GIFunctionInfo.html b/docs/reference/html/gi-GIFunctionInfo.html index e739743..f66ec8e 100644 --- a/docs/reference/html/gi-GIFunctionInfo.html +++ b/docs/reference/html/gi-GIFunctionInfo.html @@ -8,7 +8,7 @@ - + @@ -62,7 +62,7 @@
const gchar * +const gchar * g_function_info_get_symbol () @@ -78,7 +78,7 @@
-gboolean +gboolean g_function_info_invoke () @@ -86,7 +86,7 @@
-GQuark +GQuark g_invoke_error_quark () @@ -198,7 +198,7 @@ g_function_info_get_property (GIFunctionInfo. Only GIFunctionInfo with the flag GI_FUNCTION_IS_GETTER or GI_FUNCTION_IS_SETTER have a property set. For other cases, -NULL will be returned.

+NULL will be returned.

Parameters

@@ -216,7 +216,7 @@ Only

Returns

-

the property or NULL if not set. Free it with +

the property or NULL if not set. Free it with g_base_info_unref() when done.

[transfer full]

@@ -224,11 +224,11 @@ Only

g_function_info_get_symbol ()

-
const gchar *
+
const gchar *
 g_function_info_get_symbol (GIFunctionInfo *info);

Obtain the symbol of the function. The symbol is the name of the exported function, suitable to be used as an argument to -g_module_symbol().

+g_module_symbol().

Parameters

@@ -256,7 +256,7 @@ exported function, suitable to be used as an argument to g_function_info_get_vfunc (GIFunctionInfo *info);

Obtain the virtual function associated with this GIFunctionInfo. Only GIFunctionInfo with the flag GI_FUNCTION_WRAPS_VFUNC has -a virtual function set. For other cases, NULL will be returned.

+a virtual function set. For other cases, NULL will be returned.

Parameters

@@ -274,7 +274,7 @@ a virtual function set. For other cases, NULL will

Returns

-

the virtual function or NULL if not set. +

the virtual function or NULL if not set. Free it by calling g_base_info_unref() when done.

[transfer full]

@@ -282,21 +282,21 @@ Free it by calling

g_function_info_invoke ()

-
gboolean
+
gboolean
 g_function_info_invoke (GIFunctionInfo *info,
                         const GIArgument *in_args,
                         int n_in_args,
                         const GIArgument *out_args,
                         int n_out_args,
                         GIArgument *return_value,
-                        GError **error);
+ GError **error);

Invokes the function described in info with the given arguments. Note that inout parameters must appear in both argument lists. This function uses dlsym() to obtain a pointer to the function, so the library or shared object containing the described function must either be linked to the caller, or must -have been g_module_symbol()ed before calling this function.

+have been g_module_symbol()ed before calling this function.

[skip]

Parameters

@@ -317,7 +317,7 @@ have been g_module_symbol()ed before calling this
+can be NULL.

@@ -331,7 +331,7 @@ array

+may be NULL.

@@ -345,12 +345,12 @@ array

+NULL

- + @@ -358,14 +358,14 @@ may be

Returns

-

TRUE if the function has been invoked, FALSE if an +

TRUE if the function has been invoked, FALSE if an error occurred.


g_invoke_error_quark ()

-
GQuark
+
GQuark
 g_invoke_error_quark (void);

TODO

@@ -492,6 +492,6 @@ the expected arguments for the functions type signature.

+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/docs/reference/html/gi-GIInterfaceInfo.html b/docs/reference/html/gi-GIInterfaceInfo.html index f594544..ab3d986 100644 --- a/docs/reference/html/gi-GIInterfaceInfo.html +++ b/docs/reference/html/gi-GIInterfaceInfo.html @@ -8,7 +8,7 @@ - + @@ -47,7 +47,7 @@ - -

an array of GIArguments, one for each in parameter of info . If there are no in parameter, in_args -can be NULL.

[array length=n_in_args]

an array of GIArguments, one for each out parameter of info . If there are no out parameters, out_args -may be NULL.

[array length=n_out_args]

return location for the return value of the function. If the function returns void, return_value may be -NULL

 

error

return location for detailed error information, or NULL

return location for detailed error information, or NULL

 
-gint +gint g_interface_info_get_n_prerequisites () @@ -63,7 +63,7 @@
-gint +gint g_interface_info_get_n_properties () @@ -79,7 +79,7 @@
-gint +gint g_interface_info_get_n_methods () @@ -103,7 +103,7 @@
-gint +gint g_interface_info_get_n_signals () @@ -127,7 +127,7 @@
-gint +gint g_interface_info_get_n_vfuncs () @@ -151,7 +151,7 @@
-gint +gint g_interface_info_get_n_constants () @@ -191,7 +191,7 @@

Description

-

GIInterfaceInfo represents a GInterface type.

+

GIInterfaceInfo represents a GInterface type.

A GInterface has methods, fields, properties, signals, interfaces, constants, virtual functions and prerequisites.

@@ -229,7 +229,7 @@ virtual functions and prerequisites.


g_interface_info_get_n_prerequisites ()

-
gint
+
gint
 g_interface_info_get_n_prerequisites (GIInterfaceInfo *info);

Obtain the number of prerequisites for this interface type. A prerequisites is another interface that needs to be implemented for @@ -259,7 +259,7 @@ interface, similar to an base class for GObjects.

g_interface_info_get_prerequisite ()

GIBaseInfo *
 g_interface_info_get_prerequisite (GIInterfaceInfo *info,
-                                   gint n);
+ gint n);

Obtain an interface type prerequisites index n .

@@ -294,7 +294,7 @@ g_interface_info_get_prerequisite (

g_interface_info_get_n_properties ()

-
gint
+
gint
 g_interface_info_get_n_properties (GIInterfaceInfo *info);

Obtain the number of properties that this interface type has.

@@ -322,7 +322,7 @@ g_interface_info_get_n_properties (

g_interface_info_get_property ()

GIPropertyInfo *
 g_interface_info_get_property (GIInterfaceInfo *info,
-                               gint n);
+ gint n);

Obtain an interface type property at index n .

@@ -357,7 +357,7 @@ g_interface_info_get_property (

g_interface_info_get_n_methods ()

-
gint
+
gint
 g_interface_info_get_n_methods (GIInterfaceInfo *info);

Obtain the number of methods that this interface type has.

@@ -385,7 +385,7 @@ g_interface_info_get_n_methods (

g_interface_info_get_method ()

GIFunctionInfo *
 g_interface_info_get_method (GIInterfaceInfo *info,
-                             gint n);
+ gint n);

Obtain an interface type method at index n .

@@ -422,9 +422,9 @@ g_interface_info_get_method (

g_interface_info_find_method ()

GIFunctionInfo *
 g_interface_info_find_method (GIInterfaceInfo *info,
-                              const gchar *name);
+ const gchar *name);

Obtain a method of the interface type given a name -. NULL will be +. NULL will be returned if there's no method available with that name.

Parameters

@@ -450,7 +450,7 @@ returned if there's no method available with that name.

Returns

-

the GIFunctionInfo or NULL if none found. +

the GIFunctionInfo or NULL if none found. Free the struct by calling g_base_info_unref() when done.

[transfer full]

@@ -458,7 +458,7 @@ Free the struct by calling

g_interface_info_get_n_signals ()

-
gint
+
gint
 g_interface_info_get_n_signals (GIInterfaceInfo *info);

Obtain the number of signals that this interface type has.

@@ -486,7 +486,7 @@ g_interface_info_get_n_signals (

g_interface_info_get_signal ()

GISignalInfo *
 g_interface_info_get_signal (GIInterfaceInfo *info,
-                             gint n);
+ gint n);

Obtain an interface type signal at index n .

@@ -523,7 +523,7 @@ g_interface_info_get_signal (

g_interface_info_find_signal ()

GISignalInfo *
 g_interface_info_find_signal (GIInterfaceInfo *info,
-                              const gchar *name);
+ const gchar *name);

TODO

Parameters

@@ -552,7 +552,7 @@ g_interface_info_find_signal (name in info , or -NULL on failure.

+
NULL on failure.

[transfer full]

Since: 1.34

@@ -560,7 +560,7 @@ in info

g_interface_info_get_n_vfuncs ()

-
gint
+
gint
 g_interface_info_get_n_vfuncs (GIInterfaceInfo *info);

Obtain the number of virtual functions that this interface type has.

@@ -588,7 +588,7 @@ g_interface_info_get_n_vfuncs (

g_interface_info_get_vfunc ()

GIVFuncInfo *
 g_interface_info_get_vfunc (GIInterfaceInfo *info,
-                            gint n);
+ gint n);

Obtain an interface type virtual function at index n .

@@ -625,7 +625,7 @@ g_interface_info_get_vfunc (

g_interface_info_find_vfunc ()

GIVFuncInfo *
 g_interface_info_find_vfunc (GIInterfaceInfo *info,
-                             const gchar *name);
+ const gchar *name);

Locate a virtual function slot with name name . See the documentation for g_object_info_find_vfunc() for more information on virtuals.

@@ -653,7 +653,7 @@ for

Returns

-

the GIVFuncInfo, or NULL. Free it with +

the GIVFuncInfo, or NULL. Free it with g_base_info_unref() when done.

[transfer full]

@@ -661,7 +661,7 @@ for

g_interface_info_get_n_constants ()

-
gint
+
gint
 g_interface_info_get_n_constants (GIInterfaceInfo *info);

Obtain the number of constants that this interface type has.

@@ -689,7 +689,7 @@ g_interface_info_get_n_constants (

g_interface_info_get_constant ()

GIConstantInfo *
 g_interface_info_get_constant (GIInterfaceInfo *info,
-                               gint n);
+ gint n);

Obtain an interface type constant at index n .

@@ -726,7 +726,7 @@ g_interface_info_get_constant (

g_interface_info_get_iface_struct ()

GIStructInfo *
 g_interface_info_get_iface_struct (GIInterfaceInfo *info);
-

Returns the layout C structure associated with this GInterface.

+

Returns the layout C structure associated with this GInterface.

Parameters

@@ -744,7 +744,7 @@ g_interface_info_get_iface_struct (

Returns

-

the GIStructInfo or NULL. Free it with +

the GIStructInfo or NULL. Free it with g_base_info_unref() when done.

[transfer full]

@@ -761,6 +761,6 @@ g_interface_info_get_iface_struct ( +
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/docs/reference/html/gi-GIObjectInfo.html b/docs/reference/html/gi-GIObjectInfo.html index aa1b27a..5aac736 100644 --- a/docs/reference/html/gi-GIObjectInfo.html +++ b/docs/reference/html/gi-GIObjectInfo.html @@ -8,7 +8,7 @@ - + @@ -47,7 +47,7 @@
- - - + @@ -1543,7 +1543,7 @@ the base classes of this type, starting at the top type.

GIObjectInfoGetValueFunction ()

void *
-(*GIObjectInfoGetValueFunction) (const GValue *value);
+(*GIObjectInfoGetValueFunction) (const GValue *value);

Extract an object instance out of value

[skip]

@@ -1557,7 +1557,7 @@ the base classes of this type, starting at the top type.

- +
-gboolean +gboolean g_object_info_get_abstract () @@ -55,7 +55,7 @@
-gboolean +gboolean g_object_info_get_fundamental () @@ -70,14 +70,14 @@
const gchar * +const gchar * g_object_info_get_type_name ()
const gchar * +const gchar * g_object_info_get_type_init () @@ -85,7 +85,7 @@
-gint +gint g_object_info_get_n_constants () @@ -101,7 +101,7 @@
-gint +gint g_object_info_get_n_fields () @@ -117,7 +117,7 @@
-gint +gint g_object_info_get_n_interfaces () @@ -133,7 +133,7 @@
-gint +gint g_object_info_get_n_methods () @@ -165,7 +165,7 @@
-gint +gint g_object_info_get_n_properties () @@ -181,7 +181,7 @@
-gint +gint g_object_info_get_n_signals () @@ -205,7 +205,7 @@
-gint +gint g_object_info_get_n_vfuncs () @@ -353,7 +353,7 @@

Description

-

GIObjectInfo represents a GObject. This doesn't represent a specific +

GIObjectInfo represents a GObject. This doesn't represent a specific instance of a GObject, instead this represent the object type (eg class).

A GObject has methods, fields, properties, signals, interfaces, constants and virtual functions.

@@ -392,7 +392,7 @@ and virtual functions.


g_object_info_get_abstract ()

-
gboolean
+
gboolean
 g_object_info_get_abstract (GIObjectInfo *info);

Obtain if the object type is an abstract type, eg if it cannot be instantiated

@@ -413,13 +413,13 @@ instantiated

Returns

-

TRUE if the object type is abstract

+

TRUE if the object type is abstract


g_object_info_get_fundamental ()

-
gboolean
+
gboolean
 g_object_info_get_fundamental (GIObjectInfo *info);

Obtain if the object type is of a fundamental type which is not G_TYPE_OBJECT. This is mostly for supporting GstMiniObject.

@@ -440,7 +440,7 @@ G_TYPE_OBJECT. This is mostly for supporting GstMiniObject.

Returns

-

TRUE if the object type is a fundamental type

+

TRUE if the object type is a fundamental type


@@ -474,7 +474,7 @@ g_object_info_get_parent (

g_object_info_get_type_name ()

-
const gchar *
+
const gchar *
 g_object_info_get_type_name (GIObjectInfo *info);

Obtain the name of the objects class/type.

@@ -500,7 +500,7 @@ g_object_info_get_type_name (

g_object_info_get_type_init ()

-
const gchar *
+
const gchar *
 g_object_info_get_type_init (GIObjectInfo *info);

Obtain the function which when called will return the GType function for which this object type is registered.

@@ -527,7 +527,7 @@ function for which this object type is registered.


g_object_info_get_n_constants ()

-
gint
+
gint
 g_object_info_get_n_constants (GIObjectInfo *info);

Obtain the number of constants that this object type has.

@@ -555,7 +555,7 @@ g_object_info_get_n_constants (

g_object_info_get_constant ()

GIConstantInfo *
 g_object_info_get_constant (GIObjectInfo *info,
-                            gint n);
+ gint n);

Obtain an object type constant at index n .

@@ -590,7 +590,7 @@ g_object_info_get_constant (

g_object_info_get_n_fields ()

-
gint
+
gint
 g_object_info_get_n_fields (GIObjectInfo *info);

Obtain the number of fields that this object type has.

@@ -618,7 +618,7 @@ g_object_info_get_n_fields (

g_object_info_get_field ()

GIFieldInfo *
 g_object_info_get_field (GIObjectInfo *info,
-                         gint n);
+ gint n);

Obtain an object type field at index n .

@@ -653,7 +653,7 @@ g_object_info_get_field (

g_object_info_get_n_interfaces ()

-
gint
+
gint
 g_object_info_get_n_interfaces (GIObjectInfo *info);

Obtain the number of interfaces that this object type has.

@@ -681,7 +681,7 @@ g_object_info_get_n_interfaces (

g_object_info_get_interface ()

GIInterfaceInfo *
 g_object_info_get_interface (GIObjectInfo *info,
-                             gint n);
+ gint n);

Obtain an object type interface at index n .

@@ -716,7 +716,7 @@ g_object_info_get_interface (

g_object_info_get_n_methods ()

-
gint
+
gint
 g_object_info_get_n_methods (GIObjectInfo *info);

Obtain the number of methods that this object type has.

@@ -744,7 +744,7 @@ g_object_info_get_n_methods (

g_object_info_get_method ()

GIFunctionInfo *
 g_object_info_get_method (GIObjectInfo *info,
-                          gint n);
+ gint n);

Obtain an object type method at index n .

@@ -781,9 +781,9 @@ g_object_info_get_method (

g_object_info_find_method ()

GIFunctionInfo *
 g_object_info_find_method (GIObjectInfo *info,
-                           const gchar *name);
+ const gchar *name);

Obtain a method of the object type given a name -. NULL will be +. NULL will be returned if there's no method available with that name.

Parameters

@@ -820,12 +820,12 @@ returned if there's no method available with that name.

GIFunctionInfo *
 g_object_info_find_method_using_interfaces
                                (GIObjectInfo *info,
-                                const gchar *name,
+                                const gchar *name,
                                 GIObjectInfo **implementor);

Obtain a method of the object given a name , searching both the object info - and any interfaces it implements. NULL will be + and any interfaces it implements. NULL will be returned if there's no method available with that name.

Note that this function does *not* search parent classes; you will have to chain up if that's desired.

@@ -866,7 +866,7 @@ to chain up if that's desired.


g_object_info_get_n_properties ()

-
gint
+
gint
 g_object_info_get_n_properties (GIObjectInfo *info);

Obtain the number of properties that this object type has.

@@ -894,7 +894,7 @@ g_object_info_get_n_properties (

g_object_info_get_property ()

GIPropertyInfo *
 g_object_info_get_property (GIObjectInfo *info,
-                            gint n);
+ gint n);

Obtain an object type property at index n .

@@ -929,7 +929,7 @@ g_object_info_get_property (

g_object_info_get_n_signals ()

-
gint
+
gint
 g_object_info_get_n_signals (GIObjectInfo *info);

Obtain the number of signals that this object type has.

@@ -957,7 +957,7 @@ g_object_info_get_n_signals (

g_object_info_get_signal ()

GISignalInfo *
 g_object_info_get_signal (GIObjectInfo *info,
-                          gint n);
+ gint n);

Obtain an object type signal at index n .

@@ -994,7 +994,7 @@ g_object_info_get_signal (

g_object_info_find_signal ()

GISignalInfo *
 g_object_info_find_signal (GIObjectInfo *info,
-                           const gchar *name);
+ const gchar *name);

TODO

Parameters

@@ -1022,14 +1022,14 @@ g_object_info_find_signal (

Returns

Info for the signal with name name in info -, or NULL on failure.

+, or NULL on failure.

[transfer full]


g_object_info_get_n_vfuncs ()

-
gint
+
gint
 g_object_info_get_n_vfuncs (GIObjectInfo *info);

Obtain the number of virtual functions that this object type has.

@@ -1057,7 +1057,7 @@ g_object_info_get_n_vfuncs (

g_object_info_get_vfunc ()

GIVFuncInfo *
 g_object_info_get_vfunc (GIObjectInfo *info,
-                         gint n);
+ gint n);

Obtain an object type virtual function at index n .

@@ -1094,12 +1094,12 @@ g_object_info_get_vfunc (

g_object_info_find_vfunc ()

GIVFuncInfo *
 g_object_info_find_vfunc (GIObjectInfo *info,
-                          const gchar *name);
+ const gchar *name);

Locate a virtual function slot with name name . Note that the namespace for virtuals is distinct from that of methods; there may or may not be a concrete method associated for a virtual. If there is one, it may -be retrieved using g_vfunc_info_get_invoker(), otherwise NULL will be +be retrieved using g_vfunc_info_get_invoker(), otherwise NULL will be returned. See the documentation for g_vfunc_info_get_invoker() for more information on invoking virtuals.

@@ -1127,7 +1127,7 @@ information on invoking virtuals.

Returns

-

the GIVFuncInfo, or NULL. Free it with +

the GIVFuncInfo, or NULL. Free it with g_base_info_unref() when done.

[transfer full]

@@ -1138,7 +1138,7 @@ information on invoking virtuals.

GIVFuncInfo *
 g_object_info_find_vfunc_using_interfaces
                                (GIObjectInfo *info,
-                                const gchar *name,
+                                const gchar *name,
                                 GIObjectInfo **implementor);

Locate a virtual function slot with name name , searching both the object @@ -1146,7 +1146,7 @@ g_object_info_find_vfunc_using_interfaces and any interfaces it implements. Note that the namespace for virtuals is distinct from that of methods; there may or may not be a concrete method associated for a virtual. If there is one, it may be -retrieved using g_vfunc_info_get_invoker(), otherwise NULL will be +retrieved using g_vfunc_info_get_invoker(), otherwise NULL will be returned.

Note that this function does *not* search parent classes; you will have to chain up if that's desired.

@@ -1189,7 +1189,7 @@ to chain up if that's desired.

g_object_info_get_class_struct ()

GIStructInfo *
 g_object_info_get_class_struct (GIObjectInfo *info);
-

Every GObject has two structures; an instance structure and a class +

Every GObject has two structures; an instance structure and a class structure. This function returns the metadata for the class structure.

Parameters

@@ -1208,7 +1208,7 @@ structure. This function returns the metadata for the class structure.

Returns

-

the GIStructInfo or NULL. Free with +

the GIStructInfo or NULL. Free with g_base_info_unref() when done.

[transfer full]

@@ -1239,7 +1239,7 @@ see

Returns

-

the symbol or NULL

+

the symbol or NULL


@@ -1270,7 +1270,7 @@ the base classes of this type, starting at the top type.

Returns

-

the function pointer or NULL

+

the function pointer or NULL


@@ -1299,7 +1299,7 @@ see

Returns

-

the symbol or NULL

+

the symbol or NULL


@@ -1330,7 +1330,7 @@ the base classes of this type, starting at the top type.

Returns

-

the function pointer or NULL

+

the function pointer or NULL


@@ -1360,7 +1360,7 @@ see

Returns

-

the symbol or NULL

+

the symbol or NULL


@@ -1391,7 +1391,7 @@ the base classes of this type, starting at the top type.

Returns

-

the function pointer or NULL

+

the function pointer or NULL


@@ -1421,7 +1421,7 @@ see

Returns

-

the symbol or NULL

+

the symbol or NULL


@@ -1452,7 +1452,7 @@ the base classes of this type, starting at the top type.

Returns

-

the function pointer or NULL

+

the function pointer or NULL


@@ -1510,7 +1510,7 @@ the base classes of this type, starting at the top type.

GIObjectInfoSetValueFunction ()

void
-(*GIObjectInfoSetValueFunction) (GValue *value,
+(*GIObjectInfoSetValueFunction) (GValue *value,
                                  void *object);

Update value and attach the object instance pointer object @@ -1527,7 +1527,7 @@ the base classes of this type, starting at the top type.

value

a GValue

a GValue

 

value

a GValue

a GValue

 
@@ -1580,6 +1580,6 @@ the base classes of this type, starting at the top type.

+
Generated by GTK-Doc V1.28
\ No newline at end of file diff --git a/docs/reference/html/gi-GIPropertyInfo.html b/docs/reference/html/gi-GIPropertyInfo.html index cca3663..5464395 100644 --- a/docs/reference/html/gi-GIPropertyInfo.html +++ b/docs/reference/html/gi-GIPropertyInfo.html @@ -8,7 +8,7 @@ - + @@ -47,7 +47,7 @@
-GParamFlags +GParamFlags g_property_info_get_flags () @@ -123,9 +123,9 @@ either a

g_property_info_get_flags ()

-
GParamFlags
+
GParamFlags
 g_property_info_get_flags (GIPropertyInfo *info);
-

Obtain the flags for this property info. See GParamFlags for +

Obtain the flags for this property info. See GParamFlags for more information about possible flag values.

Parameters

@@ -216,6 +216,6 @@ g_property_info_get_type ( -
Generated by GTK-Doc V1.29.1
+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/docs/reference/html/gi-GIRegisteredTypeInfo.html b/docs/reference/html/gi-GIRegisteredTypeInfo.html index 64bf63d..fc1115f 100644 --- a/docs/reference/html/gi-GIRegisteredTypeInfo.html +++ b/docs/reference/html/gi-GIRegisteredTypeInfo.html @@ -8,7 +8,7 @@ - + @@ -46,14 +46,14 @@
const gchar * +const gchar * g_registered_type_info_get_type_name ()
const gchar * +const gchar * g_registered_type_info_get_type_init () @@ -61,7 +61,7 @@
-GType +GType g_registered_type_info_get_g_type () @@ -131,10 +131,10 @@ about the rest of the details.


g_registered_type_info_get_type_name ()

-
const gchar *
+
const gchar *
 g_registered_type_info_get_type_name (GIRegisteredTypeInfo *info);

Obtain the type name of the struct within the GObject type system. -This type can be passed to g_type_name() to get a GType.

+This type can be passed to g_type_name() to get a GType.

Parameters

@@ -158,7 +158,7 @@ This type can be passed to g_type_name() to get a

g_registered_type_info_get_type_init ()

-
const gchar *
+
const gchar *
 g_registered_type_info_get_type_init (GIRegisteredTypeInfo *info);

Obtain the type init function for info . The type init function is the @@ -183,15 +183,15 @@ Usually this is not called by langauge bindings or applications, use

Returns

the symbol name of the type init function, suitable for -passing into g_module_symbol().

+passing into g_module_symbol().


g_registered_type_info_get_g_type ()

-
GType
+
GType
 g_registered_type_info_get_g_type (GIRegisteredTypeInfo *info);
-

Obtain the GType for this registered type or G_TYPE_NONE which a special meaning. +

Obtain the GType for this registered type or G_TYPE_NONE which a special meaning. It means that either there is no type information associated with this info or that the shared library which provides the type_init function for this @@ -214,7 +214,7 @@ that the shared library which provides the type_init function for this

Returns

-

the GType.

+

the GType.

@@ -229,6 +229,6 @@ that the shared library which provides the type_init function for this +
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/docs/reference/html/gi-GISignalInfo.html b/docs/reference/html/gi-GISignalInfo.html index ae50843..58d896c 100644 --- a/docs/reference/html/gi-GISignalInfo.html +++ b/docs/reference/html/gi-GISignalInfo.html @@ -8,7 +8,7 @@ - + @@ -47,7 +47,7 @@
-GSignalFlags +GSignalFlags g_signal_info_get_flags () @@ -63,7 +63,7 @@
-gboolean +gboolean g_signal_info_true_stops_emit () @@ -128,9 +128,9 @@ and other metadata from the signal.


g_signal_info_get_flags ()

-
GSignalFlags
+
GSignalFlags
 g_signal_info_get_flags (GISignalInfo *info);
-

Obtain the flags for this signal info. See GSignalFlags for +

Obtain the flags for this signal info. See GSignalFlags for more information about possible flag values.

Parameters

@@ -159,7 +159,7 @@ more information about possible flag values.

g_signal_info_get_class_closure (GISignalInfo *info);

Obtain the class closure for this signal if one is set. The class closure is a virtual function on the type that the signal belongs to. -If the signal lacks a closure NULL will be returned.

+If the signal lacks a closure NULL will be returned.

Parameters

@@ -177,14 +177,14 @@ If the signal lacks a closure NULL will be returned

Returns

-

the class closure or NULL.

+

the class closure or NULL.

[transfer full]


g_signal_info_true_stops_emit ()

-
gboolean
+
gboolean
 g_signal_info_true_stops_emit (GISignalInfo *info);

Obtain if the returning true in the signal handler will stop the emission of the signal.

@@ -205,7 +205,7 @@ stop the emission of the signal.

Returns

-

TRUE if returning true stops the signal emission

+

TRUE if returning true stops the signal emission

@@ -220,6 +220,6 @@ stop the emission of the signal.

+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/docs/reference/html/gi-GIStructInfo.html b/docs/reference/html/gi-GIStructInfo.html index 24adce1..8c5d50c 100644 --- a/docs/reference/html/gi-GIStructInfo.html +++ b/docs/reference/html/gi-GIStructInfo.html @@ -8,7 +8,7 @@ - + @@ -55,7 +55,7 @@
-gsize +gsize g_struct_info_get_alignment () @@ -63,7 +63,7 @@
-gsize +gsize g_struct_info_get_size () @@ -71,7 +71,7 @@
-gboolean +gboolean g_struct_info_is_gtype_struct () @@ -79,7 +79,7 @@
-gboolean +gboolean g_struct_info_is_foreign () @@ -87,7 +87,7 @@
-gint +gint g_struct_info_get_n_fields () @@ -103,7 +103,7 @@
-gint +gint g_struct_info_get_n_methods () @@ -182,7 +182,7 @@

g_struct_info_find_field ()

GIFieldInfo *
 g_struct_info_find_field (GIStructInfo *info,
-                          const gchar *name);
+ const gchar *name);

Obtain the type information for field named name .

@@ -209,7 +209,7 @@ g_struct_info_find_field (

Returns

-

the GIFieldInfo or NULL if not found, +

the GIFieldInfo or NULL if not found, free it with g_base_info_unref() when done.

[transfer full]

@@ -218,7 +218,7 @@ free it with

g_struct_info_get_alignment ()

-
gsize
+
gsize
 g_struct_info_get_alignment (GIStructInfo *info);

Obtain the required alignment of the structure.

@@ -244,7 +244,7 @@ g_struct_info_get_alignment (

g_struct_info_get_size ()

-
gsize
+
gsize
 g_struct_info_get_size (GIStructInfo *info);

Obtain the total size of the structure.

@@ -270,10 +270,10 @@ g_struct_info_get_size (

g_struct_info_is_gtype_struct ()

-
gboolean
+
gboolean
 g_struct_info_is_gtype_struct (GIStructInfo *info);

Return true if this structure represents the "class structure" for some -GObject or GInterface. This function is mainly useful to hide this kind of structure +GObject or GInterface. This function is mainly useful to hide this kind of structure from generated public APIs.

Parameters

@@ -292,13 +292,13 @@ from generated public APIs.

Returns

-

TRUE if this is a class struct, FALSE otherwise

+

TRUE if this is a class struct, FALSE otherwise


g_struct_info_is_foreign ()

-
gboolean
+
gboolean
 g_struct_info_is_foreign (GIStructInfo *info);

TODO

@@ -324,7 +324,7 @@ g_struct_info_is_foreign (

g_struct_info_get_n_fields ()

-
gint
+
gint
 g_struct_info_get_n_fields (GIStructInfo *info);

Obtain the number of fields this structure has.

@@ -352,7 +352,7 @@ g_struct_info_get_n_fields (

g_struct_info_get_field ()

GIFieldInfo *
 g_struct_info_get_field (GIStructInfo *info,
-                         gint n);
+ gint n);

Obtain the type information for field with specified index.

Parameters

@@ -386,7 +386,7 @@ when done.


g_struct_info_get_n_methods ()

-
gint
+
gint
 g_struct_info_get_n_methods (GIStructInfo *info);

Obtain the number of methods this structure has.

@@ -414,7 +414,7 @@ g_struct_info_get_n_methods (

g_struct_info_get_method ()

GIFunctionInfo *
 g_struct_info_get_method (GIStructInfo *info,
-                          gint n);
+ gint n);

Obtain the type information for method with specified index.

Parameters

@@ -450,7 +450,7 @@ when done.

g_struct_info_find_method ()

GIFunctionInfo *
 g_struct_info_find_method (GIStructInfo *info,
-                           const gchar *name);
+ const gchar *name);

Obtain the type information for method named name .

@@ -494,6 +494,6 @@ when done.

+
Generated by GTK-Doc V1.28
\ No newline at end of file diff --git a/docs/reference/html/gi-GITypeInfo.html b/docs/reference/html/gi-GITypeInfo.html index bdb1a80..1e62452 100644 --- a/docs/reference/html/gi-GITypeInfo.html +++ b/docs/reference/html/gi-GITypeInfo.html @@ -8,7 +8,7 @@ - + @@ -47,7 +47,7 @@
-gboolean +gboolean g_type_info_is_pointer () @@ -79,7 +79,7 @@
-gint +gint g_type_info_get_array_length () @@ -87,7 +87,7 @@
-gint +gint g_type_info_get_array_fixed_size () @@ -95,7 +95,7 @@
-gboolean +gboolean g_type_info_is_zero_terminated () @@ -169,7 +169,7 @@ interface.


g_type_info_is_pointer ()

-
gboolean
+
gboolean
 g_type_info_is_pointer (GITypeInfo *info);

Obtain if the type is passed as a reference.

Note that the types of GI_DIRECTION_OUT and GI_DIRECTION_INOUT parameters @@ -193,7 +193,7 @@ pointer).

Returns

-

TRUE if it is a pointer

+

TRUE if it is a pointer


@@ -228,7 +228,7 @@ of type tags.

g_type_info_get_param_type ()

GITypeInfo *
 g_type_info_get_param_type (GITypeInfo *info,
-                            gint n);
+ gint n);

Obtain the parameter type n .

@@ -285,7 +285,7 @@ a concrete GObject, a GInterface, a structure, etc. using

Returns

-

the GIBaseInfo, or NULL. Free it with +

the GIBaseInfo, or NULL. Free it with g_base_info_unref() when done.

[transfer full]

@@ -293,7 +293,7 @@ a concrete GObject, a GInterface, a structure, etc. using

g_type_info_get_array_length ()

-
gint
+
gint
 g_type_info_get_array_length (GITypeInfo *info);

Obtain the array length of the type. The type tag must be a GI_TYPE_TAG_ARRAY or -1 will returned.

@@ -320,7 +320,7 @@ g_type_info_get_array_length (

g_type_info_get_array_fixed_size ()

-
gint
+
gint
 g_type_info_get_array_fixed_size (GITypeInfo *info);

Obtain the fixed array size of the type. The type tag must be a GI_TYPE_TAG_ARRAY or -1 will returned.

@@ -347,10 +347,10 @@ g_type_info_get_array_fixed_size (

g_type_info_is_zero_terminated ()

-
gboolean
+
gboolean
 g_type_info_is_zero_terminated (GITypeInfo *info);
-

Obtain if the last element of the array is NULL. The type tag must be a -GI_TYPE_TAG_ARRAY or FALSE will returned.

+

Obtain if the last element of the array is NULL. The type tag must be a +GI_TYPE_TAG_ARRAY or FALSE will returned.

Parameters

@@ -368,7 +368,7 @@ g_type_info_is_zero_terminated (

Returns

-

TRUE if zero terminated

+

TRUE if zero terminated


@@ -411,6 +411,6 @@ returned.

+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/docs/reference/html/gi-GITypelib-Internals.html b/docs/reference/html/gi-GITypelib-Internals.html index 3f89094..f72aec2 100644 --- a/docs/reference/html/gi-GITypelib-Internals.html +++ b/docs/reference/html/gi-GITypelib-Internals.html @@ -8,7 +8,7 @@ - + @@ -83,7 +83,7 @@ justifications.
- + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -991,12 +991,12 @@ with different tradeoffs from the format minor version.

- + - + @@ -1029,27 +1029,27 @@ the first 8 bytes (the reserved flags may be used by some blob types)

- + - + - + - + - + @@ -1081,27 +1081,27 @@ looked up by name.

- + - + - + - + - + @@ -1140,7 +1140,7 @@ have one of the upper 24 bits set.

- + @@ -1188,17 +1188,17 @@ offset which points to a TypeBlob.

- + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -1328,49 +1328,49 @@ with the callback, or -1.

- + - + - + - + - + - - + - + - + @@ -1408,22 +1408,22 @@ length of the array of ArgBlobs.

- + - + - + - + @@ -1468,82 +1468,82 @@ length of the array of ArgBlobs.

- + - + - + +g_object_set().

- + +g_object_get().

- + - + - + - + - + - + - + - + - + - + @@ -1574,27 +1574,27 @@ function whose name is conceptually scoped to the object.

- + - + - + - + - + @@ -1625,27 +1625,27 @@ the return value type.

- + - + - + - + - + @@ -1667,12 +1667,12 @@ the return value type.

- + - + @@ -1710,47 +1710,47 @@ the return value type.

- + - + - + - + +NULL value.

- + - + - + - + @@ -1793,27 +1793,27 @@ size are implicit in the structure.

- + - + - + - + - + @@ -1851,32 +1851,32 @@ size are implicit in the structure.

- + - + - + - + - + - + @@ -1906,27 +1906,27 @@ size are implicit in the structure.

- + - + - + - + - + @@ -1964,44 +1964,44 @@ size are implicit in the structure.

- + - + - + - + - + - + - + - + @@ -2039,37 +2039,37 @@ indicates that the struct offset is unknown.

- + - + - + - + - + - + - + @@ -2116,79 +2116,79 @@ type.

- + - + - + - + - + - + - + - + - - + + - - + + - + - + - + - + - + @@ -2234,77 +2234,77 @@ a native language binding instead of relying of introspected bindings.

- + - + - + - + - + - + - + - - + + - - + + - + - + - + - + - + - + @@ -2354,59 +2354,59 @@ indicates that the discriminator offset is unknown.

- + - + - + - + - + - + - - + + - - + + - + - + - - + + @@ -2449,44 +2449,44 @@ indicates that the discriminator offset is unknown.

- + - + - + - + - + - + - + - + - + - + @@ -2548,78 +2548,78 @@ things.

- + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -2661,75 +2661,75 @@ and the return value type.

- + - + - + - + - + - + - + - + - + - + - + - + - + @@ -2786,136 +2786,136 @@ the return value type.

- + - + - + - + - + - + - - + + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -2963,89 +2963,89 @@ interfaces.

- + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -3082,22 +3082,22 @@ interfaces.

- + - + - + - + @@ -3108,17 +3108,17 @@ or string.

- + - + - + @@ -3146,19 +3146,19 @@ or string.

- + - + - + @@ -3234,6 +3234,6 @@ entry can be found by a binary search.

+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/docs/reference/html/gi-GITypelib.html b/docs/reference/html/gi-GITypelib.html index c99d666..79c52ec 100644 --- a/docs/reference/html/gi-GITypelib.html +++ b/docs/reference/html/gi-GITypelib.html @@ -8,7 +8,7 @@ - + @@ -73,14 +73,14 @@
- - + @@ -155,9 +155,9 @@ repository is destroyed.

g_typelib_new_from_const_memory ()

GITypelib *
-g_typelib_new_from_const_memory (const guint8 *memory,
-                                 gsize len,
-                                 GError **error);
+g_typelib_new_from_const_memory (const guint8 *memory, + gsize len, + GError **error);

Creates a new GITypelib from a memory location.

[skip]

@@ -181,7 +181,7 @@ g_typelib_new_from_const_memory (const

error

-
+ @@ -196,9 +196,9 @@ g_typelib_new_from_const_memory (const

g_typelib_new_from_mapped_file ()

GITypelib *
-g_typelib_new_from_mapped_file (GMappedFile *mfile,
-                                GError **error);
-

Creates a new GITypelib from a GMappedFile.

+g_typelib_new_from_mapped_file (GMappedFile *mfile, + GError **error); +

Creates a new GITypelib from a GMappedFile.

[skip]

Parameters

@@ -211,12 +211,12 @@ g_typelib_new_from_mapped_file (G
- + - + @@ -252,10 +252,10 @@ g_typelib_free (

g_typelib_symbol ()

-
gboolean
+
gboolean
 g_typelib_symbol (GITypelib *typelib,
-                  const gchar *symbol_name,
-                  gpointer *symbol);
+ const gchar *symbol_name, + gpointer *symbol);

Loads a symbol from GITypelib.

Parameters

@@ -286,13 +286,13 @@ g_typelib_symbol (

Returns

-

TRUE on success

+

TRUE on success


g_typelib_get_namespace ()

-
const gchar *
+
const gchar *
 g_typelib_get_namespace (GITypelib *typelib);

TODO

@@ -328,6 +328,6 @@ g_typelib_get_namespace ( -
Generated by GTK-Doc V1.29.1
+
Generated by GTK-Doc V1.28
\ No newline at end of file diff --git a/docs/reference/html/gi-GIUnionInfo.html b/docs/reference/html/gi-GIUnionInfo.html index 1865ebb..de5ab58 100644 --- a/docs/reference/html/gi-GIUnionInfo.html +++ b/docs/reference/html/gi-GIUnionInfo.html @@ -8,7 +8,7 @@ - + @@ -41,7 +41,7 @@
- + - + @@ -278,21 +278,21 @@ is the implementation for info

Returns

-

address to a function or NULL if an error happened

+

address to a function or NULL if an error happened


g_vfunc_info_invoke ()

-
gboolean
+
gboolean
 g_vfunc_info_invoke (GIVFuncInfo *info,
-                     GType implementor,
+                     GType implementor,
                      const GIArgument *in_args,
                      int n_in_args,
                      const GIArgument *out_args,
                      int n_out_args,
                      GIArgument *return_value,
-                     GError **error);
+ GError **error);

Invokes the function described in info with the given arguments. Note that inout parameters must appear in both @@ -314,7 +314,7 @@ argument lists.

- + @@ -322,7 +322,7 @@ argument lists.

+can be NULL.

@@ -336,7 +336,7 @@ array

+may be NULL.

@@ -350,12 +350,12 @@ array

+NULL

- + @@ -363,7 +363,7 @@ may be

Returns

-

TRUE if the function has been invoked, FALSE if an +

TRUE if the function has been invoked, FALSE if an error occurred.

@@ -413,7 +413,7 @@ error occurred.

@@ -424,6 +424,6 @@ error occurred.

+
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/docs/reference/html/gi-GIValueInfo.html b/docs/reference/html/gi-GIValueInfo.html index ffcd7dd..b8918dd 100644 --- a/docs/reference/html/gi-GIValueInfo.html +++ b/docs/reference/html/gi-GIValueInfo.html @@ -8,7 +8,7 @@ - + @@ -70,6 +70,6 @@ +
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/docs/reference/html/gi-Version-Information.html b/docs/reference/html/gi-Version-Information.html index 37b9436..a31f51f 100644 --- a/docs/reference/html/gi-Version-Information.html +++ b/docs/reference/html/gi-Version-Information.html @@ -8,7 +8,7 @@ - + @@ -47,7 +47,7 @@
- + @@ -326,18 +326,18 @@ inside the binding's function mapping.

Returns

-

TRUE on success, FALSE otherwise with error +

TRUE on success, FALSE otherwise with error set.


g_function_invoker_new_for_address ()

-
gboolean
-g_function_invoker_new_for_address (gpointer addr,
+
gboolean
+g_function_invoker_new_for_address (gpointer addr,
                                     GICallableInfo *info,
                                     GIFunctionInvoker *invoker,
-                                    GError **error);
+ GError **error);

Initialize the caller-allocated invoker structure with a cache of information needed to invoke the C function corresponding to @@ -372,7 +372,7 @@ inside the binding's function mapping.

- + @@ -380,7 +380,7 @@ inside the binding's function mapping.

Returns

-

TRUE on success, FALSE otherwise with error +

TRUE on success, FALSE otherwise with error set.

@@ -416,7 +416,7 @@ itself however.

g_callable_info_prepare_closure (GICallableInfo *callable_info, ffi_cif *cif, GIFFIClosureCallback callback, - gpointer user_data); + gpointer user_data);

Prepares a callback for ffi invocation.

Parameters

@@ -512,7 +512,7 @@ g_callable_info_free_closure ( 
- + @@ -530,6 +530,6 @@ g_callable_info_free_closure ( -
Generated by GTK-Doc V1.29.1 +
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/docs/reference/html/gi-struct-hierarchy.html b/docs/reference/html/gi-struct-hierarchy.html index 84acd78..32e26e1 100644 --- a/docs/reference/html/gi-struct-hierarchy.html +++ b/docs/reference/html/gi-struct-hierarchy.html @@ -8,7 +8,7 @@ - + @@ -53,6 +53,6 @@ +
Generated by GTK-Doc V1.28 \ No newline at end of file diff --git a/docs/reference/html/home.png b/docs/reference/html/home.png index 9346b336a784463192c7daab5133a3673dd69845..e80e202ad8bde5320b3c04955713f616269dca30 100644 GIT binary patch delta 20 bcmZo*YG9fW$n}U>mfb|NFJ{KliP1{|K#B(r delta 20 bcmZo*YG9fW$aR-pKuBI_A&;8a#OS2}IT8h- diff --git a/docs/reference/html/index.html b/docs/reference/html/index.html index 0658ec4..e48f153 100644 --- a/docs/reference/html/index.html +++ b/docs/reference/html/index.html @@ -6,7 +6,7 @@ - + @@ -16,7 +16,7 @@
-gboolean +gboolean g_typelib_matches_gtype_name_prefix () @@ -105,7 +105,7 @@ justifications.
-GQuark +GQuark g_typelib_error_quark () @@ -113,7 +113,7 @@ justifications.
-gboolean +gboolean g_typelib_validate () @@ -308,7 +308,7 @@ multiple flexible arrays).

g_typelib_get_dir_entry ()

DirEntry *
 g_typelib_get_dir_entry (GITypelib *typelib,
-                         guint16 index);
+ guint16 index);

TODO

Parameters

@@ -376,7 +376,7 @@ g_typelib_get_dir_entry_by_name (

g_typelib_get_dir_entry_by_gtype_name ()

DirEntry *
 g_typelib_get_dir_entry_by_gtype_name (GITypelib *typelib,
-                                       const gchar *gtype_name);
+ const gchar *gtype_name);

TODO

Parameters

@@ -411,7 +411,7 @@ g_typelib_get_dir_entry_by_gtype_name (DirEntry * g_typelib_get_dir_entry_by_error_domain (GITypelib *typelib, - GQuark error_domain); + GQuark error_domain);

TODO

Parameters

@@ -443,9 +443,9 @@ g_typelib_get_dir_entry_by_error_domain

g_typelib_matches_gtype_name_prefix ()

-
gboolean
+
gboolean
 g_typelib_matches_gtype_name_prefix (GITypelib *typelib,
-                                     const gchar *gtype_name);
+ const gchar *gtype_name);

TODO

Parameters

@@ -516,7 +516,7 @@ g_typelib_check_sanity (void

g_typelib_error_quark ()

-
GQuark
+
GQuark
 g_typelib_error_quark (void);

TODO

@@ -527,9 +527,9 @@ g_typelib_error_quark (void

g_typelib_validate ()

-
gboolean
+
gboolean
 g_typelib_validate (GITypelib *typelib,
-                    GError **error);
+ GError **error);

TODO

Parameters

@@ -729,18 +729,18 @@ collection of meta-information, such as the number of entries and dependencies.<

gchar magic[16];

gchar magic[16];

See G_IR_MAGIC.

 

guint8 major_version;

guint8 major_version;

The major version number of the typelib format. Major version number changes indicate incompatible changes to the tyeplib format.

 

guint8 minor_version;

guint8 minor_version;

The minor version number of the typelib format. Minor version number changes indicate compatible changes and should still allow the typelib to be parsed by a parser designed for the same major_version @@ -748,38 +748,38 @@ typelib to be parsed by a parser designed for the same  

guint16 reserved;

guint16 reserved;

Reserved for future use.

 

guint16 n_entries;

guint16 n_entries;

The number of entries in the directory.

 

guint16 n_local_entries;

guint16 n_local_entries;

The number of entries referring to blobs in this typelib. The local entries must occur before the unresolved entries.

 

guint32 directory;

guint32 directory;

Offset of the directory in the typelib.

 

guint32 n_attributes;

guint32 n_attributes;

Number of attribute blocks

 

guint32 attributes;

guint32 attributes;

Offset of the list of attributes in the typelib.

 

guint32 dependencies;

guint32 dependencies;

Offset of a single string, which is the list of immediate dependencies, separated by the '|' character. The dependencies are required in order to avoid having programs consuming a typelib check for @@ -787,130 +787,130 @@ an "Unresolved" type return from every API call.

 

guint32 size;

guint32 size;

The size in bytes of the typelib.

 

guint32 namespace;

guint32 namespace;

Offset of the namespace string in the typelib.

 

guint32 nsversion;

guint32 nsversion;

Offset of the namespace version string in the typelib.

 

guint32 shared_library;

guint32 shared_library;

This field is the set of shared libraries associated with the typelib. The entries are separated by the '|' (pipe) character.

 

guint32 c_prefix;

guint32 c_prefix;

The prefix for the function names of the library

 

guint16 entry_blob_size;

guint16 entry_blob_size;

The sizes of fixed-size blobs. Recording this information here allows to write parser which continue to work if the format is extended by adding new fields to the end of the fixed-size blobs.

 

guint16 function_blob_size;

guint16 function_blob_size;

See entry_blob_size .

 

guint16 callback_blob_size;

guint16 callback_blob_size;

See entry_blob_size .

 

guint16 signal_blob_size;

guint16 signal_blob_size;

See entry_blob_size .

 

guint16 vfunc_blob_size;

guint16 vfunc_blob_size;

See entry_blob_size .

 

guint16 arg_blob_size;

guint16 arg_blob_size;

See entry_blob_size .

 

guint16 property_blob_size;

guint16 property_blob_size;

See entry_blob_size .

 

guint16 field_blob_size;

guint16 field_blob_size;

See entry_blob_size .

 

guint16 value_blob_size;

guint16 value_blob_size;

See entry_blob_size .

 

guint16 attribute_blob_size;

guint16 attribute_blob_size;

See entry_blob_size .

 

guint16 constant_blob_size;

guint16 constant_blob_size;

See entry_blob_size .

 

guint16 error_domain_blob_size;

guint16 error_domain_blob_size;

See entry_blob_size .

 

guint16 signature_blob_size;

guint16 signature_blob_size;

See entry_blob_size .

 

guint16 enum_blob_size;

guint16 enum_blob_size;

See entry_blob_size .

 

guint16 struct_blob_size;

guint16 struct_blob_size;

See entry_blob_size .

 

guint16 object_blob_size;

guint16 object_blob_size;

See entry_blob_size .

 

guint16 interface_blob_size;

guint16 interface_blob_size;

For variable-size blobs, the size of the struct up to the first flexible array member. Recording this information here allows to write parser which continue to work if the format is extended by @@ -919,18 +919,18 @@ variable-size blobs.

 

guint16 union_blob_size;

guint16 union_blob_size;

See entry_blob_size .

 

guint32 sections;

guint32 sections;

Offset of section blob array

 

guint16 padding[6];

guint16 padding[6];

TODO

 

guint32 id;

guint32 id;

A SectionType

 

guint32 offset;

guint32 offset;

Integer offset for this section

 

guint16 blob_type;

guint16 blob_type;

A GTypelibBlobType

 

guint16 local : 1;

guint16 local : 1;

Whether this entry refers to a blob in this typelib.

 

guint16 reserved :15;

guint16 reserved :15;

Reserved for future use.

 

guint32 name;

guint32 name;

The name of the entry.

 

guint32 offset;

guint32 offset;

If is_local is set, this is the offset of the blob in the typelib. Otherwise, it is the offset of the namespace in which the blob has to be looked up by name.

guint reserved : 8;

guint reserved : 8;

Reserved for future use.

 

guint reserved2 :16;

guint reserved2 :16;

Reserved for future use.

 

guint pointer : 1;

guint pointer : 1;

TODO

 

guint reserved3 : 2;

guint reserved3 : 2;

Reserved for future use.

 

guint tag : 5;

guint tag : 5;

A GITypeTag

 
 

guint32 offset;

guint32 offset;

Offset relative to header->types that points to a TypeBlob. Unlike other offsets, this is in words (ie 32bit units) rather than bytes.

guint32 name;

guint32 name;

A suggested name for the parameter.

 

guint in : 1;

guint in : 1;

The parameter is an input to the function

 

guint out : 1;

guint out : 1;

The parameter is used to return an output of the function. Parameters can be both in and out. Out parameters implicitly add another level of indirection to the parameter type. Ie if the type is uint32 in an out @@ -1206,13 +1206,13 @@ parameter, the function actually takes an uint32*.

 

guint caller_allocates : 1;

guint caller_allocates : 1;

The parameter is a pointer to a struct or object that will receive an output of the function.

 

guint nullable : 1;

guint nullable : 1;

Only meaningful for types which are passed as pointers. For an in parameter, indicates if it is ok to pass NULL in. Gor an out parameter, indicates whether it may return NULL. Note that NULL is a @@ -1221,20 +1221,20 @@ for parameters of these types.

 

guint optional : 1;

guint optional : 1;

For an out parameter, indicates that NULL may be passed in if the value is not needed.

 

guint transfer_ownership : 1;

guint transfer_ownership : 1;

For an in parameter, indicates that the function takes over ownership of the parameter value. For an out parameter, it indicates that the caller is responsible for freeing the return value.

 

guint transfer_container_ownership : 1;

guint transfer_container_ownership : 1;

For container types, indicates that the ownership of the container, but not of its contents is transferred. This is typically the case for out parameters returning lists of @@ -1242,7 +1242,7 @@ statically allocated things.

 

guint return_value : 1;

guint return_value : 1;

The parameter should be considered the return value of the function. Only out parameters can be marked as return value, and there can be at most one per function call. If an out parameter is marked as @@ -1251,36 +1251,36 @@ void or a boolean indicating the success of the call.

 

guint scope : 3;

guint scope : 3;

A GIScopeType. If the parameter is of a callback type, this denotes the scope of the user_data and the callback function pointer itself (for languages that emit code at run-time).

 

guint skip : 1;

guint skip : 1;

Indicates that the parameter is only useful in C and should be skipped.

 

guint reserved :20;

guint reserved :20;

Reserved for future use.

 

gint8 closure;

gint8 closure;

Index of the closure (user_data) parameter associated with the callback, or -1.

 

gint8 destroy;

gint8 destroy;

Index of the destroy notfication callback parameter associated with the callback, or -1.

 

guint16 padding;

guint16 padding;

TODO

 
 

guint16 may_return_null : 1;

guint16 may_return_null : 1;

Only relevant for pointer types. Indicates whether the caller must expect NULL as a return value.

 

guint16 caller_owns_return_value : 1;

guint16 caller_owns_return_value : 1;

If set, the caller is responsible for freeing the return value if it is no longer needed.

 

guint16 caller_owns_return_container : 1;

guint16 caller_owns_return_container : 1;

This flag is only relevant if the return type is a container type. If the flag is set, the caller is resonsible for freeing the container, but not its contents.

 

guint16 skip_return : 1;

guint16 skip_return : 1;

Indicates that the return value is only useful in C and should be skipped.

 

guint16 instance_transfer_ownership : 1;

guint16 instance_transfer_ownership : 1;

When calling, the function assumes ownership of the instance parameter.

 

guint16 throws : 1;

Denotes the signature takes an additional GError argument beyond +

guint16 throws : 1;

Denotes the signature takes an additional GError argument beyond the annotated arguments.

 

guint16 reserved :10;

guint16 reserved :10;

Reserved for future use.

 

guint16 n_arguments;

guint16 n_arguments;

The number of arguments that this function expects, also the length of the array of ArgBlobs.

 

guint16 blob_type;

guint16 blob_type;

A GTypelibBlobType

 

guint16 deprecated : 1;

guint16 deprecated : 1;

Whether the blob is deprecated.

 

guint16 reserved :15;

guint16 reserved :15;

Reserved for future use.

 

guint32 name;

guint32 name;

The name of the blob.

 

guint16 blob_type;

guint16 blob_type;

BLOB_TYPE_FUNCTION

 

guint16 deprecated : 1;

guint16 deprecated : 1;

The function is deprecated.

 

guint16 setter : 1;

guint16 setter : 1;

The function is a setter for a property. Language bindings may prefer to not bind individual setters and rely on the generic -g_object_set().

 

guint16 getter : 1;

guint16 getter : 1;

The function is a getter for a property. Language bindings may prefer to not bind individual getters and rely on the generic -g_object_get().

 

guint16 constructor : 1;

guint16 constructor : 1;

The function acts as a constructor for the object it is contained in.

 

guint16 wraps_vfunc : 1;

guint16 wraps_vfunc : 1;

The function is a simple wrapper for a virtual function.

 

guint16 throws : 1;

guint16 throws : 1;

This is now additionally stored in the SignatureBlob. (deprecated)

 

guint16 index :10;

guint16 index :10;

Index of the property that this function is a setter or getter of in the array of properties of the containing interface, or index of the virtual function that this function wraps.

 

guint32 name;

guint32 name;

TODO

 

guint32 symbol;

guint32 symbol;

The symbol which can be used to obtain the function pointer with dlsym().

 

guint32 signature;

guint32 signature;

Offset of the SignatureBlob describing the parameter types and the return value type.

 

guint16 is_static : 1;

guint16 is_static : 1;

The function is a "static method"; in other words it's a pure function whose name is conceptually scoped to the object.

 

guint16 reserved : 15;

guint16 reserved : 15;

Reserved for future use.

 

guint16 reserved2 : 16;

guint16 reserved2 : 16;

Reserved for future use.

 

guint16 blob_type;

guint16 blob_type;

TODO

 

guint16 deprecated : 1;

guint16 deprecated : 1;

TODO

 

guint16 reserved :15;

guint16 reserved :15;

Reserved for future use.

 

guint32 name;

guint32 name;

TODO

 

guint32 signature;

guint32 signature;

Offset of the SignatureBlob describing the parameter types and the return value type.

 

guint8 pointer :1;

guint8 pointer :1;

Whether this type represents an indirection

 

guint8 reserved :2;

guint8 reserved :2;

Reserved for future use.

 

guint8 tag :5;

guint8 tag :5;

A GITypeTag

 

guint8 reserved2;

guint8 reserved2;

Reserved for future use.

 

guint16 interface;

guint16 interface;

Index of the directory entry for the interface.

 

guint16 length;

guint16 length;

TODO

 

guint16 size;

guint16 size;

TODO

 

guint16 pointer :1;

guint16 pointer :1;

TODO

 

guint16 reserved :2;

guint16 reserved :2;

Reserved for future use.

 

guint16 tag :5;

guint16 tag :5;

TODO

 

guint16 zero_terminated :1;

guint16 zero_terminated :1;

Indicates that the array must be terminated by a suitable -NULL value.

 

guint16 has_length :1;

guint16 has_length :1;

Indicates that length points to a parameter specifying the length of the array. If both has_length and zero_terminated are set, the convention is to pass -1 for the length if the array is zero-terminated.

 

guint16 has_size :1;

guint16 has_size :1;

Indicates that size is the fixed size of the array.

 

guint16 array_type :2;

guint16 array_type :2;

Indicates whether this is a C array, GArray, GPtrArray, or GByteArray. If something other than a C array, the length and element size are implicit in the structure.

 

guint16 reserved2 :3;

guint16 reserved2 :3;

Reserved for future use.

 

guint8 pointer :1;

guint8 pointer :1;

TODO

 

guint8 reserved :2;

guint8 reserved :2;

Reserved for future use.

 

guint8 tag :5;

guint8 tag :5;

TODO

 

guint8 reserved2;

guint8 reserved2;

Reserved for future use.

 

guint16 n_types;

guint16 n_types;

The number of parameter types to follow.

 

guint8 pointer :1;

guint8 pointer :1;

TODO

 

guint8 reserved :2;

guint8 reserved :2;

TODO

 

guint8 tag :5;

guint8 tag :5;

TODO

 

guint8 reserved2;

guint8 reserved2;

TODO

 

guint16 n_domains;

guint16 n_domains;

TODO: must be 0

 

guint16 domains[];

guint16 domains[];

TODO

 

guint32 deprecated : 1;

guint32 deprecated : 1;

Whether this value is deprecated

 

guint32 unsigned_value : 1;

guint32 unsigned_value : 1;

if set, value is a 32-bit unsigned integer cast to gint32

 

guint32 reserved :30;

guint32 reserved :30;

Reserved for future use.

 

guint32 name;

guint32 name;

Name of blob

 

gint32 value;

gint32 value;

The numerical value

 

guint32 name;

guint32 name;

The name of the field.

 

guint8 readable :1;

guint8 readable :1;

TODO

 

guint8 writable :1;

guint8 writable :1;

How the field may be accessed.

 

guint8 has_embedded_type :1;

guint8 has_embedded_type :1;

An anonymous type follows the FieldBlob.

 

guint8 reserved :5;

guint8 reserved :5;

Reserved for future use.

 

guint8 bits;

guint8 bits;

If this field is part of a bitfield, the number of bits which it uses, otherwise 0.

 

guint16 struct_offset;

guint16 struct_offset;

The offset of the field in the struct. The value 0xFFFF indicates that the struct offset is unknown.

 

guint32 reserved2;

guint32 reserved2;

Reserved for future use.

 

guint16 blob_type;

guint16 blob_type;

TODO

 

guint16 deprecated : 1;

guint16 deprecated : 1;

TODO

 

guint16 unregistered : 1;

guint16 unregistered : 1;

TODO

 

guint16 reserved :14;

guint16 reserved :14;

Reserved for future use.

 

guint32 name;

guint32 name;

TODO

 

guint32 gtype_name;

guint32 gtype_name;

The name under which the type is registered with GType.

 

guint32 gtype_init;

guint32 gtype_init;

The symbol name of the get_type() function which registers the type.

 

guint16 blob_type;

guint16 blob_type;

BLOB_TYPE_STRUCT

 

guint16 deprecated : 1;

guint16 deprecated : 1;

Whether this structure is deprecated

 

guint16 unregistered : 1;

guint16 unregistered : 1;

If this is set, the type is not registered with GType.

 

guint16 is_gtype_struct : 1;

guint16 is_gtype_struct : 1;

Whether this structure is the class or interface layout for a GObject

 

guint16 alignment : 6;

guint16 alignment : 6;

The byte boundary that the struct is aligned to in memory

 

guint16 foreign : 1;

guint16 foreign : 1;

If the type is foreign, eg if it's expected to be overridden by a native language binding instead of relying of introspected bindings.

 

guint16 reserved : 6;

guint16 reserved : 6;

Reserved for future use.

 

guint32 name;

guint32 name;

TODO

 

guint32 gtype_name;

String name of the associated GType

guint32 gtype_name;

String name of the associated GType

 

guint32 gtype_init;

String naming the symbol which gets the runtime GType

guint32 gtype_init;

String naming the symbol which gets the runtime GType

 

guint32 size;

guint32 size;

The size of the struct in bytes.

 

guint16 n_fields;

guint16 n_fields;

TODO

 

guint16 n_methods;

guint16 n_methods;

TODO

 

guint32 reserved2;

guint32 reserved2;

Reserved for future use.

 

guint32 reserved3;

guint32 reserved3;

Reserved for future use.

 

guint16 blob_type;

guint16 blob_type;

TODO

 

guint16 deprecated : 1;

guint16 deprecated : 1;

TODO

 

guint16 unregistered : 1;

guint16 unregistered : 1;

If this is set, the type is not registered with GType.

 

guint16 discriminated : 1;

guint16 discriminated : 1;

Is set if the union is discriminated

 

guint16 alignment : 6;

guint16 alignment : 6;

The byte boundary that the union is aligned to in memory

 

guint16 reserved : 7;

guint16 reserved : 7;

Reserved for future use.

 

guint32 name;

guint32 name;

TODO

 

guint32 gtype_name;

String name of the associated GType

guint32 gtype_name;

String name of the associated GType

 

guint32 gtype_init;

String naming the symbol which gets the runtime GType

guint32 gtype_init;

String naming the symbol which gets the runtime GType

 

guint32 size;

guint32 size;

TODO

 

guint16 n_fields;

guint16 n_fields;

Length of the arrays

 

guint16 n_functions;

guint16 n_functions;

TODO

 

guint32 reserved2;

guint32 reserved2;

Reserved for future use.

 

guint32 reserved3;

guint32 reserved3;

Reserved for future use.

 

gint32 discriminator_offset;

gint32 discriminator_offset;

Offset from the beginning of the union where the discriminator of a discriminated union is located. The value 0xFFFF indicates that the discriminator offset is unknown.

guint16 blob_type;

guint16 blob_type;

TODO

 

guint16 deprecated : 1;

guint16 deprecated : 1;

TODO

 

guint16 unregistered : 1;

guint16 unregistered : 1;

If this is set, the type is not registered with GType.

 

guint16 storage_type : 5;

guint16 storage_type : 5;

The tag of the type used for the enum in the C ABI (will be a signed or unsigned integral type)

 

guint16 reserved : 9;

guint16 reserved : 9;

Reserved for future use.

 

guint32 name;

guint32 name;

TODO

 

guint32 gtype_name;

String name of the associated GType

guint32 gtype_name;

String name of the associated GType

 

guint32 gtype_init;

String naming the symbol which gets the runtime GType

guint32 gtype_init;

String naming the symbol which gets the runtime GType

 

guint16 n_values;

guint16 n_values;

The length of the values array.

 

guint16 n_methods;

guint16 n_methods;

The length of the methods array.

 

guint32 error_domain;

String naming the GError domain this enum is associated with

guint32 error_domain;

String naming the GError domain this enum is associated with

 

guint32 name;

guint32 name;

The name of the property.

 

guint32 deprecated : 1;

guint32 deprecated : 1;

TODO

 

guint32 readable : 1;

guint32 readable : 1;

TODO

 

guint32 writable : 1;

guint32 writable : 1;

TODO

 

guint32 construct : 1;

guint32 construct : 1;

TODO

 

guint32 construct_only : 1;

guint32 construct_only : 1;

The ParamFlags used when registering the property.

 

guint32 transfer_ownership : 1;

guint32 transfer_ownership : 1;

When writing, the type containing the property takes ownership of the value. When reading, the returned value needs to be released by the caller.

 

guint32 transfer_container_ownership : 1;

guint32 transfer_container_ownership : 1;

For container types indicates that the ownership of the container, but not of its contents, is transferred. This is typically the case when reading lists of statically allocated @@ -2494,12 +2494,12 @@ things.

 

guint32 reserved :25;

guint32 reserved :25;

Reserved for future use.

 

guint32 reserved2;

guint32 reserved2;

Reserved for future use.

 

guint16 deprecated : 1;

guint16 deprecated : 1;

TODO

 

guint16 run_first : 1;

guint16 run_first : 1;

TODO

 

guint16 run_last : 1;

guint16 run_last : 1;

TODO

 

guint16 run_cleanup : 1;

guint16 run_cleanup : 1;

TODO

 

guint16 no_recurse : 1;

guint16 no_recurse : 1;

TODO

 

guint16 detailed : 1;

guint16 detailed : 1;

TODO

 

guint16 action : 1;

guint16 action : 1;

TODO

 

guint16 no_hooks : 1;

guint16 no_hooks : 1;

The flags used when registering the signal.

 

guint16 has_class_closure : 1;

guint16 has_class_closure : 1;

Set if the signal has a class closure.

 

guint16 true_stops_emit : 1;

guint16 true_stops_emit : 1;

Whether the signal has true-stops-emit semantics

 

guint16 reserved : 6;

guint16 reserved : 6;

Reserved for future use.

 

guint16 class_closure;

guint16 class_closure;

The index of the class closure in the list of virtual functions of the object or interface on which the signal is defined.

 

guint32 name;

guint32 name;

The name of the signal.

 

guint32 reserved2;

guint32 reserved2;

Reserved for future use.

 

guint32 signature;

guint32 signature;

Offset of the SignatureBlob describing the parameter types and the return value type.

 

guint32 name;

guint32 name;

The name of the virtual function.

 

guint16 must_chain_up : 1;

guint16 must_chain_up : 1;

If set, every implementation of this virtual function must chain up to the implementation of the parent class.

 

guint16 must_be_implemented : 1;

guint16 must_be_implemented : 1;

If set, every derived class must override this virtual function.

 

guint16 must_not_be_implemented : 1;

guint16 must_not_be_implemented : 1;

If set, derived class must not override this virtual function.

 

guint16 class_closure : 1;

guint16 class_closure : 1;

Set if this virtual function is the class closure of a signal.

 

guint16 throws : 1;

guint16 throws : 1;

This is now additionally stored in the SignatureBlob. (deprecated)

 

guint16 reserved :11;

guint16 reserved :11;

Reserved for future use.

 

guint16 signal;

guint16 signal;

The index of the signal in the list of signals of the object or interface to which this virtual function belongs.

 

guint16 struct_offset;

guint16 struct_offset;

The offset of the function pointer in the class struct. The value 0xFFFF indicates that the struct offset is unknown.

 

guint16 invoker : 10;

guint16 invoker : 10;

If a method invoker for this virtual exists, this is the offset in the class structure of the method. If no method is known, this value will be 0x3ff.

 

guint16 reserved2 : 6;

guint16 reserved2 : 6;

Reserved for future use.

 

guint32 reserved3;

guint32 reserved3;

Reserved for future use.

 

guint32 signature;

guint32 signature;

Offset of the SignatureBlob describing the parameter types and the return value type.

 

guint16 blob_type;

guint16 blob_type;

BLOB_TYPE_OBJECT

 

guint16 deprecated : 1;

guint16 deprecated : 1;

TODO

 

guint16 abstract : 1;

guint16 abstract : 1;

TODO

 

guint16 fundamental : 1;

guint16 fundamental : 1;

this object is not a GObject derived type, instead it's an additional fundamental type.

 

guint16 reserved :13;

guint16 reserved :13;

Reserved for future use.

 

guint32 name;

guint32 name;

TODO

 

guint32 gtype_name;

String name of the associated GType

guint32 gtype_name;

String name of the associated GType

 

guint32 gtype_init;

String naming the symbol which gets the runtime GType

guint32 gtype_init;

String naming the symbol which gets the runtime GType

 

guint16 parent;

guint16 parent;

The directory index of the parent type. This is only set for objects. If an object does not have a parent, it is zero.

 

guint16 gtype_struct;

guint16 gtype_struct;

TODO

 

guint16 n_interfaces;

guint16 n_interfaces;

TODO

 

guint16 n_fields;

guint16 n_fields;

TODO

 

guint16 n_properties;

guint16 n_properties;

TODO

 

guint16 n_methods;

guint16 n_methods;

TODO

 

guint16 n_signals;

guint16 n_signals;

TODO

 

guint16 n_vfuncs;

guint16 n_vfuncs;

TODO

 

guint16 n_constants;

guint16 n_constants;

The lengths of the arrays.Up to 16bits of padding may be inserted between the arrays to ensure that they start on a 32bit boundary.

 

guint16 n_field_callbacks;

guint16 n_field_callbacks;

The number of n_fields which are also callbacks. This is used to calculate the fields section size in constant time.

 

guint32 ref_func;

guint32 ref_func;

String pointing to a function which can be called to increase the reference count for an instance of this object type.

 

guint32 unref_func;

guint32 unref_func;

String pointing to a function which can be called to decrease the reference count for an instance of this object type.

 

guint32 set_value_func;

guint32 set_value_func;

String pointing to a function which can be called to convert a pointer of this object to a GValue

 

guint32 get_value_func;

guint32 get_value_func;

String pointing to a function which can be called to convert extract a pointer to this object from a GValue

 

guint32 reserved3;

guint32 reserved3;

Reserved for future use.

 

guint32 reserved4;

guint32 reserved4;

Reserved for future use.

 

guint16 interfaces[];

guint16 interfaces[];

An array of indices of directory entries for the implemented interfaces.

 

guint16 blob_type;

guint16 blob_type;

TODO

 

guint16 deprecated : 1;

guint16 deprecated : 1;

TODO

 

guint16 reserved :15;

guint16 reserved :15;

Reserved for future use.

 

guint32 name;

guint32 name;

TODO

 

guint32 gtype_name;

guint32 gtype_name;

TODO

 

guint32 gtype_init;

guint32 gtype_init;

TODO

 

guint16 gtype_struct;

guint16 gtype_struct;

Name of the interface "class" C structure

 

guint16 n_prerequisites;

guint16 n_prerequisites;

Number of prerequisites

 

guint16 n_properties;

guint16 n_properties;

Number of properties

 

guint16 n_methods;

guint16 n_methods;

Number of methods

 

guint16 n_signals;

guint16 n_signals;

Number of signals

 

guint16 n_vfuncs;

guint16 n_vfuncs;

Number of virtual functions

 

guint16 n_constants;

guint16 n_constants;

The lengths of the arrays. Up to 16bits of padding may be inserted between the arrays to ensure that they start on a 32bit boundary.

 

guint16 padding;

guint16 padding;

TODO

 

guint32 reserved2;

guint32 reserved2;

Reserved for future use.

 

guint32 reserved3;

guint32 reserved3;

Reserved for future use.

 

guint16 prerequisites[];

guint16 prerequisites[];

An array of indices of directory entries for required interfaces.

 

guint16 blob_type;

guint16 blob_type;

TODO

 

guint16 deprecated : 1;

guint16 deprecated : 1;

TODO

 

guint16 reserved :15;

guint16 reserved :15;

Reserved for future use.

 

guint32 name;

guint32 name;

TODO

 
 

guint32 size;

guint32 size;

The size of the value in bytes.

 

guint32 offset;

guint32 offset;

The offset of the value in the typelib.

 

guint32 reserved2;

guint32 reserved2;

Reserved for future use.

 

guint32 offset;

guint32 offset;

The offset of the typelib entry to which this attribute refers. Attributes are kept sorted by offset, so that the attributes of an entry can be found by a binary search.

 

guint32 name;

guint32 name;

The name of the attribute, a string.

 

guint32 value;

guint32 value;

The value of the attribute (also a string)

 
-gboolean +gboolean g_typelib_symbol ()
const gchar * +const gchar * g_typelib_get_namespace () @@ -111,12 +111,12 @@

g_typelib_new_from_memory ()

GITypelib *
-g_typelib_new_from_memory (guint8 *memory,
-                           gsize len,
-                           GError **error);
+g_typelib_new_from_memory (guint8 *memory, + gsize len, + GError **error);

Creates a new GITypelib from a memory location. The memory block pointed to by typelib - will be automatically g_free()d when the + will be automatically g_free()d when the repository is destroyed.

[skip]

@@ -140,7 +140,7 @@ repository is destroyed.

error

a GError

a GError

 

A GError

A GError

 

mfile

a GMappedFile, that will be free'd when the repository is destroyed

a GMappedFile, that will be free'd when the repository is destroyed

 

error

a GError

a GError

 
-gint +gint g_union_info_get_n_fields () @@ -57,7 +57,7 @@
-gint +gint g_union_info_get_n_methods () @@ -73,7 +73,7 @@
-gboolean +gboolean g_union_info_is_discriminated () @@ -81,7 +81,7 @@
-gint +gint g_union_info_get_discriminator_offset () @@ -113,7 +113,7 @@
-gsize +gsize g_union_info_get_size () @@ -121,7 +121,7 @@
-gsize +gsize g_union_info_get_alignment () @@ -162,7 +162,7 @@ fields is valid for specified instance.

Functions

g_union_info_get_n_fields ()

-
gint
+
gint
 g_union_info_get_n_fields (GIUnionInfo *info);

Obtain the number of fields this union has.

@@ -190,7 +190,7 @@ g_union_info_get_n_fields (

g_union_info_get_field ()

GIFieldInfo *
 g_union_info_get_field (GIUnionInfo *info,
-                        gint n);
+ gint n);

Obtain the type information for field with specified index.

Parameters

@@ -224,7 +224,7 @@ when done.


g_union_info_get_n_methods ()

-
gint
+
gint
 g_union_info_get_n_methods (GIUnionInfo *info);

Obtain the number of methods this union has.

@@ -252,7 +252,7 @@ g_union_info_get_n_methods (

g_union_info_get_method ()

GIFunctionInfo *
 g_union_info_get_method (GIUnionInfo *info,
-                         gint n);
+ gint n);

Obtain the type information for method with specified index.

Parameters

@@ -286,7 +286,7 @@ when done.


g_union_info_is_discriminated ()

-
gboolean
+
gboolean
 g_union_info_is_discriminated (GIUnionInfo *info);

Return true if this union contains discriminator field.

@@ -306,13 +306,13 @@ g_union_info_is_discriminated (

Returns

-

TRUE if this is a discriminated union, FALSE otherwise

+

TRUE if this is a discriminated union, FALSE otherwise


g_union_info_get_discriminator_offset ()

-
gint
+
gint
 g_union_info_get_discriminator_offset (GIUnionInfo *info);

Returns offset of the discriminator field in the structure.

@@ -368,7 +368,7 @@ when done.

g_union_info_get_discriminator ()

GIConstantInfo *
 g_union_info_get_discriminator (GIUnionInfo *info,
-                                gint n);
+ gint n);

Obtain discriminator value assigned for n-th union field, i.e. n-th union field is the active one if discriminator contains this constant.

@@ -406,7 +406,7 @@ when done.

g_union_info_find_method ()

GIFunctionInfo *
 g_union_info_find_method (GIUnionInfo *info,
-                          const gchar *name);
+ const gchar *name);

Obtain the type information for method named name .

@@ -441,7 +441,7 @@ when done.


g_union_info_get_size ()

-
gsize
+
gsize
 g_union_info_get_size (GIUnionInfo *info);

Obtain the total size of the union.

@@ -467,7 +467,7 @@ g_union_info_get_size (

g_union_info_get_alignment ()

-
gsize
+
gsize
 g_union_info_get_alignment (GIUnionInfo *info);

Obtain the required alignment of the union.

@@ -502,6 +502,6 @@ g_union_info_get_alignment ( -
Generated by GTK-Doc V1.29.1
+
Generated by GTK-Doc V1.28
\ No newline at end of file diff --git a/docs/reference/html/gi-GIVFuncInfo.html b/docs/reference/html/gi-GIVFuncInfo.html index e6d46de..150d318 100644 --- a/docs/reference/html/gi-GIVFuncInfo.html +++ b/docs/reference/html/gi-GIVFuncInfo.html @@ -8,7 +8,7 @@ - + @@ -49,7 +49,7 @@
-gint +gint g_vfunc_info_get_offset () @@ -73,7 +73,7 @@
-gpointer +gpointer g_vfunc_info_get_address () @@ -81,7 +81,7 @@
-gboolean +gboolean g_vfunc_info_invoke () @@ -155,7 +155,7 @@ more information about possible flag values.


g_vfunc_info_get_offset ()

-
gint
+
gint
 g_vfunc_info_get_offset (GIVFuncInfo *info);

Obtain the offset of the function pointer in the class struct. The value 0xFFFF indicates that the struct offset is unknown.

@@ -204,7 +204,7 @@ this virtual function belongs.

Returns

-

the signal or NULL if none set.

+

the signal or NULL if none set.

[transfer full]

@@ -233,7 +233,7 @@ method will return it. An invoker method is a C entry point.

Returns

-

the GIVFuncInfo or NULL. Free it with +

the GIVFuncInfo or NULL. Free it with g_base_info_unref() when done.

[transfer full]

@@ -241,10 +241,10 @@ method will return it. An invoker method is a C entry point.


g_vfunc_info_get_address ()

-
gpointer
+
gpointer
 g_vfunc_info_get_address (GIVFuncInfo *info,
-                          GType implementor_gtype,
-                          GError **error);
+ GType implementor_gtype, + GError **error);

This method will look up where inside the type struct of implementor_gtype is the implementation for info @@ -265,12 +265,12 @@ is the implementation for info

implementor_gtype

GType implementing this virtual function

GType implementing this virtual function

 

error

return location for a GError

return location for a GError

 

implementor

GType of the type that implements this virtual function

GType of the type that implements this virtual function

 

an array of GIArguments, one for each in parameter of info . If there are no in parameter, in_args -can be NULL.

[array length=n_in_args]

an array of GIArguments, one for each out parameter of info . If there are no out parameters, out_args -may be NULL.

[array length=n_out_args]

return location for the return value of the function. If the function returns void, return_value may be -NULL

 

error

return location for detailed error information, or NULL

return location for detailed error information, or NULL

 

GI_VFUNC_THROWS

-

Includes a GError

+

Includes a GError

 
-guint +guint gi_get_major_version () @@ -55,7 +55,7 @@
-guint +guint gi_get_minor_version () @@ -63,7 +63,7 @@
-guint +guint gi_get_micro_version () @@ -134,7 +134,7 @@ against.

Returns

-

TRUE if the version of the girepository header files +

TRUE if the version of the girepository header files is the same as or newer than the passed-in version.

Since: 1.60

@@ -142,7 +142,7 @@ is the same as or newer than the passed-in version.


gi_get_major_version ()

-
guint
+
guint
 gi_get_major_version (void);

Returns the major version number of the girepository library. (e.g. in version 1.58.2 this is 1.)

@@ -155,7 +155,7 @@ gi_get_major_version (void

gi_get_minor_version ()

-
guint
+
guint
 gi_get_minor_version (void);

Returns the minor version number of the girepository library. (e.g. in version 1.58.2 this is 58.)

@@ -168,7 +168,7 @@ gi_get_minor_version (void

gi_get_micro_version ()

-
guint
+
guint
 gi_get_micro_version (void);

Returns the micro version number of the girepository library. (e.g. in version 1.58.2 this is 2.)

@@ -199,7 +199,7 @@ gi_get_micro_version (void

GI_MICRO_VERSION

-
#define GI_MICRO_VERSION 0
+
#define GI_MICRO_VERSION 1
 

The micro version number of the girepository library.

Since: 1.60

@@ -207,6 +207,6 @@ gi_get_micro_version (void
+
Generated by GTK-Doc V1.28
\ No newline at end of file diff --git a/docs/reference/html/gi-girffi.html b/docs/reference/html/gi-girffi.html index 761bb02..ee4513c 100644 --- a/docs/reference/html/gi-girffi.html +++ b/docs/reference/html/gi-girffi.html @@ -8,7 +8,7 @@ - + @@ -73,7 +73,7 @@
-gboolean +gboolean g_function_info_prep_invoker () @@ -81,7 +81,7 @@
-gboolean +gboolean g_function_invoker_new_for_address () @@ -185,7 +185,7 @@

gi_type_tag_get_ffi_type ()

ffi_type *
 gi_type_tag_get_ffi_type (GITypeTag type_tag,
-                          gboolean is_pointer);
+ gboolean is_pointer);

TODO

Parameters

@@ -285,10 +285,10 @@ GIArgument: https://bugzilla.gnome.org/show_bug.cgi?id=665152


g_function_info_prep_invoker ()

-
gboolean
+
gboolean
 g_function_info_prep_invoker (GIFunctionInfo *info,
                               GIFunctionInvoker *invoker,
-                              GError **error);
+ GError **error);

Initialize the caller-allocated invoker structure with a cache of information needed to invoke the C function corresponding to @@ -318,7 +318,7 @@ inside the binding's function mapping.

error

A GError

A GError

 

error

A GError

A GError

 

gpointer native_address;

gpointer native_address;

the native address

 
+
Generated by GTK-Doc V1.28
\ No newline at end of file diff --git a/docs/reference/html/left-insensitive.png b/docs/reference/html/left-insensitive.png index 3269393a7f72af744a772c437bd7b3976c23709d..fea007e794358b964232405d5f0649fe2cfdcb54 100644 GIT binary patch delta 21 ccmeBX?q;44$n}U>mfb|NFJ{KljnM{-07(r7(f|Me delta 21 ccmeBX?q;44$aR-pK$uDJ*y_UejnM{-07!ra$N&HU diff --git a/docs/reference/html/left.png b/docs/reference/html/left.png index 2abde032b0c98b756b12d380da4318205cd78470..193905fc77cc68c94fb2329dd6ea50acd4656365 100644 GIT binary patch delta 20 bcmZo;YGaxZ$n}U>mfb|NFJ{KliP5V8L39To delta 20 bcmZo;YGaxZ$aR-pKuBIEA=i5E#OT!kK2Qd! diff --git a/docs/reference/html/right-insensitive.png b/docs/reference/html/right-insensitive.png index 4c95785b907b978f36674cd98bf5302669c15c1b..ef7d866a8855d181997c99fb7d65fb7b4983cb39 100644 GIT binary patch delta 21 dcmey$^p$BsAlD;iS#}f6zL*(HH%3b_0svV{2aW&$ delta 21 dcmey$^p$BsAlF@X0bwSdrE6v5HbzS^0svIf2IBw# diff --git a/docs/reference/html/right.png b/docs/reference/html/right.png index 76260ec8865f4e13cd269ec62eccd78a33adba3c..07fefed0d8f4419ec2bd2efe12d9725c0faf179e 100644 GIT binary patch delta 20 bcmZo=YGs-b$n}U>mfb|NFJ{KliP5V7K}`o8 delta 20 bcmZo=YGs-b$aR-pKuBIu?v6Xd#OPH3JLLu! diff --git a/docs/reference/html/up-insensitive.png b/docs/reference/html/up-insensitive.png index f40498606db349a7321cf6b470523e836ee7ac2e..99528f8c9e831a858518b3552fcc0cfed314168b 100644 GIT binary patch delta 21 dcmeyy^o?mkAlD;iS#}f6zL*(HH%3b{0svWc2ax~( delta 21 ccmeyy^o?mkAlF@X0bv&Ta?jsv8>6Ke0aXhI?*IS* diff --git a/docs/reference/html/up.png b/docs/reference/html/up.png index 80b4b37e997d69b2e128bc3090bc447ccb74bbe9..aa6a2ae951bbbbb0e76e8b9358fefb5e2d0d3064 100644 GIT binary patch delta 20 bcmZo+YGIlX$n}U>mfb|NFJ{KliP0+oK_&+p delta 20 ccmZo+YGIlX$aR-pKuCdo3jd3P6QfrG06&Ze1^@s6 diff --git a/docs/reference/version.xml b/docs/reference/version.xml index 4d5fde5..f6c9d76 100644 --- a/docs/reference/version.xml +++ b/docs/reference/version.xml @@ -1 +1 @@ -1.60.0 +1.60.1 diff --git a/gir/gio-2.0.c b/gir/gio-2.0.c index 99fa7a8..dc40cf8 100644 --- a/gir/gio-2.0.c +++ b/gir/gio-2.0.c @@ -36094,7 +36094,7 @@ * which may be filled with an array of #GSocketControlMessages, or %NULL * @num_messages: (out): a pointer which will be filled with the number of * elements in @messages, or %NULL - * @flags: (type GSocketMsgFlags) (inout): a pointer to an int containing #GSocketMsgFlags flags + * @flags: (inout): a pointer to an int containing #GSocketMsgFlags flags * @cancellable: a %GCancellable or %NULL * @error: a #GError pointer, or %NULL * @@ -36169,7 +36169,7 @@ * @socket: a #GSocket * @messages: (array length=num_messages): an array of #GInputMessage structs * @num_messages: the number of elements in @messages - * @flags: (type GSocketMsgFlags): an int containing #GSocketMsgFlags flags for the overall operation + * @flags: an int containing #GSocketMsgFlags flags for the overall operation * @cancellable: (nullable): a %GCancellable or %NULL * @error: #GError for error reporting, or %NULL to ignore * @@ -36290,7 +36290,7 @@ * @messages: (array length=num_messages) (nullable): a pointer to an * array of #GSocketControlMessages, or %NULL. * @num_messages: number of elements in @messages, or -1. - * @flags: (type GSocketMsgFlags): an int containing #GSocketMsgFlags flags + * @flags: an int containing #GSocketMsgFlags flags * @cancellable: (nullable): a %GCancellable or %NULL * @error: #GError for error reporting, or %NULL to ignore. * @@ -36347,7 +36347,7 @@ * @messages: (array length=num_messages) (nullable): a pointer to an * array of #GSocketControlMessages, or %NULL. * @num_messages: number of elements in @messages, or -1. - * @flags: (type GSocketMsgFlags): an int containing #GSocketMsgFlags flags + * @flags: an int containing #GSocketMsgFlags flags * @timeout_us: the maximum time (in microseconds) to wait, or -1 * @bytes_written: (out) (optional): location to store the number of bytes that were written to the socket * @cancellable: (nullable): a %GCancellable or %NULL @@ -36373,7 +36373,7 @@ * @socket: a #GSocket * @messages: (array length=num_messages): an array of #GOutputMessage structs * @num_messages: the number of elements in @messages - * @flags: (type GSocketMsgFlags): an int containing #GSocketMsgFlags flags + * @flags: an int containing #GSocketMsgFlags flags * @cancellable: (nullable): a %GCancellable or %NULL * @error: #GError for error reporting, or %NULL to ignore. * diff --git a/gir/meson.build b/gir/meson.build index 3d021bc..85ae575 100644 --- a/gir/meson.build +++ b/gir/meson.build @@ -41,6 +41,7 @@ scanner_command = [ girscanner, '--output=@OUTPUT@', '--no-libtool', + '--quiet', '--reparse-validate', '--add-include-path', join_paths(meson.current_build_dir()), '--add-include-path', join_paths(meson.current_source_dir()), diff --git a/girepository/giversion.h b/girepository/giversion.h index 047e6c5..9779489 100644 --- a/girepository/giversion.h +++ b/girepository/giversion.h @@ -27,7 +27,7 @@ G_BEGIN_DECLS #define GI_MAJOR_VERSION 1 #define GI_MINOR_VERSION 60 -#define GI_MICRO_VERSION 0 +#define GI_MICRO_VERSION 1 #define GI_CHECK_VERSION(major,minor,micro) \ (GI_MAJOR_VERSION > (major) || \ diff --git a/giscanner/_version.py b/giscanner/_version.py index 268f1d7..4e8f33d 100644 --- a/giscanner/_version.py +++ b/giscanner/_version.py @@ -1 +1 @@ -__version__ = '1.60.0' +__version__ = '1.60.1' diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py index 2c61f2f..e6de7bb 100644 --- a/giscanner/shlibs.py +++ b/giscanner/shlibs.py @@ -19,6 +19,7 @@ # import os +import sys import platform import re import subprocess @@ -104,13 +105,25 @@ def _resolve_non_libtool(options, binary, libraries): if isinstance(output, bytes): output = output.decode("utf-8", "replace") - # Use absolute paths on OS X to conform to how libraries are usually - # referenced on OS X systems, and file names everywhere else. - basename = platform.system() != 'Darwin' - return resolve_from_ldd_output(libraries, output, basename=basename) + shlibs = resolve_from_ldd_output(libraries, output) + return list(map(sanitize_shlib_path, shlibs)) -def resolve_from_ldd_output(libraries, output, basename=False): +def sanitize_shlib_path(lib): + # Use absolute paths on OS X to conform to how libraries are usually + # referenced on OS X systems, and file names everywhere else. + # In case we get relative paths on macOS (like @rpath) then we fall + # back to the basename as well: + # https://gitlab.gnome.org/GNOME/gobject-introspection/issues/222 + if sys.platform == "darwin": + if not os.path.isabs(lib): + return os.path.basename(lib) + return lib + else: + return os.path.basename(lib) + + +def resolve_from_ldd_output(libraries, output): patterns = {} for library in libraries: if not os.path.isfile(library): @@ -138,8 +151,6 @@ def resolve_from_ldd_output(libraries, output, basename=False): "ERROR: can't resolve libraries to shared libraries: " + ", ".join(patterns.keys())) - if basename: - shlibs = list(map(os.path.basename, shlibs)) return shlibs diff --git a/gobject-introspection-1.0.pc b/gobject-introspection-1.0.pc index 1d01b8b..39dfc5a 100644 --- a/gobject-introspection-1.0.pc +++ b/gobject-introspection-1.0.pc @@ -21,4 +21,4 @@ Libs.private: Name: gobject-introspection Description: GObject Introspection -Version: 1.60.0 +Version: 1.60.1 diff --git a/gobject-introspection-no-export-1.0.pc b/gobject-introspection-no-export-1.0.pc index 2e32af6..9e28d20 100644 --- a/gobject-introspection-no-export-1.0.pc +++ b/gobject-introspection-no-export-1.0.pc @@ -20,4 +20,4 @@ Libs.private: Name: gobject-introspection Description: GObject Introspection -Version: 1.60.0 +Version: 1.60.1 diff --git a/meson.build b/meson.build index 0ab2dc3..95bbd2b 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('gobject-introspection', 'c', - version: '1.60.0', + version: '1.60.1', meson_version: '>= 0.47.0', default_options: [ 'warning_level=1', diff --git a/tests/meson.build b/tests/meson.build index 7e01595..9c7c076 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -52,6 +52,7 @@ test_everything_files = custom_target('everything', command: [ python, girscanner, + '--quiet', '--generate-typelib-tests=Everything,@OUTPUT0@,@OUTPUT1@', '--function-decoration=_GI_TEST_EXTERN', '--include-first-in-src=config.h', @@ -103,6 +104,7 @@ if glib_dep.type_name() == 'pkgconfig' command: [ python, girscanner, + '--quiet', '--output=@OUTPUT@', '--no-libtool', '--reparse-validate', @@ -127,6 +129,7 @@ if glib_dep.type_name() == 'pkgconfig' command: [ python, girscanner, + '--quiet', '--output=@OUTPUT@', '--no-libtool', '--reparse-validate', diff --git a/tests/offsets/meson.build b/tests/offsets/meson.build index ca1471f..6670f21 100644 --- a/tests/offsets/meson.build +++ b/tests/offsets/meson.build @@ -20,6 +20,7 @@ if glib_dep.type_name() == 'pkgconfig' command: [ python, girscanner, + '--quiet', '--output=@OUTPUT@', '--no-libtool', '--reparse-validate', diff --git a/tests/scanner/meson.build b/tests/scanner/meson.build index 4210488..ef459bb 100644 --- a/tests/scanner/meson.build +++ b/tests/scanner/meson.build @@ -113,6 +113,7 @@ if glib_dep.type_name() == 'pkgconfig' command: [ python, girscanner, + '--quiet', '--output=@OUTPUT@', '--no-libtool', '--reparse-validate', @@ -151,6 +152,7 @@ if glib_dep.type_name() == 'pkgconfig' command: [ python, girscanner, + '--quiet', '--output=@OUTPUT@', '--no-libtool', '--reparse-validate', @@ -188,6 +190,7 @@ if glib_dep.type_name() == 'pkgconfig' command: [ python, girscanner, + '--quiet', '--output=@OUTPUT@', '--no-libtool', '--reparse-validate', @@ -224,6 +227,7 @@ if glib_dep.type_name() == 'pkgconfig' command: [ python, girscanner, + '--quiet', '--output=@OUTPUT@', '--no-libtool', '--reparse-validate', @@ -258,6 +262,7 @@ if glib_dep.type_name() == 'pkgconfig' command: [ python, girscanner, + '--quiet', '--output=@OUTPUT@', '--no-libtool', '--reparse-validate', @@ -294,6 +299,7 @@ if glib_dep.type_name() == 'pkgconfig' command: [ python, girscanner, + '--quiet', '--output=@OUTPUT@', '--no-libtool', '--reparse-validate', @@ -331,6 +337,7 @@ if glib_dep.type_name() == 'pkgconfig' command: [ python, girscanner, + '--quiet', '--output=@OUTPUT@', '--no-libtool', '--reparse-validate', @@ -367,6 +374,7 @@ if glib_dep.type_name() == 'pkgconfig' command: [ python, girscanner, + '--quiet', '--output=@OUTPUT@', '--no-libtool', '--reparse-validate', @@ -393,6 +401,7 @@ if glib_dep.type_name() == 'pkgconfig' command: [ python, girscanner, + '--quiet', '--output=@OUTPUT@', '--no-libtool', '--accept-unprefixed', @@ -420,6 +429,7 @@ if glib_dep.type_name() == 'pkgconfig' command: [ python, girscanner, + '--quiet', '--output=@OUTPUT@', '--no-libtool', '--warn-all', @@ -454,6 +464,7 @@ if glib_dep.type_name() == 'pkgconfig' command: [ python, girscanner, + '--quiet', '--output=@OUTPUT@', '--no-libtool', '--reparse-validate', diff --git a/tests/scanner/test_ccompiler.py b/tests/scanner/test_ccompiler.py index dd8700d..5890aa9 100644 --- a/tests/scanner/test_ccompiler.py +++ b/tests/scanner/test_ccompiler.py @@ -85,7 +85,7 @@ class UnixCCompilerTest(unittest.TestCase): # Don't actually do anything. cc.compiler.dry_run = True cc.compile(pkg_config_cflags, cpp_includes, [source], init_sections) - spawn.assert_called_once() + self.assertEqual(1, spawn.call_count) args, kwargs = spawn.call_args return args[0] @@ -106,7 +106,7 @@ class UnixCCompilerTest(unittest.TestCase): # Don't actually do anything. cc.compiler.dry_run = True cc.preprocess(source, output, cpp_options) - spawn.assert_called_once() + self.assertEqual(1, spawn.call_count) args, kwargs = spawn.call_args return args[0] diff --git a/tests/scanner/test_shlibs.py b/tests/scanner/test_shlibs.py index f3fb0d2..a8337c6 100644 --- a/tests/scanner/test_shlibs.py +++ b/tests/scanner/test_shlibs.py @@ -1,6 +1,8 @@ import unittest +import sys +import os -from giscanner.shlibs import resolve_from_ldd_output +from giscanner.shlibs import resolve_from_ldd_output, sanitize_shlib_path class TestLddParser(unittest.TestCase): @@ -18,6 +20,28 @@ class TestLddParser(unittest.TestCase): ['libglib-2.0.so.0', 'libgtk-3.so.0', 'libpango-1.0.so.0'], resolve_from_ldd_output(libraries, output)) + @unittest.skipUnless(os.name == "posix", "posix only") + def test_resolve_from_ldd_output_macos_rpath(self): + output = '''\ + @rpath/libbarapp-1.0.dylib (compatibility version 0.0.0, current version 0.0.0) + /foo/libgio-2.0.0.dylib (compatibility version 5801.0.0, current version 5801.3.0) + /foo/libgmodule-2.0.0.dylib (compatibility version 5801.0.0, current version 5801.3.0)''' + + libraries = ['barapp-1.0'] + shlibs = resolve_from_ldd_output(libraries, output) + self.assertEqual(shlibs, ['@rpath/libbarapp-1.0.dylib']) + self.assertEqual(sanitize_shlib_path(shlibs[0]), 'libbarapp-1.0.dylib') + + @unittest.skipUnless(os.name == "posix", "posix only") + def test_sanitize_shlib_path(self): + self.assertEqual( + sanitize_shlib_path('@rpath/libbarapp-1.0.dylib'), + 'libbarapp-1.0.dylib') + + self.assertEqual( + sanitize_shlib_path('/foo/bar'), + '/foo/bar' if sys.platform == 'darwin' else 'bar') + def test_unresolved_library(self): output = '' libraries = ['foo'] @@ -87,10 +111,7 @@ class TestLddParser(unittest.TestCase): self.assertEqual( ['/usr/lib/libfoo.so'], - resolve_from_ldd_output(['foo'], output, basename=False)) - self.assertEqual( - ['libfoo.so'], - resolve_from_ldd_output(['foo'], output, basename=True)) + resolve_from_ldd_output(['foo'], output)) if __name__ == '__main__': -- 2.7.4