From 03564d050908965bc3f4225774e95bb92089fee5 Mon Sep 17 00:00:00 2001 From: DongHun Kwak Date: Thu, 27 Oct 2016 14:35:52 +0900 Subject: [PATCH] Imported Upstream version 1.50.0 Change-Id: I575d4a4070fc55e27d5a10fdd3549b26621bbb5a Signed-off-by: DongHun Kwak --- build/win32/vs10/gi-version-paths.props | 2 +- build/win32/vs9/gi-version-paths.vsprops | 2 +- config.h.win32 | 6 ++--- configure | 40 ++++++++++++++-------------- configure.ac | 6 ++--- docs/reference/html/annotation-glossary.html | 5 ++++ docs/reference/html/gi-GIBaseInfo.html | 4 +-- docs/reference/html/gi-GICallableInfo.html | 4 +-- docs/reference/html/index.html | 2 +- docs/reference/version.xml | 2 +- gir/glib-2.0.c | 2 +- girepository/gibaseinfo.c | 2 +- girepository/gicallableinfo.c | 2 +- gobject-introspection-1.0.pc | 2 +- gobject-introspection-no-export-1.0.pc | 2 +- 15 files changed, 44 insertions(+), 39 deletions(-) diff --git a/build/win32/vs10/gi-version-paths.props b/build/win32/vs10/gi-version-paths.props index efcc748..7a13a77 100644 --- a/build/win32/vs10/gi-version-paths.props +++ b/build/win32/vs10/gi-version-paths.props @@ -10,7 +10,7 @@ $(PythonDir).x64 PYTHON=$(PythonDir)\python.exe PYTHON=$(PythonDirX64)\python.exe - 1.49.2 + 1.50.0 $(SolutionDir)\..\..\.. 1.0 $(SolutionDir)$(Configuration)\$(Platform)\obj\$(ProjectName) diff --git a/build/win32/vs9/gi-version-paths.vsprops b/build/win32/vs9/gi-version-paths.vsprops index 4769bab..af45d27 100644 --- a/build/win32/vs9/gi-version-paths.vsprops +++ b/build/win32/vs9/gi-version-paths.vsprops @@ -36,7 +36,7 @@ /> . # @@ -591,8 +591,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='gobject-introspection' PACKAGE_TARNAME='gobject-introspection' -PACKAGE_VERSION='1.49.2' -PACKAGE_STRING='gobject-introspection 1.49.2' +PACKAGE_VERSION='1.50.0' +PACKAGE_STRING='gobject-introspection 1.50.0' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gobject-introspection' PACKAGE_URL='' @@ -1434,7 +1434,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.49.2 to adapt to many kinds of systems. +\`configure' configures gobject-introspection 1.50.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1505,7 +1505,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of gobject-introspection 1.49.2:";; + short | recursive ) echo "Configuration of gobject-introspection 1.50.0:";; esac cat <<\_ACEOF @@ -1667,7 +1667,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -gobject-introspection configure 1.49.2 +gobject-introspection configure 1.50.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2219,7 +2219,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.49.2, which was +It was created by gobject-introspection $as_me 1.50.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3087,7 +3087,7 @@ fi # Define the identity of the package. PACKAGE='gobject-introspection' - VERSION='1.49.2' + VERSION='1.50.0' cat >>confdefs.h <<_ACEOF @@ -3361,7 +3361,7 @@ AM_BACKSLASH='\' # Used in docs/reference/version.xml -GI_VERSION=1.49.2 +GI_VERSION=1.50.0 # Check for Win32 @@ -13131,12 +13131,12 @@ if test -n "$GLIB_CFLAGS"; then pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.49.7\""; } >&5 - ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.49.7") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.50.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.50.0") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.49.7" 2>/dev/null` + pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.50.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -13148,12 +13148,12 @@ if test -n "$GLIB_LIBS"; then pkg_cv_GLIB_LIBS="$GLIB_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.49.7\""; } >&5 - ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.49.7") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.50.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.50.0") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.49.7" 2>/dev/null` + pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.50.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -13174,14 +13174,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.49.7" 2>&1` + GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.50.0" 2>&1` else - GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.49.7" 2>&1` + GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.50.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GLIB_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (glib-2.0 >= 2.49.7) were not met: + as_fn_error $? "Package requirements (glib-2.0 >= 2.50.0) were not met: $GLIB_PKG_ERRORS @@ -16021,7 +16021,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.49.2, which was +This file was extended by gobject-introspection $as_me 1.50.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16087,7 +16087,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.49.2 +gobject-introspection config.status 1.50.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 138a799..9d5c7bf 100644 --- a/configure.ac +++ b/configure.ac @@ -3,8 +3,8 @@ dnl the gi version number m4_define(gi_major_version, 1) -m4_define(gi_minor_version, 49) -m4_define(gi_micro_version, 2) +m4_define(gi_minor_version, 50) +m4_define(gi_micro_version, 0) m4_define(gi_version, gi_major_version.gi_minor_version.gi_micro_version) AC_PREREQ([2.63]) @@ -128,7 +128,7 @@ GIR_DIR="$EXPANDED_DATADIR/$GIR_SUFFIX" AC_SUBST(GIR_DIR) AC_DEFINE_UNQUOTED(GIR_DIR, "$GIR_DIR", [Director prefix for gir installation]) -PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.49.7]) +PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.50.0]) PKG_CHECK_MODULES(GOBJECT, [gobject-2.0]) PKG_CHECK_MODULES(GMODULE, [gmodule-2.0]) PKG_CHECK_MODULES(GIO, [gio-2.0]) diff --git a/docs/reference/html/annotation-glossary.html b/docs/reference/html/annotation-glossary.html index d812b79..66dbb15 100644 --- a/docs/reference/html/annotation-glossary.html +++ b/docs/reference/html/annotation-glossary.html @@ -16,6 +16,8 @@  |  E  |  + I +  |  N  |  O @@ -37,6 +39,9 @@

E

element-type

Generics and defining elements of containers and arrays.

+

I

+
inout
+

Parameter for input and for returning results. Default is transfer full.

N

nullable

NULL may be passed as the value in, out, in-out; or as a return value.

diff --git a/docs/reference/html/gi-GIBaseInfo.html b/docs/reference/html/gi-GIBaseInfo.html index 7a3af5c..dda961f 100644 --- a/docs/reference/html/gi-GIBaseInfo.html +++ b/docs/reference/html/gi-GIBaseInfo.html @@ -566,8 +566,8 @@ and must not be freed.

iterator

-

a GIAttributeIter structure, must be initialized; see below

-  +

a GIAttributeIter structure, must be initialized; see below.

+[inout]

name

diff --git a/docs/reference/html/gi-GICallableInfo.html b/docs/reference/html/gi-GICallableInfo.html index a41b57f..0957f38 100644 --- a/docs/reference/html/gi-GICallableInfo.html +++ b/docs/reference/html/gi-GICallableInfo.html @@ -530,8 +530,8 @@ similar API.

iterator

-

a GIAttributeIter structure, must be initialized; see below

-  +

a GIAttributeIter structure, must be initialized; see below.

+[inout]

name

diff --git a/docs/reference/html/index.html b/docs/reference/html/index.html index e4338d0..5ca5df3 100644 --- a/docs/reference/html/index.html +++ b/docs/reference/html/index.html @@ -15,7 +15,7 @@

- This document is for GObject Introspection version 1.49.2 + This document is for GObject Introspection version 1.50.0 . The latest version of this documentation can be found on-line at http://developer.gnome.org/gi/unstable/. diff --git a/docs/reference/version.xml b/docs/reference/version.xml index 666633d..5a5c721 100644 --- a/docs/reference/version.xml +++ b/docs/reference/version.xml @@ -1 +1 @@ -1.49.2 +1.50.0 diff --git a/gir/glib-2.0.c b/gir/glib-2.0.c index 639d0d8..9e0b51b 100644 --- a/gir/glib-2.0.c +++ b/gir/glib-2.0.c @@ -19640,7 +19640,7 @@ /** * g_log_variant: - * @log_domain: log domain, usually %G_LOG_DOMAIN + * @log_domain: (allow-none): log domain, usually %G_LOG_DOMAIN * @log_level: log level, either from #GLogLevelFlags, or a user-defined * level * @fields: a dictionary (#GVariant of the type %G_VARIANT_TYPE_VARDICT) diff --git a/girepository/gibaseinfo.c b/girepository/gibaseinfo.c index 5d9e5f3..ced7674 100644 --- a/girepository/gibaseinfo.c +++ b/girepository/gibaseinfo.c @@ -558,7 +558,7 @@ _attribute_blob_find_first (GIBaseInfo *info, /** * g_base_info_iterate_attributes: * @info: a #GIBaseInfo - * @iterator: a #GIAttributeIter structure, must be initialized; see below + * @iterator: (inout): a #GIAttributeIter structure, must be initialized; see below * @name: (out) (transfer none): Returned name, must not be freed * @value: (out) (transfer none): Returned name, must not be freed * diff --git a/girepository/gicallableinfo.c b/girepository/gicallableinfo.c index 27c7cb2..4ffb46d 100644 --- a/girepository/gicallableinfo.c +++ b/girepository/gicallableinfo.c @@ -424,7 +424,7 @@ g_callable_info_get_return_attribute (GICallableInfo *info, /** * g_callable_info_iterate_return_attributes: * @info: a #GICallableInfo - * @iterator: a #GIAttributeIter structure, must be initialized; see below + * @iterator: (inout): a #GIAttributeIter structure, must be initialized; see below * @name: (out) (transfer none): Returned name, must not be freed * @value: (out) (transfer none): Returned name, must not be freed * diff --git a/gobject-introspection-1.0.pc b/gobject-introspection-1.0.pc index 1a3030f..26ff5f6 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.49.2 +Version: 1.50.0 diff --git a/gobject-introspection-no-export-1.0.pc b/gobject-introspection-no-export-1.0.pc index 3144f19..c4569e4 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.49.2 +Version: 1.50.0 -- 2.7.4