diff -Nru gobject-introspection-1.45.2/aclocal.m4 gobject-introspection-1.45.3/aclocal.m4 --- gobject-introspection-1.45.2/aclocal.m4 2015-05-26 06:40:23.000000000 +0000 +++ gobject-introspection-1.45.3/aclocal.m4 2015-07-03 20:30:30.000000000 +0000 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.14.1 -*- Autoconf -*- +# generated automatically by aclocal 1.15 -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -235,7 +235,7 @@ AS_VAR_IF([$1], [""], [$5], [$4])dnl ])# PKG_CHECK_VAR -# Copyright (C) 2002-2013 Free Software Foundation, Inc. +# Copyright (C) 2002-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -247,10 +247,10 @@ # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.14' +[am__api_version='1.15' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.14.1], [], +m4_if([$1], [1.15], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -266,14 +266,14 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.14.1])dnl +[AM_AUTOMAKE_VERSION([1.15])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -318,15 +318,14 @@ # configured tree to be moved without reconfiguration. AC_DEFUN([AM_AUX_DIR_EXPAND], -[dnl Rely on autoconf to set up CDPATH properly. -AC_PREREQ([2.50])dnl -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` +[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl +# Expand $ac_aux_dir to an absolute path. +am_aux_dir=`cd "$ac_aux_dir" && pwd` ]) # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2013 Free Software Foundation, Inc. +# Copyright (C) 1997-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -357,7 +356,7 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -548,7 +547,7 @@ # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -624,7 +623,7 @@ # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -714,8 +713,8 @@ # # AC_SUBST([mkdir_p], ['$(MKDIR_P)']) -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. +# We need awk for the "check" target (and possibly the TAP driver). The +# system "awk" is bad on some platforms. AC_REQUIRE([AC_PROG_AWK])dnl AC_REQUIRE([AC_PROG_MAKE_SET])dnl AC_REQUIRE([AM_SET_LEADING_DOT])dnl @@ -789,6 +788,9 @@ AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) fi fi +dnl The trailing newline in this macro's definition is deliberate, for +dnl backward compatibility and to allow trailing 'dnl'-style comments +dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841. ]) dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not @@ -818,7 +820,7 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -829,7 +831,7 @@ # Define $install_sh. AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -if test x"${install_sh}" != xset; then +if test x"${install_sh+set}" != xset; then case $am_aux_dir in *\ * | *\ *) install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; @@ -839,7 +841,7 @@ fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2013 Free Software Foundation, Inc. +# Copyright (C) 2003-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -861,7 +863,7 @@ # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -896,7 +898,7 @@ # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -946,7 +948,7 @@ # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2013 Free Software Foundation, Inc. +# Copyright (C) 1997-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -985,7 +987,7 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1014,7 +1016,7 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1061,7 +1063,7 @@ # For backward compatibility. AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1296,7 +1298,7 @@ sys.exit(sys.hexversion < minverhex)" AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])]) -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1315,7 +1317,7 @@ # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1396,7 +1398,7 @@ rm -f conftest.file ]) -# Copyright (C) 2009-2013 Free Software Foundation, Inc. +# Copyright (C) 2009-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1456,7 +1458,7 @@ _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1484,7 +1486,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2013 Free Software Foundation, Inc. +# Copyright (C) 2006-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1503,7 +1505,7 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2013 Free Software Foundation, Inc. +# Copyright (C) 2004-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru gobject-introspection-1.45.2/build/Makefile.in gobject-introspection-1.45.3/build/Makefile.in --- gobject-introspection-1.45.2/build/Makefile.in 2015-05-26 06:40:26.000000000 +0000 +++ gobject-introspection-1.45.3/build/Makefile.in 2015-07-03 20:30:32.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,7 +14,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,7 +88,6 @@ build_triplet = @build@ host_triplet = @host@ subdir = build -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ @@ -87,6 +96,7 @@ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -146,6 +156,7 @@ ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -374,7 +385,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign build/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign build/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -669,6 +679,8 @@ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ ps ps-am tags tags-am uninstall uninstall-am +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru gobject-introspection-1.45.2/build/win32/Makefile.in gobject-introspection-1.45.3/build/win32/Makefile.in --- gobject-introspection-1.45.2/build/win32/Makefile.in 2015-05-26 06:40:26.000000000 +0000 +++ gobject-introspection-1.45.3/build/win32/Makefile.in 2015-07-03 20:30:32.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,7 +14,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,7 +88,6 @@ build_triplet = @build@ host_triplet = @host@ subdir = build/win32 -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ @@ -87,6 +96,7 @@ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -146,6 +156,7 @@ ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -370,7 +381,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign build/win32/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign build/win32/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -665,6 +675,8 @@ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ ps ps-am tags tags-am uninstall uninstall-am +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru gobject-introspection-1.45.2/build/win32/vs10/Makefile.in gobject-introspection-1.45.3/build/win32/vs10/Makefile.in --- gobject-introspection-1.45.2/build/win32/vs10/Makefile.in 2015-05-26 06:40:26.000000000 +0000 +++ gobject-introspection-1.45.3/build/win32/vs10/Makefile.in 2015-07-03 20:30:32.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,7 +14,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,7 +88,6 @@ build_triplet = @build@ host_triplet = @host@ subdir = build/win32/vs10 -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ @@ -87,6 +96,7 @@ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -111,6 +121,7 @@ *) (install-info --version) >/dev/null 2>&1;; \ esac am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -331,7 +342,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign build/win32/vs10/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign build/win32/vs10/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -507,6 +517,8 @@ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags-am uninstall uninstall-am +.PRECIOUS: Makefile + gi-install.props: $(top_srcdir)/build/win32/vs10/gi-install.propsin gir.vs10.install $(CPP) -P - <$(top_srcdir)/build/win32/vs10/gi-install.propsin >$@ diff -Nru gobject-introspection-1.45.2/build/win32/vs11/Makefile.in gobject-introspection-1.45.3/build/win32/vs11/Makefile.in --- gobject-introspection-1.45.2/build/win32/vs11/Makefile.in 2015-05-26 06:40:26.000000000 +0000 +++ gobject-introspection-1.45.3/build/win32/vs11/Makefile.in 2015-07-03 20:30:32.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -23,7 +23,17 @@ # MSVC_SLN: name of root project VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -86,8 +96,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/build/Makefile-newvs.am \ - $(srcdir)/Makefile.in $(srcdir)/Makefile.am subdir = build/win32/vs11 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ @@ -97,6 +105,7 @@ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -121,6 +130,8 @@ *) (install-info --version) >/dev/null 2>&1;; \ esac am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/build/Makefile-newvs.am DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -344,7 +355,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign build/win32/vs11/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign build/win32/vs11/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -353,7 +363,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/build/Makefile-newvs.am: +$(top_srcdir)/build/Makefile-newvs.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -521,6 +531,8 @@ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags-am uninstall uninstall-am +.PRECIOUS: Makefile + $(MSVC_SLN).sln: $(top_srcdir)/build/win32/vs10/$(MSVC_SLN).sln cat $< | sed 's/11\.00/$(MSVC_FORMAT_VER)\.00/g' | sed 's/2010/$(MSVC_VER_LONG)/g' > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@ diff -Nru gobject-introspection-1.45.2/build/win32/vs12/Makefile.in gobject-introspection-1.45.3/build/win32/vs12/Makefile.in --- gobject-introspection-1.45.2/build/win32/vs12/Makefile.in 2015-05-26 06:40:27.000000000 +0000 +++ gobject-introspection-1.45.3/build/win32/vs12/Makefile.in 2015-07-03 20:30:32.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -23,7 +23,17 @@ # MSVC_SLN: name of root project VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -86,8 +96,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/build/Makefile-newvs.am \ - $(srcdir)/Makefile.in $(srcdir)/Makefile.am subdir = build/win32/vs12 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ @@ -97,6 +105,7 @@ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -121,6 +130,8 @@ *) (install-info --version) >/dev/null 2>&1;; \ esac am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/build/Makefile-newvs.am DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -344,7 +355,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign build/win32/vs12/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign build/win32/vs12/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -353,7 +363,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/build/Makefile-newvs.am: +$(top_srcdir)/build/Makefile-newvs.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -521,6 +531,8 @@ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags-am uninstall uninstall-am +.PRECIOUS: Makefile + $(MSVC_SLN).sln: $(top_srcdir)/build/win32/vs10/$(MSVC_SLN).sln cat $< | sed 's/11\.00/$(MSVC_FORMAT_VER)\.00/g' | sed 's/2010/$(MSVC_VER_LONG)/g' > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@ diff -Nru gobject-introspection-1.45.2/build/win32/vs9/Makefile.in gobject-introspection-1.45.3/build/win32/vs9/Makefile.in --- gobject-introspection-1.45.2/build/win32/vs9/Makefile.in 2015-05-26 06:40:27.000000000 +0000 +++ gobject-introspection-1.45.3/build/win32/vs9/Makefile.in 2015-07-03 20:30:32.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,7 +14,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,7 +88,6 @@ build_triplet = @build@ host_triplet = @host@ subdir = build/win32/vs9 -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ @@ -87,6 +96,7 @@ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -111,6 +121,7 @@ *) (install-info --version) >/dev/null 2>&1;; \ esac am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -324,7 +335,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign build/win32/vs9/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign build/win32/vs9/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -500,6 +510,8 @@ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags-am uninstall uninstall-am +.PRECIOUS: Makefile + gi-install.vsprops: $(top_srcdir)/build/win32/vs9/gi-install.vspropsin gir.vs9.install $(CPP) -P - <$(top_srcdir)/build/win32/vs9/gi-install.vspropsin >$@ diff -Nru gobject-introspection-1.45.2/build-aux/compile gobject-introspection-1.45.3/build-aux/compile --- gobject-introspection-1.45.2/build-aux/compile 2015-05-26 06:40:25.000000000 +0000 +++ gobject-introspection-1.45.3/build-aux/compile 2015-07-03 20:30:32.000000000 +0000 @@ -3,7 +3,7 @@ scriptversion=2012-10-14.11; # UTC -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify diff -Nru gobject-introspection-1.45.2/build-aux/config.guess gobject-introspection-1.45.3/build-aux/config.guess --- gobject-introspection-1.45.2/build-aux/config.guess 2015-05-26 06:40:25.000000000 +0000 +++ gobject-introspection-1.45.3/build-aux/config.guess 2015-07-03 20:30:32.000000000 +0000 @@ -1,8 +1,8 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2014 Free Software Foundation, Inc. +# Copyright 1992-2015 Free Software Foundation, Inc. -timestamp='2014-03-23' +timestamp='2015-01-01' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -24,12 +24,12 @@ # program. This Exception is an additional permission under section 7 # of the GNU General Public License, version 3 ("GPLv3"). # -# Originally written by Per Bothner. +# Originally written by Per Bothner; maintained since 2000 by Ben Elliston. # # You can get the latest version of this script from: # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD # -# Please send patches with a ChangeLog entry to config-patches@gnu.org. +# Please send patches to . me=`echo "$0" | sed -e 's,.*/,,'` @@ -50,7 +50,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2014 Free Software Foundation, Inc. +Copyright 1992-2015 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -579,8 +579,9 @@ else IBM_ARCH=powerpc fi - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` + if [ -x /usr/bin/lslpp ] ; then + IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | + awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` else IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi diff -Nru gobject-introspection-1.45.2/build-aux/config.sub gobject-introspection-1.45.3/build-aux/config.sub --- gobject-introspection-1.45.2/build-aux/config.sub 2015-05-26 06:40:25.000000000 +0000 +++ gobject-introspection-1.45.3/build-aux/config.sub 2015-07-03 20:30:32.000000000 +0000 @@ -1,8 +1,8 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2014 Free Software Foundation, Inc. +# Copyright 1992-2015 Free Software Foundation, Inc. -timestamp='2014-09-11' +timestamp='2015-01-01' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -25,7 +25,7 @@ # of the GNU General Public License, version 3 ("GPLv3"). -# Please send patches with a ChangeLog entry to config-patches@gnu.org. +# Please send patches to . # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. @@ -68,7 +68,7 @@ version="\ GNU config.sub ($timestamp) -Copyright 1992-2014 Free Software Foundation, Inc. +Copyright 1992-2015 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -260,7 +260,7 @@ | c4x | c8051 | clipper \ | d10v | d30v | dlx | dsp16xx \ | epiphany \ - | fido | fr30 | frv \ + | fido | fr30 | frv | ft32 \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | hexagon \ | i370 | i860 | i960 | ia64 \ @@ -313,6 +313,7 @@ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ | ubicom32 \ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ + | visium \ | we32k \ | x86 | xc16x | xstormy16 | xtensa \ | z8k | z80) @@ -327,6 +328,9 @@ c6x) basic_machine=tic6x-unknown ;; + leon|leon[3-9]) + basic_machine=sparc-$basic_machine + ;; m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) basic_machine=$basic_machine-unknown os=-none @@ -437,6 +441,7 @@ | ubicom32-* \ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ | vax-* \ + | visium-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* \ | xstormy16-* | xtensa*-* \ @@ -774,6 +779,9 @@ basic_machine=m68k-isi os=-sysv ;; + leon-*|leon[3-9]-*) + basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'` + ;; m68knommu) basic_machine=m68k-unknown os=-linux @@ -1017,7 +1025,7 @@ ;; ppc64) basic_machine=powerpc64-unknown ;; - ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` + ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppc64le | powerpc64little | ppc64-le | powerpc64-little) basic_machine=powerpc64le-unknown diff -Nru gobject-introspection-1.45.2/build-aux/depcomp gobject-introspection-1.45.3/build-aux/depcomp --- gobject-introspection-1.45.2/build-aux/depcomp 2015-05-26 06:40:27.000000000 +0000 +++ gobject-introspection-1.45.3/build-aux/depcomp 2015-07-03 20:30:33.000000000 +0000 @@ -3,7 +3,7 @@ scriptversion=2013-05-30.07; # UTC -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff -Nru gobject-introspection-1.45.2/build-aux/install-sh gobject-introspection-1.45.3/build-aux/install-sh --- gobject-introspection-1.45.2/build-aux/install-sh 2015-05-26 06:40:25.000000000 +0000 +++ gobject-introspection-1.45.3/build-aux/install-sh 2015-07-03 20:30:32.000000000 +0000 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2011-11-20.07; # UTC +scriptversion=2013-12-25.23; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -41,19 +41,15 @@ # This script is compatible with the BSD install script, but was written # from scratch. +tab=' ' nl=' ' -IFS=" "" $nl" +IFS=" $tab$nl" -# set DOITPROG to echo to test this script +# Set DOITPROG to "echo" to test this script. -# Don't use :- since 4.3BSD and earlier shells don't like it. doit=${DOITPROG-} -if test -z "$doit"; then - doit_exec=exec -else - doit_exec=$doit -fi +doit_exec=${doit:-exec} # Put in absolute file names if you don't have them in your path; # or use environment vars. @@ -68,17 +64,6 @@ rmprog=${RMPROG-rm} stripprog=${STRIPPROG-strip} -posix_glob='?' -initialize_posix_glob=' - test "$posix_glob" != "?" || { - if (set -f) 2>/dev/null; then - posix_glob= - else - posix_glob=: - fi - } -' - posix_mkdir= # Desired mode of installed file. @@ -97,7 +82,7 @@ dst_arg= copy_on_change=false -no_target_directory= +is_target_a_directory=possibly usage="\ Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE @@ -137,46 +122,57 @@ -d) dir_arg=true;; -g) chgrpcmd="$chgrpprog $2" - shift;; + shift;; --help) echo "$usage"; exit $?;; -m) mode=$2 - case $mode in - *' '* | *' '* | *' -'* | *'*'* | *'?'* | *'['*) - echo "$0: invalid mode: $mode" >&2 - exit 1;; - esac - shift;; + case $mode in + *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*) + echo "$0: invalid mode: $mode" >&2 + exit 1;; + esac + shift;; -o) chowncmd="$chownprog $2" - shift;; + shift;; -s) stripcmd=$stripprog;; - -t) dst_arg=$2 - # Protect names problematic for 'test' and other utilities. - case $dst_arg in - -* | [=\(\)!]) dst_arg=./$dst_arg;; - esac - shift;; + -t) + is_target_a_directory=always + dst_arg=$2 + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac + shift;; - -T) no_target_directory=true;; + -T) is_target_a_directory=never;; --version) echo "$0 $scriptversion"; exit $?;; - --) shift - break;; + --) shift + break;; - -*) echo "$0: invalid option: $1" >&2 - exit 1;; + -*) echo "$0: invalid option: $1" >&2 + exit 1;; *) break;; esac shift done +# We allow the use of options -d and -T together, by making -d +# take the precedence; this is for compatibility with GNU install. + +if test -n "$dir_arg"; then + if test -n "$dst_arg"; then + echo "$0: target directory not allowed when installing a directory." >&2 + exit 1 + fi +fi + if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then # When -d is used, all remaining arguments are directories to create. # When -t is used, the destination is already specified. @@ -208,6 +204,15 @@ fi if test -z "$dir_arg"; then + if test $# -gt 1 || test "$is_target_a_directory" = always; then + if test ! -d "$dst_arg"; then + echo "$0: $dst_arg: Is not a directory." >&2 + exit 1 + fi + fi +fi + +if test -z "$dir_arg"; then do_exit='(exit $ret); exit $ret' trap "ret=129; $do_exit" 1 trap "ret=130; $do_exit" 2 @@ -223,16 +228,16 @@ *[0-7]) if test -z "$stripcmd"; then - u_plus_rw= + u_plus_rw= else - u_plus_rw='% 200' + u_plus_rw='% 200' fi cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; *) if test -z "$stripcmd"; then - u_plus_rw= + u_plus_rw= else - u_plus_rw=,u+rw + u_plus_rw=,u+rw fi cp_umask=$mode$u_plus_rw;; esac @@ -269,41 +274,15 @@ # If destination is a directory, append the input filename; won't work # if double slashes aren't ignored. if test -d "$dst"; then - if test -n "$no_target_directory"; then - echo "$0: $dst_arg: Is a directory" >&2 - exit 1 + if test "$is_target_a_directory" = never; then + echo "$0: $dst_arg: Is a directory" >&2 + exit 1 fi dstdir=$dst dst=$dstdir/`basename "$src"` dstdir_status=0 else - # Prefer dirname, but fall back on a substitute if dirname fails. - dstdir=` - (dirname "$dst") 2>/dev/null || - expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$dst" : 'X\(//\)[^/]' \| \ - X"$dst" : 'X\(//\)$' \| \ - X"$dst" : 'X\(/\)' \| . 2>/dev/null || - echo X"$dst" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q' - ` - + dstdir=`dirname "$dst"` test -d "$dstdir" dstdir_status=$? fi @@ -314,74 +293,74 @@ if test $dstdir_status != 0; then case $posix_mkdir in '') - # Create intermediate dirs using mode 755 as modified by the umask. - # This is like FreeBSD 'install' as of 1997-10-28. - umask=`umask` - case $stripcmd.$umask in - # Optimize common cases. - *[2367][2367]) mkdir_umask=$umask;; - .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; - - *[0-7]) - mkdir_umask=`expr $umask + 22 \ - - $umask % 100 % 40 + $umask % 20 \ - - $umask % 10 % 4 + $umask % 2 - `;; - *) mkdir_umask=$umask,go-w;; - esac - - # With -d, create the new directory with the user-specified mode. - # Otherwise, rely on $mkdir_umask. - if test -n "$dir_arg"; then - mkdir_mode=-m$mode - else - mkdir_mode= - fi - - posix_mkdir=false - case $umask in - *[123567][0-7][0-7]) - # POSIX mkdir -p sets u+wx bits regardless of umask, which - # is incompatible with FreeBSD 'install' when (umask & 300) != 0. - ;; - *) - tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 - - if (umask $mkdir_umask && - exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 - then - if test -z "$dir_arg" || { - # Check for POSIX incompatibilities with -m. - # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writable bit of parent directory when it shouldn't. - # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. - ls_ld_tmpdir=`ls -ld "$tmpdir"` - case $ls_ld_tmpdir in - d????-?r-*) different_mode=700;; - d????-?--*) different_mode=755;; - *) false;; - esac && - $mkdirprog -m$different_mode -p -- "$tmpdir" && { - ls_ld_tmpdir_1=`ls -ld "$tmpdir"` - test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" - } - } - then posix_mkdir=: - fi - rmdir "$tmpdir/d" "$tmpdir" - else - # Remove any dirs left behind by ancient mkdir implementations. - rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null - fi - trap '' 0;; - esac;; + # Create intermediate dirs using mode 755 as modified by the umask. + # This is like FreeBSD 'install' as of 1997-10-28. + umask=`umask` + case $stripcmd.$umask in + # Optimize common cases. + *[2367][2367]) mkdir_umask=$umask;; + .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; + + *[0-7]) + mkdir_umask=`expr $umask + 22 \ + - $umask % 100 % 40 + $umask % 20 \ + - $umask % 10 % 4 + $umask % 2 + `;; + *) mkdir_umask=$umask,go-w;; + esac + + # With -d, create the new directory with the user-specified mode. + # Otherwise, rely on $mkdir_umask. + if test -n "$dir_arg"; then + mkdir_mode=-m$mode + else + mkdir_mode= + fi + + posix_mkdir=false + case $umask in + *[123567][0-7][0-7]) + # POSIX mkdir -p sets u+wx bits regardless of umask, which + # is incompatible with FreeBSD 'install' when (umask & 300) != 0. + ;; + *) + tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ + trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 + + if (umask $mkdir_umask && + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 + then + if test -z "$dir_arg" || { + # Check for POSIX incompatibilities with -m. + # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or + # other-writable bit of parent directory when it shouldn't. + # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. + ls_ld_tmpdir=`ls -ld "$tmpdir"` + case $ls_ld_tmpdir in + d????-?r-*) different_mode=700;; + d????-?--*) different_mode=755;; + *) false;; + esac && + $mkdirprog -m$different_mode -p -- "$tmpdir" && { + ls_ld_tmpdir_1=`ls -ld "$tmpdir"` + test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" + } + } + then posix_mkdir=: + fi + rmdir "$tmpdir/d" "$tmpdir" + else + # Remove any dirs left behind by ancient mkdir implementations. + rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null + fi + trap '' 0;; + esac;; esac if $posix_mkdir && ( - umask $mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" + umask $mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" ) then : else @@ -391,53 +370,51 @@ # directory the slow way, step by step, checking for races as we go. case $dstdir in - /*) prefix='/';; - [-=\(\)!]*) prefix='./';; - *) prefix='';; + /*) prefix='/';; + [-=\(\)!]*) prefix='./';; + *) prefix='';; esac - eval "$initialize_posix_glob" - oIFS=$IFS IFS=/ - $posix_glob set -f + set -f set fnord $dstdir shift - $posix_glob set +f + set +f IFS=$oIFS prefixes= for d do - test X"$d" = X && continue + test X"$d" = X && continue - prefix=$prefix$d - if test -d "$prefix"; then - prefixes= - else - if $posix_mkdir; then - (umask=$mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break - # Don't fail if two instances are running concurrently. - test -d "$prefix" || exit 1 - else - case $prefix in - *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; - *) qprefix=$prefix;; - esac - prefixes="$prefixes '$qprefix'" - fi - fi - prefix=$prefix/ + prefix=$prefix$d + if test -d "$prefix"; then + prefixes= + else + if $posix_mkdir; then + (umask=$mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break + # Don't fail if two instances are running concurrently. + test -d "$prefix" || exit 1 + else + case $prefix in + *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; + *) qprefix=$prefix;; + esac + prefixes="$prefixes '$qprefix'" + fi + fi + prefix=$prefix/ done if test -n "$prefixes"; then - # Don't fail if two instances are running concurrently. - (umask $mkdir_umask && - eval "\$doit_exec \$mkdirprog $prefixes") || - test -d "$dstdir" || exit 1 - obsolete_mkdir_used=true + # Don't fail if two instances are running concurrently. + (umask $mkdir_umask && + eval "\$doit_exec \$mkdirprog $prefixes") || + test -d "$dstdir" || exit 1 + obsolete_mkdir_used=true fi fi fi @@ -472,15 +449,12 @@ # If -C, don't bother to copy if it wouldn't change the file. if $copy_on_change && - old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && - new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && - - eval "$initialize_posix_glob" && - $posix_glob set -f && + old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && + new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && + set -f && set X $old && old=:$2:$4:$5:$6 && set X $new && new=:$2:$4:$5:$6 && - $posix_glob set +f && - + set +f && test "$old" = "$new" && $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 then @@ -493,24 +467,24 @@ # to itself, or perhaps because mv is so ancient that it does not # support -f. { - # Now remove or move aside any old file at destination location. - # We try this two ways since rm can't unlink itself on some - # systems and the destination file might be busy for other - # reasons. In this case, the final cleanup might fail but the new - # file should still install successfully. - { - test ! -f "$dst" || - $doit $rmcmd -f "$dst" 2>/dev/null || - { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && - { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } - } || - { echo "$0: cannot unlink or rename $dst" >&2 - (exit 1); exit 1 - } - } && + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + test ! -f "$dst" || + $doit $rmcmd -f "$dst" 2>/dev/null || + { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && + { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } + } || + { echo "$0: cannot unlink or rename $dst" >&2 + (exit 1); exit 1 + } + } && - # Now rename the file to the real destination. - $doit $mvcmd "$dsttmp" "$dst" + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dst" } fi || exit 1 diff -Nru gobject-introspection-1.45.2/build-aux/ltmain.sh gobject-introspection-1.45.3/build-aux/ltmain.sh --- gobject-introspection-1.45.2/build-aux/ltmain.sh 2015-05-26 06:40:19.000000000 +0000 +++ gobject-introspection-1.45.3/build-aux/ltmain.sh 2015-07-03 20:30:26.000000000 +0000 @@ -70,7 +70,7 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.11 +# $progname: (GNU libtool) 2.4.2 # automake: $automake_version # autoconf: $autoconf_version # @@ -80,7 +80,7 @@ PROGRAM=libtool PACKAGE=libtool -VERSION="2.4.2 Debian-2.4.2-1.11" +VERSION=2.4.2 TIMESTAMP="" package_revision=1.3337 @@ -6124,10 +6124,7 @@ case $pass in dlopen) libs="$dlfiles" ;; dlpreopen) libs="$dlprefiles" ;; - link) - libs="$deplibs %DEPLIBS%" - test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" - ;; + link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; esac fi if test "$linkmode,$pass" = "lib,dlpreopen"; then @@ -6447,19 +6444,19 @@ # It is a libtool convenience library, so add in its objects. func_append convenience " $ladir/$objdir/$old_library" func_append old_convenience " $ladir/$objdir/$old_library" - tmp_libs= - for deplib in $dependency_libs; do - deplibs="$deplib $deplibs" - if $opt_preserve_dup_deps ; then - case "$tmp_libs " in - *" $deplib "*) func_append specialdeplibs " $deplib" ;; - esac - fi - func_append tmp_libs " $deplib" - done elif test "$linkmode" != prog && test "$linkmode" != lib; then func_fatal_error "\`$lib' is not a convenience library" fi + tmp_libs= + for deplib in $dependency_libs; do + deplibs="$deplib $deplibs" + if $opt_preserve_dup_deps ; then + case "$tmp_libs " in + *" $deplib "*) func_append specialdeplibs " $deplib" ;; + esac + fi + func_append tmp_libs " $deplib" + done continue fi # $pass = conv @@ -7352,9 +7349,6 @@ revision="$number_minor" lt_irix_increment=no ;; - *) - func_fatal_configuration "$modename: unknown library version type \`$version_type'" - ;; esac ;; no) diff -Nru gobject-introspection-1.45.2/build-aux/missing gobject-introspection-1.45.3/build-aux/missing --- gobject-introspection-1.45.2/build-aux/missing 2015-05-26 06:40:25.000000000 +0000 +++ gobject-introspection-1.45.3/build-aux/missing 2015-07-03 20:30:32.000000000 +0000 @@ -3,7 +3,7 @@ scriptversion=2013-10-28.13; # UTC -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify diff -Nru gobject-introspection-1.45.2/build-aux/py-compile gobject-introspection-1.45.3/build-aux/py-compile --- gobject-introspection-1.45.2/build-aux/py-compile 2015-05-26 06:40:26.000000000 +0000 +++ gobject-introspection-1.45.3/build-aux/py-compile 2015-07-03 20:30:32.000000000 +0000 @@ -3,7 +3,7 @@ scriptversion=2011-06-08.12; # UTC -# Copyright (C) 2000-2013 Free Software Foundation, Inc. +# Copyright (C) 2000-2014 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff -Nru gobject-introspection-1.45.2/build-aux/test-driver gobject-introspection-1.45.3/build-aux/test-driver --- gobject-introspection-1.45.2/build-aux/test-driver 2015-05-26 06:40:27.000000000 +0000 +++ gobject-introspection-1.45.3/build-aux/test-driver 2015-07-03 20:30:33.000000000 +0000 @@ -3,7 +3,7 @@ scriptversion=2013-07-13.22; # UTC -# Copyright (C) 2011-2013 Free Software Foundation, Inc. +# Copyright (C) 2011-2014 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -106,11 +106,14 @@ # Test script is run here. "$@" >$log_file 2>&1 estatus=$? + if test $enable_hard_errors = no && test $estatus -eq 99; then - estatus=1 + tweaked_estatus=1 +else + tweaked_estatus=$estatus fi -case $estatus:$expect_failure in +case $tweaked_estatus:$expect_failure in 0:yes) col=$red res=XPASS recheck=yes gcopy=yes;; 0:*) col=$grn res=PASS recheck=no gcopy=no;; 77:*) col=$blu res=SKIP recheck=no gcopy=yes;; @@ -119,6 +122,12 @@ *:*) col=$red res=FAIL recheck=yes gcopy=yes;; esac +# Report the test outcome and exit status in the logs, so that one can +# know whether the test passed or failed simply by looking at the '.log' +# file, without the need of also peaking into the corresponding '.trs' +# file (automake bug#11814). +echo "$res $test_name (exit status: $estatus)" >>$log_file + # Report outcome to console. echo "${col}${res}${std}: $test_name" diff -Nru gobject-introspection-1.45.2/build-aux/ylwrap gobject-introspection-1.45.3/build-aux/ylwrap --- gobject-introspection-1.45.2/build-aux/ylwrap 2015-05-26 06:40:26.000000000 +0000 +++ gobject-introspection-1.45.3/build-aux/ylwrap 2015-07-03 20:30:32.000000000 +0000 @@ -3,7 +3,7 @@ scriptversion=2013-01-12.17; # UTC -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # # Written by Tom Tromey . # diff -Nru gobject-introspection-1.45.2/common.mk gobject-introspection-1.45.3/common.mk --- gobject-introspection-1.45.2/common.mk 2014-08-04 14:37:07.000000000 +0000 +++ gobject-introspection-1.45.3/common.mk 2015-07-03 11:46:47.000000000 +0000 @@ -21,7 +21,8 @@ --add-include-path=$(srcdir) \ --add-include-path=$(top_srcdir)/gir \ --add-include-path=$(builddir) \ - --add-include-path=$(top_builddir) + --add-include-path=$(top_builddir) \ + --add-include-path=$(top_builddir)/gir INTROSPECTION_COMPILER = \ env PATH=".libs:$(PATH)" \ @@ -31,7 +32,8 @@ --includedir=$(srcdir) \ --includedir=$(top_srcdir)/gir \ --includedir=$(builddir) \ - --includedir=$(top_builddir) + --includedir=$(top_builddir) \ + --includedir=$(top_builddir)/gir INTROSPECTION_DOCTOOL = \ env PATH=".libs:$(PATH)" \ @@ -45,4 +47,5 @@ --add-include-path=$(srcdir) \ --add-include-path=$(top_srcdir)/gir \ --add-include-path=$(builddir) \ - --add-include-path=$(top_builddir) + --add-include-path=$(top_builddir) \ + --add-include-path=$(top_builddir)/gir diff -Nru gobject-introspection-1.45.2/config.h.win32 gobject-introspection-1.45.3/config.h.win32 --- gobject-introspection-1.45.2/config.h.win32 2015-05-26 06:40:37.000000000 +0000 +++ gobject-introspection-1.45.3/config.h.win32 2015-07-03 20:30:38.000000000 +0000 @@ -96,7 +96,7 @@ #define PACKAGE_NAME "gobject-introspection" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "gojbect-introspection 1.45.2" +#define PACKAGE_STRING "gojbect-introspection 1.45.3" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "gobject-introspection" @@ -105,7 +105,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.45.2" +#define PACKAGE_VERSION "1.45.3" /* Define to the platform's shared library suffix */ #define SHLIB_SUFFIX ".dll" @@ -126,7 +126,7 @@ #define STDC_HEADERS 1 /* Version number of package */ -#define VERSION "1.45.2" +#define VERSION "1.45.3" /* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a `char[]'. */ diff -Nru gobject-introspection-1.45.2/configure gobject-introspection-1.45.3/configure --- gobject-introspection-1.45.2/configure 2015-05-26 06:40:24.000000000 +0000 +++ gobject-introspection-1.45.3/configure 2015-07-03 20:30:31.000000000 +0000 @@ -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.45.2. +# Generated by GNU Autoconf 2.69 for gobject-introspection 1.45.3. # # Report bugs to . # @@ -591,8 +591,8 @@ # Identity of this package. PACKAGE_NAME='gobject-introspection' PACKAGE_TARNAME='gobject-introspection' -PACKAGE_VERSION='1.45.2' -PACKAGE_STRING='gobject-introspection 1.45.2' +PACKAGE_VERSION='1.45.3' +PACKAGE_STRING='gobject-introspection 1.45.3' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gobject-introspection' PACKAGE_URL='' @@ -1430,7 +1430,7 @@ # 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.45.2 to adapt to many kinds of systems. +\`configure' configures gobject-introspection 1.45.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1501,7 +1501,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of gobject-introspection 1.45.2:";; + short | recursive ) echo "Configuration of gobject-introspection 1.45.3:";; esac cat <<\_ACEOF @@ -1655,7 +1655,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -gobject-introspection configure 1.45.2 +gobject-introspection configure 1.45.3 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2207,7 +2207,7 @@ 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.45.2, which was +It was created by gobject-introspection $as_me 1.45.3, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2589,7 +2589,7 @@ -am__api_version='1.14' +am__api_version='1.15' # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -2761,8 +2761,8 @@ ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` +# Expand $ac_aux_dir to an absolute path. +am_aux_dir=`cd "$ac_aux_dir" && pwd` if test x"${MISSING+set}" != xset; then case $am_aux_dir in @@ -2781,7 +2781,7 @@ $as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} fi -if test x"${install_sh}" != xset; then +if test x"${install_sh+set}" != xset; then case $am_aux_dir in *\ * | *\ *) install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; @@ -3075,7 +3075,7 @@ # Define the identity of the package. PACKAGE='gobject-introspection' - VERSION='1.45.2' + VERSION='1.45.3' cat >>confdefs.h <<_ACEOF @@ -3109,8 +3109,8 @@ # mkdir_p='$(MKDIR_P)' -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. +# We need awk for the "check" target (and possibly the TAP driver). The +# system "awk" is bad on some platforms. # Always define AMTAR for backward compatibility. Yes, it's still used # in the wild :-( We should find a proper way to deprecate it ... AMTAR='$${TAR-tar}' @@ -3349,7 +3349,7 @@ # Used in docs/reference/version.xml -GI_VERSION=1.45.2 +GI_VERSION=1.45.3 # Check for Win32 @@ -5300,8 +5300,7 @@ ;; *) lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len" && \ - test undefined != "$lt_cv_sys_max_cmd_len"; then + if test -n "$lt_cv_sys_max_cmd_len"; then lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` else @@ -5702,6 +5701,10 @@ fi ;; +gnu*) + lt_cv_deplibs_check_method=pass_all + ;; + haiku*) lt_cv_deplibs_check_method=pass_all ;; @@ -5740,11 +5743,11 @@ ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) +linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; -netbsd* | netbsdelf*-gnu) +netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' else @@ -6838,19 +6841,12 @@ LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - case `/usr/bin/file conftest.o` in - *x86-64*) - LD="${LD-ld} -m elf32_x86_64" - ;; - *) - LD="${LD-ld} -m elf_i386" - ;; - esac + LD="${LD-ld} -m elf_i386" ;; - powerpc64le-*) + powerpc64le-*linux*) LD="${LD-ld} -m elf32lppclinux" ;; - powerpc64-*) + powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -6869,10 +6865,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - powerpcle-*) + powerpcle-*linux*) LD="${LD-ld} -m elf64lppc" ;; - powerpc-*) + powerpc-*linux*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -8680,7 +8676,7 @@ lt_prog_compiler_static='-non_shared' ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in # old Intel for x86_64 which still supported -KPIC. ecc*) @@ -9158,9 +9154,6 @@ openbsd*) with_gnu_ld=no ;; - linux* | k*bsd*-gnu | gnu*) - link_all_deplibs=no - ;; esac ld_shlibs=yes @@ -9382,7 +9375,7 @@ fi ;; - netbsd* | netbsdelf*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -9559,7 +9552,6 @@ if test "$aix_use_runtimelinking" = yes; then shared_flag="$shared_flag "'${wl}-G' fi - link_all_deplibs=no else # not using gcc if test "$host_cpu" = ia64; then @@ -10013,7 +10005,7 @@ link_all_deplibs=yes ;; - netbsd* | netbsdelf*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -10850,6 +10842,17 @@ esac ;; +gnu*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + haiku*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no @@ -10966,7 +10969,7 @@ ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) +linux* | k*bsd*-gnu | kopensolaris*-gnu) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no @@ -11015,10 +11018,14 @@ # before this can be enabled. hardcode_into_libs=yes + # Add ABI-specific directories to the system library path. + sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" + # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" + fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -11030,18 +11037,6 @@ dynamic_linker='GNU/Linux ld.so' ;; -netbsdelf*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='NetBSD ld.elf_so' - ;; - netbsd*) version_type=sunos need_lib_prefix=no @@ -12644,12 +12639,12 @@ 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.45.2\""; } >&5 - ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.45.2") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.45.3\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.45.3") 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.45.2" 2>/dev/null` + pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.45.3" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -12661,12 +12656,12 @@ 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.45.2\""; } >&5 - ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.45.2") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.45.3\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.45.3") 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.45.2" 2>/dev/null` + pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.45.3" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -12687,14 +12682,14 @@ _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.45.2" 2>&1` + GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.45.3" 2>&1` else - GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.45.2" 2>&1` + GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.45.3" 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.45.2) were not met: + as_fn_error $? "Package requirements (glib-2.0 >= 2.45.3) were not met: $GLIB_PKG_ERRORS @@ -14437,13 +14432,13 @@ if test -n "$PYTHON"; then # If the user set $PYTHON, use it and don't search something else. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version is >= 2.6" >&5 -$as_echo_n "checking whether $PYTHON version is >= 2.6... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version is >= 2.7" >&5 +$as_echo_n "checking whether $PYTHON version is >= 2.7... " >&6; } prog="import sys # split strings by '.' and convert to numeric. Append some zeros # because we need at least 4 digits for the hex conversion. # map returns an iterator in Python 3.0 and a list in 2.x -minver = list(map(int, '2.6'.split('.'))) + [0, 0, 0] +minver = list(map(int, '2.7'.split('.'))) + [0, 0, 0] minverhex = 0 # xrange is not present in Python 3.0 and range returns an iterator for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i] @@ -14464,8 +14459,8 @@ else # Otherwise, try each interpreter until we find one that satisfies # VERSION. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a Python interpreter with version >= 2.6" >&5 -$as_echo_n "checking for a Python interpreter with version >= 2.6... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a Python interpreter with version >= 2.7" >&5 +$as_echo_n "checking for a Python interpreter with version >= 2.7... " >&6; } if ${am_cv_pathless_PYTHON+:} false; then : $as_echo_n "(cached) " >&6 else @@ -14476,7 +14471,7 @@ # split strings by '.' and convert to numeric. Append some zeros # because we need at least 4 digits for the hex conversion. # map returns an iterator in Python 3.0 and a list in 2.x -minver = list(map(int, '2.6'.split('.'))) + [0, 0, 0] +minver = list(map(int, '2.7'.split('.'))) + [0, 0, 0] minverhex = 0 # xrange is not present in Python 3.0 and range returns an iterator for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i] @@ -15518,7 +15513,7 @@ # 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.45.2, which was +This file was extended by gobject-introspection $as_me 1.45.3, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15584,7 +15579,7 @@ 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.45.2 +gobject-introspection config.status 1.45.3 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru gobject-introspection-1.45.2/configure.ac gobject-introspection-1.45.3/configure.ac --- gobject-introspection-1.45.2/configure.ac 2015-05-26 06:37:03.000000000 +0000 +++ gobject-introspection-1.45.3/configure.ac 2015-07-03 20:29:28.000000000 +0000 @@ -4,7 +4,7 @@ dnl the gi version number m4_define(gi_major_version, 1) m4_define(gi_minor_version, 45) -m4_define(gi_micro_version, 2) +m4_define(gi_micro_version, 3) m4_define(gi_version, gi_major_version.gi_minor_version.gi_micro_version) AC_PREREQ([2.63]) @@ -128,7 +128,7 @@ AC_SUBST(GIR_DIR) AC_DEFINE_UNQUOTED(GIR_DIR, "$GIR_DIR", [Director prefix for gir installation]) -PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.45.2]) +PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.45.3]) PKG_CHECK_MODULES(GOBJECT, [gobject-2.0]) PKG_CHECK_MODULES(GMODULE, [gmodule-2.0]) PKG_CHECK_MODULES(GIO, [gio-2.0]) @@ -251,7 +251,7 @@ AC_CHECK_FUNCS([backtrace backtrace_symbols]) # Python -AM_PATH_PYTHON([2.6]) +AM_PATH_PYTHON([2.7]) case "$host" in *-*-mingw*) # Change backslashes to forward slashes in pyexecdir to avoid diff -Nru gobject-introspection-1.45.2/debian/changelog gobject-introspection-1.45.3/debian/changelog --- gobject-introspection-1.45.2/debian/changelog 2015-06-01 09:45:23.000000000 +0000 +++ gobject-introspection-1.45.3/debian/changelog 2015-07-22 08:33:37.000000000 +0000 @@ -1,8 +1,8 @@ -gobject-introspection (1.45.2-0ubuntu1~wily1) wily; urgency=medium +gobject-introspection (1.45.3-0ubuntu1~wily1) wily; urgency=medium * New upstream release - -- Rico Tzschichholz Mon, 01 Jun 2015 11:45:05 +0200 + -- Rico Tzschichholz Wed, 22 Jul 2015 10:33:35 +0200 gobject-introspection (1.44.0-1) unstable; urgency=medium diff -Nru gobject-introspection-1.45.2/debian/control gobject-introspection-1.45.3/debian/control --- gobject-introspection-1.45.2/debian/control 2015-06-01 09:46:13.000000000 +0000 +++ gobject-introspection-1.45.3/debian/control 2015-07-22 08:47:20.000000000 +0000 @@ -17,7 +17,7 @@ flex, gtk-doc-tools (>= 1.19), bison, - libglib2.0-dev (>= 2.45.2), + libglib2.0-dev (>= 2.45.3), libcairo2-dev, libffi-dev (>= 3.0.0), libtool, @@ -58,7 +58,7 @@ gobject-introspection (= ${binary:Version}), gir1.2-glib-2.0 (= ${binary:Version}), gir1.2-freedesktop (= ${binary:Version}), - libglib2.0-dev (>= 2.45.2), + libglib2.0-dev (>= 2.45.3), libffi-dev, ${shlibs:Depends}, ${misc:Depends} diff -Nru gobject-introspection-1.45.2/debian/control.in gobject-introspection-1.45.3/debian/control.in --- gobject-introspection-1.45.2/debian/control.in 2015-06-01 09:46:10.000000000 +0000 +++ gobject-introspection-1.45.3/debian/control.in 2015-07-22 08:33:57.000000000 +0000 @@ -13,7 +13,7 @@ flex, gtk-doc-tools (>= 1.19), bison, - libglib2.0-dev (>= 2.45.2), + libglib2.0-dev (>= 2.45.3), libcairo2-dev, libffi-dev (>= 3.0.0), libtool, @@ -54,7 +54,7 @@ gobject-introspection (= ${binary:Version}), gir1.2-glib-2.0 (= ${binary:Version}), gir1.2-freedesktop (= ${binary:Version}), - libglib2.0-dev (>= 2.45.2), + libglib2.0-dev (>= 2.45.3), libffi-dev, ${shlibs:Depends}, ${misc:Depends} diff -Nru gobject-introspection-1.45.2/debian/libgirepository-1.0-1.symbols gobject-introspection-1.45.3/debian/libgirepository-1.0-1.symbols --- gobject-introspection-1.45.2/debian/libgirepository-1.0-1.symbols 2015-05-27 16:59:54.000000000 +0000 +++ gobject-introspection-1.45.3/debian/libgirepository-1.0-1.symbols 2015-07-22 08:46:15.000000000 +0000 @@ -148,6 +148,7 @@ g_signal_info_get_class_closure@Base 0.9.2 g_signal_info_get_flags@Base 0.9.2 g_signal_info_true_stops_emit@Base 0.9.2 + g_struct_info_find_field@Base 1.45.3 g_struct_info_find_method@Base 0.9.2 g_struct_info_get_alignment@Base 0.9.2 g_struct_info_get_field@Base 0.9.2 diff -Nru gobject-introspection-1.45.2/docs/Makefile.in gobject-introspection-1.45.3/docs/Makefile.in --- gobject-introspection-1.45.2/docs/Makefile.in 2015-05-26 06:40:27.000000000 +0000 +++ gobject-introspection-1.45.3/docs/Makefile.in 2015-07-03 20:30:32.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,7 +14,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,7 +88,6 @@ build_triplet = @build@ host_triplet = @host@ subdir = docs -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ @@ -87,6 +96,7 @@ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -146,6 +156,7 @@ ETAGS = etags CTAGS = ctags DIST_SUBDIRS = reference +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -365,7 +376,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign docs/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign docs/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -660,6 +670,8 @@ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ ps ps-am tags tags-am uninstall uninstall-am +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru gobject-introspection-1.45.2/docs/reference/html/annotation-glossary.html gobject-introspection-1.45.3/docs/reference/html/annotation-glossary.html --- gobject-introspection-1.45.2/docs/reference/html/annotation-glossary.html 2015-05-26 07:57:45.000000000 +0000 +++ gobject-introspection-1.45.3/docs/reference/html/annotation-glossary.html 2015-07-03 20:31:19.000000000 +0000 @@ -7,7 +7,7 @@ - + @@ -65,6 +65,6 @@

Override the parsed C type with given type.

+
Generated by GTK-Doc V1.24.1 \ No newline at end of file diff -Nru gobject-introspection-1.45.2/docs/reference/html/api-index-1-29-0.html gobject-introspection-1.45.3/docs/reference/html/api-index-1-29-0.html --- gobject-introspection-1.45.2/docs/reference/html/api-index-1-29-0.html 2015-05-26 07:57:45.000000000 +0000 +++ gobject-introspection-1.45.3/docs/reference/html/api-index-1-29-0.html 2015-07-03 20:31:19.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -29,6 +29,6 @@
+
Generated by GTK-Doc V1.24.1 \ No newline at end of file diff -Nru gobject-introspection-1.45.2/docs/reference/html/api-index-1-29-17.html gobject-introspection-1.45.3/docs/reference/html/api-index-1-29-17.html --- gobject-introspection-1.45.2/docs/reference/html/api-index-1-29-17.html 2015-05-26 07:57:45.000000000 +0000 +++ gobject-introspection-1.45.3/docs/reference/html/api-index-1-29-17.html 2015-07-03 20:31:19.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -44,6 +44,6 @@
+
Generated by GTK-Doc V1.24.1 \ No newline at end of file diff -Nru gobject-introspection-1.45.2/docs/reference/html/api-index-1-30-1.html gobject-introspection-1.45.3/docs/reference/html/api-index-1-30-1.html --- gobject-introspection-1.45.2/docs/reference/html/api-index-1-30-1.html 2015-05-26 07:57:45.000000000 +0000 +++ gobject-introspection-1.45.3/docs/reference/html/api-index-1-30-1.html 2015-07-03 20:31:19.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -29,6 +29,6 @@
+
Generated by GTK-Doc V1.24.1 \ No newline at end of file diff -Nru gobject-introspection-1.45.2/docs/reference/html/api-index-1-34.html gobject-introspection-1.45.3/docs/reference/html/api-index-1-34.html --- gobject-introspection-1.45.2/docs/reference/html/api-index-1-34.html 2015-05-26 07:57:45.000000000 +0000 +++ gobject-introspection-1.45.3/docs/reference/html/api-index-1-34.html 2015-07-03 20:31:19.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -40,6 +40,6 @@
+
Generated by GTK-Doc V1.24.1 \ No newline at end of file diff -Nru gobject-introspection-1.45.2/docs/reference/html/api-index-1-35-8.html gobject-introspection-1.45.3/docs/reference/html/api-index-1-35-8.html --- gobject-introspection-1.45.2/docs/reference/html/api-index-1-35-8.html 2015-05-26 07:57:45.000000000 +0000 +++ gobject-introspection-1.45.3/docs/reference/html/api-index-1-35-8.html 2015-07-03 20:31:19.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -29,6 +29,6 @@
+
Generated by GTK-Doc V1.24.1 \ No newline at end of file diff -Nru gobject-introspection-1.45.2/docs/reference/html/api-index-deprecated.html gobject-introspection-1.45.3/docs/reference/html/api-index-deprecated.html --- gobject-introspection-1.45.2/docs/reference/html/api-index-deprecated.html 2015-05-26 07:57:45.000000000 +0000 +++ gobject-introspection-1.45.3/docs/reference/html/api-index-deprecated.html 2015-07-03 20:31:19.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -25,6 +25,6 @@ +
Generated by GTK-Doc V1.24.1 \ No newline at end of file diff -Nru gobject-introspection-1.45.2/docs/reference/html/api-index-full.html gobject-introspection-1.45.3/docs/reference/html/api-index-full.html --- gobject-introspection-1.45.2/docs/reference/html/api-index-full.html 2015-05-26 07:57:45.000000000 +0000 +++ gobject-introspection-1.45.3/docs/reference/html/api-index-full.html 2015-07-03 20:31:19.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -1239,6 +1239,6 @@
+
Generated by GTK-Doc V1.24.1 \ No newline at end of file diff -Nru gobject-introspection-1.45.2/docs/reference/html/ch01.html gobject-introspection-1.45.3/docs/reference/html/ch01.html --- gobject-introspection-1.45.2/docs/reference/html/ch01.html 2015-05-26 07:57:45.000000000 +0000 +++ gobject-introspection-1.45.3/docs/reference/html/ch01.html 2015-07-03 20:31:19.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -89,6 +89,6 @@ +
Generated by GTK-Doc V1.24.1 \ No newline at end of file diff -Nru gobject-introspection-1.45.2/docs/reference/html/ch03.html gobject-introspection-1.45.3/docs/reference/html/ch03.html --- gobject-introspection-1.45.2/docs/reference/html/ch03.html 2015-05-26 07:57:45.000000000 +0000 +++ gobject-introspection-1.45.3/docs/reference/html/ch03.html 2015-07-03 20:31:19.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -32,6 +32,6 @@ +
Generated by GTK-Doc V1.24.1 \ No newline at end of file diff -Nru gobject-introspection-1.45.2/docs/reference/html/gi-building.html gobject-introspection-1.45.3/docs/reference/html/gi-building.html --- gobject-introspection-1.45.2/docs/reference/html/gi-building.html 2015-05-26 07:57:45.000000000 +0000 +++ gobject-introspection-1.45.3/docs/reference/html/gi-building.html 2015-07-03 20:31:19.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -173,6 +173,6 @@ +
Generated by GTK-Doc V1.24.1 \ No newline at end of file diff -Nru gobject-introspection-1.45.2/docs/reference/html/gi-common-types.html gobject-introspection-1.45.3/docs/reference/html/gi-common-types.html --- gobject-introspection-1.45.2/docs/reference/html/gi-common-types.html 2015-05-26 07:57:45.000000000 +0000 +++ gobject-introspection-1.45.3/docs/reference/html/gi-common-types.html 2015-07-03 20:31:19.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -130,107 +130,107 @@ -

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

  @@ -344,7 +344,7 @@

GI_TYPE_TAG_GTYPE

-

a GType

+

a GType

  @@ -380,28 +380,28 @@

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

  @@ -447,14 +447,14 @@

GI_ARRAY_TYPE_PTR_ARRAY

-

a GPtrArray array

+

a GPtrArray array

 

GI_ARRAY_TYPE_BYTE_ARRAY

-

a GByteArray array

+

a GByteArray array

  @@ -465,6 +465,6 @@ +
Generated by GTK-Doc V1.24.1 \ No newline at end of file diff -Nru gobject-introspection-1.45.2/docs/reference/html/gi-GIArgInfo.html gobject-introspection-1.45.3/docs/reference/html/gi-GIArgInfo.html --- gobject-introspection-1.45.2/docs/reference/html/gi-GIArgInfo.html 2015-05-26 07:57:45.000000000 +0000 +++ gobject-introspection-1.45.3/docs/reference/html/gi-GIArgInfo.html 2015-07-03 20:31:19.000000000 +0000 @@ -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 @@

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 @@

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 @@

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 @@

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 @@

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 @@

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 @@

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 @@

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 @@

Returns

-

TRUE if argument is only useful in C.

+

TRUE if argument is only useful in C.

Since: 1.29.0

@@ -686,7 +686,7 @@

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 @@ +
Generated by GTK-Doc V1.24.1 \ No newline at end of file diff -Nru gobject-introspection-1.45.2/docs/reference/html/gi-GIBaseInfo.html gobject-introspection-1.45.3/docs/reference/html/gi-GIBaseInfo.html --- gobject-introspection-1.45.2/docs/reference/html/gi-GIBaseInfo.html 2015-05-26 07:57:45.000000000 +0000 +++ gobject-introspection-1.45.3/docs/reference/html/gi-GIBaseInfo.html 2015-07-03 20:31:19.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -65,7 +65,7 @@ - - - - @@ -219,7 +219,7 @@ g_info_new (GIInfoType type, GIBaseInfo *container, GITypelib *typelib, - guint32 offset); + guint32 offset);

TODO

Parameters

@@ -315,7 +315,7 @@

g_base_info_equal ()

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

Compare two GIBaseInfo.

@@ -346,7 +346,7 @@

Returns

-

TRUE if and only if info1 +

TRUE if and only if info1 equals info2 .

@@ -409,7 +409,7 @@

g_base_info_get_namespace ()

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

Obtain the namespace of info .

@@ -436,7 +436,7 @@

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 @@ -461,15 +461,15 @@

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

@@ -495,20 +495,20 @@

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.

@@ -541,7 +541,7 @@ 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); } }
@@ -584,7 +584,7 @@

Returns

-

TRUE if there are more attributes

+

TRUE if there are more attributes


@@ -620,7 +620,7 @@

g_base_info_is_deprecated ()

-
gboolean
+
gboolean
 g_base_info_is_deprecated (GIBaseInfo *info);

Obtain whether the info is represents a metadata which is @@ -642,7 +642,7 @@

Returns

-

TRUE if deprecated

+

TRUE if deprecated

@@ -817,6 +817,6 @@ +
Generated by GTK-Doc V1.24.1 \ No newline at end of file diff -Nru gobject-introspection-1.45.2/docs/reference/html/gi-GICallableInfo.html gobject-introspection-1.45.3/docs/reference/html/gi-GICallableInfo.html --- gobject-introspection-1.45.2/docs/reference/html/gi-GICallableInfo.html 2015-05-26 07:57:45.000000000 +0000 +++ gobject-introspection-1.45.3/docs/reference/html/gi-GICallableInfo.html 2015-07-03 20:31:19.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -47,7 +47,7 @@ -
 
-gboolean +gboolean g_base_info_equal () @@ -88,21 +88,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 () @@ -110,7 +110,7 @@
-gboolean +gboolean g_base_info_iterate_attributes () @@ -126,7 +126,7 @@
-gboolean +gboolean g_base_info_is_deprecated () @@ -188,7 +188,7 @@
1
 2
 3
GIBaseInfo *button_info = g_irepository_find_by_name(NULL, "Gtk", "Button");
+        
GIBaseInfo *button_info = g_irepository_find_by_name(NULL, "Gtk", "Button");
 ... use button_info ...
 g_base_info_unref(button_info);
-gboolean +gboolean g_callable_info_can_throw_gerror () @@ -55,7 +55,7 @@
-gint +gint g_callable_info_get_n_args () @@ -78,7 +78,7 @@
const gchar * +const gchar * g_callable_info_get_return_attribute () @@ -94,7 +94,7 @@
-gboolean +gboolean g_callable_info_invoke () @@ -102,7 +102,7 @@
-gboolean +gboolean g_callable_info_is_method () @@ -110,7 +110,7 @@
-gboolean +gboolean g_callable_info_iterate_return_attributes () @@ -134,7 +134,7 @@
-gboolean +gboolean g_callable_info_may_return_null () @@ -142,7 +142,7 @@
-gboolean +gboolean g_callable_info_skip_return () @@ -208,7 +208,7 @@

g_callable_info_can_throw_gerror ()

-
gboolean
+
gboolean
 g_callable_info_can_throw_gerror (GICallableInfo *info);

TODO

@@ -228,14 +228,14 @@

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.

@@ -263,7 +263,7 @@

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

@@ -318,15 +318,15 @@

Returns

-

TRUE if the caller owns the return value, FALSE otherwise.

+

TRUE if the caller owns the return value, FALSE otherwise.


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

@@ -352,7 +352,7 @@

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


@@ -386,17 +386,17 @@

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

@@ -464,7 +464,7 @@

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, @@ -491,15 +491,15 @@

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,
@@ -507,7 +507,7 @@
                                 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 @@ -548,7 +548,7 @@

Returns

-

TRUE if there are more attributes

+

TRUE if there are more attributes


@@ -556,7 +556,7 @@

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 @@ -632,9 +632,9 @@


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

@@ -652,13 +652,13 @@

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.

@@ -678,7 +678,7 @@

Returns

-

TRUE if return value is only useful in C.

+

TRUE if return value is only useful in C.

@@ -694,6 +694,6 @@ +
Generated by GTK-Doc V1.24.1 \ No newline at end of file diff -Nru gobject-introspection-1.45.2/docs/reference/html/gi-GICallbackInfo.html gobject-introspection-1.45.3/docs/reference/html/gi-GICallbackInfo.html --- gobject-introspection-1.45.2/docs/reference/html/gi-GICallbackInfo.html 2015-05-26 07:57:45.000000000 +0000 +++ gobject-introspection-1.45.3/docs/reference/html/gi-GICallbackInfo.html 2015-07-03 20:31:19.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -73,6 +73,6 @@ +
Generated by GTK-Doc V1.24.1 \ No newline at end of file diff -Nru gobject-introspection-1.45.2/docs/reference/html/gi-GIConstantInfo.html gobject-introspection-1.45.3/docs/reference/html/gi-GIConstantInfo.html --- gobject-introspection-1.45.2/docs/reference/html/gi-GIConstantInfo.html 2015-05-26 07:57:45.000000000 +0000 +++ gobject-introspection-1.45.3/docs/reference/html/gi-GIConstantInfo.html 2015-07-03 20:31:19.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -63,7 +63,7 @@ - -
-gint +gint g_constant_info_get_value () @@ -184,7 +184,7 @@

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 @@

+
Generated by GTK-Doc V1.24.1 \ No newline at end of file diff -Nru gobject-introspection-1.45.2/docs/reference/html/gi-GIEnumInfo.html gobject-introspection-1.45.3/docs/reference/html/gi-GIEnumInfo.html --- gobject-introspection-1.45.2/docs/reference/html/gi-GIEnumInfo.html 2015-05-26 07:57:45.000000000 +0000 +++ gobject-introspection-1.45.3/docs/reference/html/gi-GIEnumInfo.html 2015-07-03 20:31:19.000000000 +0000 @@ -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 @@

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_value ()

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

Obtain a value for this enumeration.

Parameters

@@ -238,7 +238,7 @@

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 @@

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_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 @@

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 @@

Returns

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

+with this enum, or NULL.

[transfer none]

Since: 1.29.17

@@ -371,7 +371,7 @@

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 @@
+
Generated by GTK-Doc V1.24.1
\ No newline at end of file diff -Nru gobject-introspection-1.45.2/docs/reference/html/gi-GIFieldInfo.html gobject-introspection-1.45.3/docs/reference/html/gi-GIFieldInfo.html --- gobject-introspection-1.45.2/docs/reference/html/gi-GIFieldInfo.html 2015-05-26 07:57:45.000000000 +0000 +++ gobject-introspection-1.45.3/docs/reference/html/gi-GIFieldInfo.html 2015-07-03 20:31:19.000000000 +0000 @@ -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 @@

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 @@

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 @@

Returns

-

TRUE if writing the field succeeded, otherwise FALSE

+

TRUE if writing the field succeeded, otherwise FALSE


@@ -274,7 +274,7 @@

g_field_info_get_offset ()

-
gint
+
gint
 g_field_info_get_offset (GIFieldInfo *info);

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

@@ -301,7 +301,7 @@

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 @@
+
Generated by GTK-Doc V1.24.1 \ No newline at end of file diff -Nru gobject-introspection-1.45.2/docs/reference/html/gi-GIFunctionInfo.html gobject-introspection-1.45.3/docs/reference/html/gi-GIFunctionInfo.html --- gobject-introspection-1.45.2/docs/reference/html/gi-GIFunctionInfo.html 2015-05-26 07:57:45.000000000 +0000 +++ gobject-introspection-1.45.3/docs/reference/html/gi-GIFunctionInfo.html 2015-07-03 20:31:19.000000000 +0000 @@ -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 () @@ -90,7 +90,7 @@
-GQuark +GQuark g_invoke_error_quark () @@ -198,7 +198,7 @@

Obtain the property associated with this 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 @@

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 @@

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 @@ 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 @@

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 @@

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 @@
+can be NULL

@@ -331,7 +331,7 @@ +may be NULL

@@ -345,12 +345,12 @@ +NULL

- + @@ -358,7 +358,7 @@

Returns

-

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

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

@@ -372,7 +372,7 @@

g_invoke_error_quark ()

-
GQuark
+
GQuark
 g_invoke_error_quark (void);

TODO

@@ -492,6 +492,6 @@
+
Generated by GTK-Doc V1.24.1 \ No newline at end of file diff -Nru gobject-introspection-1.45.2/docs/reference/html/gi-GIInterfaceInfo.html gobject-introspection-1.45.3/docs/reference/html/gi-GIInterfaceInfo.html --- gobject-introspection-1.45.2/docs/reference/html/gi-GIInterfaceInfo.html 2015-05-26 07:57:45.000000000 +0000 +++ gobject-introspection-1.45.3/docs/reference/html/gi-GIInterfaceInfo.html 2015-07-03 20:31:19.000000000 +0000 @@ -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

 

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

 

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 @@

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 @@

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_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_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_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_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_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 @@

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 @@

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_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_find_signal ()

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

TODO

Parameters

@@ -552,7 +552,7 @@

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

+NULL on failure.

[transfer full]

Since: 1.34

@@ -560,7 +560,7 @@

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_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_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 @@

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 @@

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_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_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 @@

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 @@ +
Generated by GTK-Doc V1.24.1 \ No newline at end of file diff -Nru gobject-introspection-1.45.2/docs/reference/html/gi-GIObjectInfo.html gobject-introspection-1.45.3/docs/reference/html/gi-GIObjectInfo.html --- gobject-introspection-1.45.2/docs/reference/html/gi-GIObjectInfo.html 2015-05-26 07:57:45.000000000 +0000 +++ gobject-introspection-1.45.3/docs/reference/html/gi-GIObjectInfo.html 2015-07-03 20:31:19.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -47,7 +47,7 @@ - - - + @@ -1543,7 +1543,7 @@

GIObjectInfoGetValueFunction ()

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

Extract an object instance out of value

[skip]

@@ -1557,7 +1557,7 @@
- +
-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 @@

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 @@

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 @@

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_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_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 @@

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_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_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_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_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_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_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_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_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 @@
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 @@

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_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_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_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_find_signal ()

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

TODO

Parameters

@@ -1022,14 +1022,14 @@

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_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_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 @@

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 @@
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 @@ 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 @@

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 @@

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 @@

Returns

-

the symbol or NULL

+

the symbol or NULL


@@ -1270,7 +1270,7 @@

Returns

-

the function pointer or NULL

+

the function pointer or NULL


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

Returns

-

the symbol or NULL

+

the symbol or NULL


@@ -1330,7 +1330,7 @@

Returns

-

the function pointer or NULL

+

the function pointer or NULL


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

Returns

-

the symbol or NULL

+

the symbol or NULL


@@ -1391,7 +1391,7 @@

Returns

-

the function pointer or NULL

+

the function pointer or NULL


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

Returns

-

the symbol or NULL

+

the symbol or NULL


@@ -1452,7 +1452,7 @@

Returns

-

the function pointer or NULL

+

the function pointer or NULL


@@ -1510,7 +1510,7 @@

GIObjectInfoSetValueFunction ()

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

Update value and attach the object instance pointer object @@ -1527,7 +1527,7 @@

value

a GValue

a GValue

 

value

a GValue

a GValue

 
@@ -1580,6 +1580,6 @@
+
Generated by GTK-Doc V1.24.1
\ No newline at end of file diff -Nru gobject-introspection-1.45.2/docs/reference/html/gi-GIPropertyInfo.html gobject-introspection-1.45.3/docs/reference/html/gi-GIPropertyInfo.html --- gobject-introspection-1.45.2/docs/reference/html/gi-GIPropertyInfo.html 2015-05-26 07:57:45.000000000 +0000 +++ gobject-introspection-1.45.3/docs/reference/html/gi-GIPropertyInfo.html 2015-07-03 20:31:19.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -47,7 +47,7 @@
-GParamFlags +GParamFlags g_property_info_get_flags () @@ -123,9 +123,9 @@

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 @@
+
Generated by GTK-Doc V1.24.1 \ No newline at end of file diff -Nru gobject-introspection-1.45.2/docs/reference/html/gi-GIRegisteredTypeInfo.html gobject-introspection-1.45.3/docs/reference/html/gi-GIRegisteredTypeInfo.html --- gobject-introspection-1.45.2/docs/reference/html/gi-GIRegisteredTypeInfo.html 2015-05-26 07:57:45.000000000 +0000 +++ gobject-introspection-1.45.3/docs/reference/html/gi-GIRegisteredTypeInfo.html 2015-07-03 20:31:19.000000000 +0000 @@ -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 @@

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 @@

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 @@

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 @@

Returns

-

the GType.

+

the GType.

@@ -229,6 +229,6 @@ +
Generated by GTK-Doc V1.24.1 \ No newline at end of file diff -Nru gobject-introspection-1.45.2/docs/reference/html/gi-girffi.html gobject-introspection-1.45.3/docs/reference/html/gi-girffi.html --- gobject-introspection-1.45.2/docs/reference/html/gi-girffi.html 2015-05-26 07:57:45.000000000 +0000 +++ gobject-introspection-1.45.3/docs/reference/html/gi-girffi.html 2015-07-03 20:31:19.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -73,7 +73,7 @@ - + @@ -326,18 +326,18 @@

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 @@

- + @@ -380,7 +380,7 @@

Returns

-

TRUE on success, FALSE otherwise with error +

TRUE on success, FALSE otherwise with error set.

@@ -416,7 +416,7 @@ 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 @@
- + @@ -530,6 +530,6 @@ +
Generated by GTK-Doc V1.24.1 \ No newline at end of file diff -Nru gobject-introspection-1.45.2/docs/reference/html/gi-gir-reference.html gobject-introspection-1.45.3/docs/reference/html/gi-gir-reference.html --- gobject-introspection-1.45.2/docs/reference/html/gi-gir-reference.html 2015-05-26 07:57:45.000000000 +0000 +++ gobject-introspection-1.45.3/docs/reference/html/gi-gir-reference.html 2015-07-03 20:31:19.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -217,6 +217,6 @@ +
Generated by GTK-Doc V1.24.1 \ No newline at end of file diff -Nru gobject-introspection-1.45.2/docs/reference/html/gi-GISignalInfo.html gobject-introspection-1.45.3/docs/reference/html/gi-GISignalInfo.html --- gobject-introspection-1.45.2/docs/reference/html/gi-GISignalInfo.html 2015-05-26 07:57:45.000000000 +0000 +++ gobject-introspection-1.45.3/docs/reference/html/gi-GISignalInfo.html 2015-07-03 20:31:19.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -47,7 +47,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 @@

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 @@

error

A GError

A GError

 

error

A GError

A GError

 
 

gpointer native_address;

gpointer native_address;

the native address

 
-GSignalFlags +GSignalFlags g_signal_info_get_flags () @@ -63,7 +63,7 @@
-gboolean +gboolean g_signal_info_true_stops_emit () @@ -128,9 +128,9 @@

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 @@ 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 @@

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 @@

Returns

-

TRUE if returning true stops the signal emission

+

TRUE if returning true stops the signal emission

@@ -220,6 +220,6 @@ +
Generated by GTK-Doc V1.24.1 \ No newline at end of file diff -Nru gobject-introspection-1.45.2/docs/reference/html/gi-GIStructInfo.html gobject-introspection-1.45.3/docs/reference/html/gi-GIStructInfo.html --- gobject-introspection-1.45.2/docs/reference/html/gi-GIStructInfo.html 2015-05-26 07:57:45.000000000 +0000 +++ gobject-introspection-1.45.3/docs/reference/html/gi-GIStructInfo.html 2015-07-03 20:31:19.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -47,7 +47,7 @@ - -
-gsize +gsize g_struct_info_get_alignment () @@ -55,7 +55,7 @@
-gsize +gsize g_struct_info_get_size () @@ -63,7 +63,7 @@
-gboolean +gboolean g_struct_info_is_gtype_struct () @@ -71,7 +71,7 @@
-gboolean +gboolean g_struct_info_is_foreign () @@ -79,7 +79,7 @@
-gint +gint g_struct_info_get_n_fields () @@ -95,7 +95,7 @@
-gint +gint g_struct_info_get_n_methods () @@ -172,7 +172,7 @@

g_struct_info_get_alignment ()

-
gsize
+
gsize
 g_struct_info_get_alignment (GIStructInfo *info);

Obtain the required alignment of the structure.

@@ -198,7 +198,7 @@

g_struct_info_get_size ()

-
gsize
+
gsize
 g_struct_info_get_size (GIStructInfo *info);

Obtain the total size of the structure.

@@ -224,10 +224,10 @@

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

@@ -246,13 +246,13 @@

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

@@ -278,7 +278,7 @@

g_struct_info_get_n_fields ()

-
gint
+
gint
 g_struct_info_get_n_fields (GIStructInfo *info);

Obtain the number of fields this structure has.

@@ -306,7 +306,7 @@

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

@@ -340,7 +340,7 @@

g_struct_info_get_n_methods ()

-
gint
+
gint
 g_struct_info_get_n_methods (GIStructInfo *info);

Obtain the number of methods this structure has.

@@ -368,7 +368,7 @@

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

@@ -404,7 +404,7 @@

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 .

@@ -448,6 +448,6 @@
+
Generated by GTK-Doc V1.24.1
\ No newline at end of file diff -Nru gobject-introspection-1.45.2/docs/reference/html/gi-GITypeInfo.html gobject-introspection-1.45.3/docs/reference/html/gi-GITypeInfo.html --- gobject-introspection-1.45.2/docs/reference/html/gi-GITypeInfo.html 2015-05-26 07:57:45.000000000 +0000 +++ gobject-introspection-1.45.3/docs/reference/html/gi-GITypeInfo.html 2015-07-03 20:31:19.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -46,14 +46,14 @@
const gchar * +const gchar * g_type_tag_to_string ()
const gchar * +const gchar * g_info_type_to_string () @@ -61,7 +61,7 @@
-gboolean +gboolean g_type_info_is_pointer () @@ -93,7 +93,7 @@
-gint +gint g_type_info_get_array_length () @@ -101,7 +101,7 @@
-gint +gint g_type_info_get_array_fixed_size () @@ -109,7 +109,7 @@
-gboolean +gboolean g_type_info_is_zero_terminated () @@ -183,7 +183,7 @@

g_type_tag_to_string ()

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

Obtain a string representation of type

@@ -210,7 +210,7 @@

g_info_type_to_string ()

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

Obtain a string representation of type

@@ -237,7 +237,7 @@

g_type_info_is_pointer ()

-
gboolean
+
gboolean
 g_type_info_is_pointer (GITypeInfo *info);

Obtain if the type is passed as a reference.

@@ -257,7 +257,7 @@

Returns

-

TRUE if it is a pointer

+

TRUE if it is a pointer


@@ -292,7 +292,7 @@

g_type_info_get_param_type ()

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

Obtain the parameter type n .

@@ -349,7 +349,7 @@

Returns

-

the GIBaseInfo, or NULL. Free it with +

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

[transfer full]

@@ -357,7 +357,7 @@

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.

@@ -384,7 +384,7 @@

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.

@@ -411,10 +411,10 @@

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

@@ -432,7 +432,7 @@

Returns

-

TRUE if zero terminated

+

TRUE if zero terminated


@@ -475,6 +475,6 @@ +
Generated by GTK-Doc V1.24.1 \ No newline at end of file diff -Nru gobject-introspection-1.45.2/docs/reference/html/gi-gitypelib.html gobject-introspection-1.45.3/docs/reference/html/gi-gitypelib.html --- gobject-introspection-1.45.2/docs/reference/html/gi-gitypelib.html 2015-05-26 07:57:45.000000000 +0000 +++ gobject-introspection-1.45.3/docs/reference/html/gi-gitypelib.html 2015-07-03 20:31:19.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -73,14 +73,14 @@ - - + @@ -155,9 +155,9 @@

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 @@
- + @@ -196,9 +196,9 @@

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 @@
- + - + @@ -252,10 +252,10 @@

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 @@

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 @@
+
Generated by GTK-Doc V1.24.1 \ No newline at end of file diff -Nru gobject-introspection-1.45.2/docs/reference/html/gi-GITypelib.html gobject-introspection-1.45.3/docs/reference/html/gi-GITypelib.html --- gobject-introspection-1.45.2/docs/reference/html/gi-GITypelib.html 2015-05-26 07:57:45.000000000 +0000 +++ gobject-introspection-1.45.3/docs/reference/html/gi-GITypelib.html 2015-07-03 20:31:19.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -83,7 +83,7 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -995,12 +995,12 @@ - + - + @@ -1033,27 +1033,27 @@ - + - + - + - + - + @@ -1085,27 +1085,27 @@ - + - + - + - + - + @@ -1144,7 +1144,7 @@ - + @@ -1192,17 +1192,17 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -1308,7 +1308,8 @@ guint16 caller_owns_return_container : 1; guint16 skip_return : 1; guint16 instance_transfer_ownership : 1; - guint16 reserved :11; + guint16 throws : 1; + guint16 reserved :10; guint16 n_arguments; @@ -1331,43 +1332,49 @@ - + - + - + - + - + - + + + + + + - + @@ -1405,22 +1412,22 @@ - + - + - + - + @@ -1465,82 +1472,82 @@ - + - + - + +g_object_set().

- + +g_object_get().

- + - + - - - + + + - + - + - + - + - + - + - + @@ -1571,27 +1578,27 @@ - + - + - + - + - + @@ -1622,27 +1629,27 @@ - + - + - + - + - + @@ -1664,12 +1671,12 @@ - + - + @@ -1707,47 +1714,47 @@ - + - + - + - + +NULL value.

- + - + - + - + @@ -1790,27 +1797,27 @@ - + - + - + - + - + @@ -1848,32 +1855,32 @@ - + - + - + - + - + - + @@ -1903,27 +1910,27 @@ - + - + - + - + - + @@ -1961,44 +1968,44 @@ - + - + - + - + - + - + - + - + @@ -2036,37 +2043,37 @@ - + - + - + - + - + - + - + @@ -2113,79 +2120,79 @@ - + - + - + - + - + - + - + - + - - + + - - + + - + - + - + - + - + @@ -2231,77 +2238,77 @@ - + - + - + - + - + - + - + - - + + - - + + - + - + - + - + - + - + @@ -2351,59 +2358,59 @@ - + - + - + - + - + - + - - + + - - + + - + - + - - + + @@ -2446,44 +2453,44 @@ - + - + - + - + - + - + - + - + - + - + @@ -2545,78 +2552,78 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -2658,75 +2665,75 @@ - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + @@ -2783,135 +2790,135 @@ - + - + - + - + - + - + - - + + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -2959,89 +2966,89 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -3078,22 +3085,22 @@ - + - + - + - + @@ -3104,17 +3111,17 @@ - + - + - + @@ -3142,19 +3149,19 @@ - + - + - + @@ -3223,6 +3230,6 @@ +
Generated by GTK-Doc V1.24.1 \ No newline at end of file diff -Nru gobject-introspection-1.45.2/docs/reference/html/gi-GIUnionInfo.html gobject-introspection-1.45.3/docs/reference/html/gi-GIUnionInfo.html --- gobject-introspection-1.45.2/docs/reference/html/gi-GIUnionInfo.html 2015-05-26 07:57:45.000000000 +0000 +++ gobject-introspection-1.45.3/docs/reference/html/gi-GIUnionInfo.html 2015-07-03 20:31:19.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -41,7 +41,7 @@ - + - + @@ -278,21 +278,21 @@

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 @@

- + @@ -322,7 +322,7 @@ +can be NULL

@@ -336,7 +336,7 @@ +may be NULL

@@ -350,12 +350,12 @@ +NULL

- + @@ -363,7 +363,7 @@

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 @@ @@ -424,6 +424,6 @@ +
Generated by GTK-Doc V1.24.1 \ No newline at end of file diff -Nru gobject-introspection-1.45.2/docs/reference/html/gi.html gobject-introspection-1.45.3/docs/reference/html/gi.html --- gobject-introspection-1.45.2/docs/reference/html/gi.html 2015-05-26 07:57:45.000000000 +0000 +++ gobject-introspection-1.45.3/docs/reference/html/gi.html 2015-07-03 20:31:19.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -113,6 +113,6 @@ +
Generated by GTK-Doc V1.24.1 \ No newline at end of file diff -Nru gobject-introspection-1.45.2/docs/reference/html/gi-programming.html gobject-introspection-1.45.3/docs/reference/html/gi-programming.html --- gobject-introspection-1.45.2/docs/reference/html/gi-programming.html 2015-05-26 07:57:45.000000000 +0000 +++ gobject-introspection-1.45.3/docs/reference/html/gi-programming.html 2015-07-03 20:31:19.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -36,6 +36,6 @@ +
Generated by GTK-Doc V1.24.1 \ No newline at end of file diff -Nru gobject-introspection-1.45.2/docs/reference/html/GIRepository.html gobject-introspection-1.45.3/docs/reference/html/GIRepository.html --- gobject-introspection-1.45.2/docs/reference/html/GIRepository.html 2015-05-26 07:57:45.000000000 +0000 +++ gobject-introspection-1.45.3/docs/reference/html/GIRepository.html 2015-07-03 20:31:19.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -50,7 +50,7 @@ - - - - - @@ -343,10 +343,10 @@

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.

@@ -367,7 +367,7 @@
- @@ -390,7 +390,7 @@

g_irepository_get_loaded_namespaces ()

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

Return the list of currently loaded namespaces.

@@ -403,7 +403,7 @@
- @@ -418,9 +418,9 @@

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 @@ -436,7 +436,7 @@

- @@ -458,8 +458,8 @@

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 @@ -477,7 +477,7 @@

- @@ -503,7 +503,7 @@

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 @@ -518,9 +518,9 @@


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 @@ -536,7 +536,7 @@

- @@ -616,14 +616,14 @@

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 GIRespository and should not be freed, nor should its string elements.

Returns

-

GSList of strings.

+

GSList of strings.

[element-type filename][transfer none]

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

TODO

Parameters

@@ -647,7 +647,7 @@
- @@ -673,9 +673,9 @@

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 @@ -693,7 +693,7 @@

- @@ -707,16 +707,16 @@

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 @@ -734,7 +734,7 @@

- @@ -745,7 +745,7 @@ - + @@ -753,7 +753,7 @@

Returns

-

TRUE if namespace-version is loaded, FALSE otherwise

+

TRUE if namespace-version is loaded, FALSE otherwise


@@ -761,10 +761,10 @@

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_ @@ -785,7 +785,7 @@

- @@ -796,7 +796,7 @@ - + @@ -806,7 +806,7 @@ - + @@ -814,7 +814,7 @@

Returns

-

a pointer to the GITypelib if successful, NULL otherwise.

+

a pointer to the GITypelib if successful, NULL otherwise.

[transfer none]

@@ -823,11 +823,11 @@

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_ @@ -848,7 +848,7 @@

- @@ -864,7 +864,7 @@ - + @@ -874,7 +874,7 @@ - + @@ -882,19 +882,19 @@

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.

@@ -908,7 +908,7 @@
- @@ -922,20 +922,20 @@

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.

@@ -949,7 +949,7 @@
- @@ -964,15 +964,15 @@

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_ .

@@ -989,7 +989,7 @@
- @@ -1011,8 +1011,8 @@

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 @@ -1029,7 +1029,7 @@

- @@ -1044,7 +1044,7 @@

Returns

GIBaseInfo representing metadata about type -, or NULL.

+, or NULL.

[transfer full]

@@ -1053,8 +1053,8 @@

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.

@@ -1069,13 +1069,13 @@ - - + @@ -1085,7 +1085,7 @@

Returns

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

+enum type, or NULL.

[transfer full]

Since: 1.29.17

@@ -1095,8 +1095,8 @@

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 @@ -1112,7 +1112,7 @@

- @@ -1132,16 +1132,16 @@

Returns

GIBaseInfo representing metadata about name -, or NULL.

+, or NULL.

[transfer full]


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 @@ -1166,7 +1166,7 @@

- + @@ -1174,19 +1174,19 @@

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

Parameters

@@ -1237,7 +1237,7 @@
#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.

@@ -1274,7 +1274,7 @@

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

@@ -1323,6 +1323,6 @@
+
Generated by GTK-Doc V1.24.1 \ No newline at end of file diff -Nru gobject-introspection-1.45.2/docs/reference/html/gi-struct-hierarchy.html gobject-introspection-1.45.3/docs/reference/html/gi-struct-hierarchy.html --- gobject-introspection-1.45.2/docs/reference/html/gi-struct-hierarchy.html 2015-05-26 07:57:45.000000000 +0000 +++ gobject-introspection-1.45.3/docs/reference/html/gi-struct-hierarchy.html 2015-07-03 20:31:19.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -51,6 +51,6 @@ +
Generated by GTK-Doc V1.24.1 \ No newline at end of file diff -Nru gobject-introspection-1.45.2/docs/reference/html/gi-typelib.html gobject-introspection-1.45.3/docs/reference/html/gi-typelib.html --- gobject-introspection-1.45.2/docs/reference/html/gi-typelib.html 2015-05-26 07:57:45.000000000 +0000 +++ gobject-introspection-1.45.3/docs/reference/html/gi-typelib.html 2015-07-03 20:31:19.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -32,6 +32,6 @@ +
Generated by GTK-Doc V1.24.1 \ No newline at end of file diff -Nru gobject-introspection-1.45.2/docs/reference/html/index.html gobject-introspection-1.45.3/docs/reference/html/index.html --- gobject-introspection-1.45.2/docs/reference/html/index.html 2015-05-26 07:57:45.000000000 +0000 +++ gobject-introspection-1.45.3/docs/reference/html/index.html 2015-07-03 20:31:19.000000000 +0000 @@ -6,7 +6,7 @@ - + @@ -15,7 +15,7 @@
-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 @@

error

a GError

a GError

 

error

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

 
-gboolean +gboolean g_typelib_matches_gtype_name_prefix () @@ -109,7 +109,7 @@
-GQuark +GQuark g_typelib_error_quark () @@ -117,7 +117,7 @@
-gboolean +gboolean g_typelib_validate () @@ -305,7 +305,7 @@

g_typelib_get_dir_entry ()

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

TODO

Parameters

@@ -373,7 +373,7 @@

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

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

TODO

Parameters

@@ -440,9 +440,9 @@

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

@@ -520,7 +520,7 @@

g_typelib_error_quark ()

-
GQuark
+
GQuark
 g_typelib_error_quark (void);

TODO

@@ -531,9 +531,9 @@

g_typelib_validate ()

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

TODO

Parameters

@@ -733,18 +733,18 @@

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 @@ -752,38 +752,38 @@

 

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 @@ -791,130 +791,130 @@

 

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 @@ -923,18 +923,18 @@

 

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 @@ -1210,13 +1210,13 @@

 

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 @@ -1225,20 +1225,20 @@

 

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 @@ -1246,7 +1246,7 @@

 

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 @@ -1255,36 +1255,36 @@

 

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 reserved :11;

guint16 throws : 1;

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

 

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;

TODO

 

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 @@ -2491,12 +2498,12 @@

 

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;

TODO

 

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 reserved2;

guint16 reserved2;

Reserved for future use.

 

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)

 
-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 @@

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_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 @@

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_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 @@

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 @@

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.

@@ -369,7 +369,7 @@

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.

@@ -407,7 +407,7 @@

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 .

@@ -442,7 +442,7 @@

g_union_info_get_size ()

-
gsize
+
gsize
 g_union_info_get_size (GIUnionInfo *info);

Obtain the total size of the union.

@@ -468,7 +468,7 @@

g_union_info_get_alignment ()

-
gsize
+
gsize
 g_union_info_get_alignment (GIUnionInfo *info);

Obtain the required alignment of the union.

@@ -503,6 +503,6 @@
+
Generated by GTK-Doc V1.24.1
\ No newline at end of file diff -Nru gobject-introspection-1.45.2/docs/reference/html/gi-GIValueInfo.html gobject-introspection-1.45.3/docs/reference/html/gi-GIValueInfo.html --- gobject-introspection-1.45.2/docs/reference/html/gi-GIValueInfo.html 2015-05-26 07:57:45.000000000 +0000 +++ gobject-introspection-1.45.3/docs/reference/html/gi-GIValueInfo.html 2015-07-03 20:31:19.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -70,6 +70,6 @@
+
Generated by GTK-Doc V1.24.1
\ No newline at end of file diff -Nru gobject-introspection-1.45.2/docs/reference/html/gi-GIVFuncInfo.html gobject-introspection-1.45.3/docs/reference/html/gi-GIVFuncInfo.html --- gobject-introspection-1.45.2/docs/reference/html/gi-GIVFuncInfo.html 2015-05-26 07:57:45.000000000 +0000 +++ gobject-introspection-1.45.3/docs/reference/html/gi-GIVFuncInfo.html 2015-07-03 20:31:19.000000000 +0000 @@ -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 @@

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 @@

Returns

-

the signal or NULL if none set.

+

the signal or NULL if none set.

[transfer full]

@@ -233,7 +233,7 @@

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 @@

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 @@

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

 

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

 

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

 
-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 () @@ -213,7 +213,7 @@
-gboolean +gboolean g_irepository_dump () @@ -259,7 +259,7 @@

Object Hierarchy

-
    GObject
+
    GObject
     ╰── GIRepository
 
@@ -285,7 +285,7 @@ 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.

@@ -297,9 +297,9 @@

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

@@ -321,7 +321,7 @@

repository

A GIRepository or NULL for the singleton +

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

[allow-none]

repository

A GIRepository or NULL for the singleton +

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

[nullable]

repository

A GIRepository or NULL for the singleton +

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

[allow-none]

repository

A GIRepository or NULL for the singleton +

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

[allow-none]

repository

A GIRepository or NULL for the singleton +

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

[allow-none]

repository

A GIRepository or NULL for the singleton +

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

[allow-none]

repository

A GIRepository or NULL for the singleton +

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

[allow-none]

repository

A GIRepository or NULL for the singleton +

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

[allow-none]

repository

A GIRepository or NULL for the singleton +

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

[allow-none]

version

Required version, may be NULL for latest.

Required version, may be NULL for latest.

[allow-none]

repository

A GIRepository or NULL for the singleton +

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

[allow-none]

version

Version of namespace, may be NULL for latest.

Version of namespace, may be NULL for latest.

[allow-none]

error

a GError.

a GError.

 

repository

A GIRepository or NULL for the singleton +

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

[allow-none]

version

Version of namespace, may be NULL for latest.

Version of namespace, may be NULL for latest.

[allow-none]

error

a GError.

a GError.

 

repository

A GIRepository or NULL for the singleton +

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

[allow-none]

repository

A GIRepository or NULL for the singleton +

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

[allow-none]

repository

A GIRepository or NULL for the singleton +

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

[allow-none]

repository

A GIRepository or NULL for the singleton +

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

[allow-none]

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

 

repository

A GIRepository or NULL for the singleton +

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

[allow-none]

error

a GError

a GError

 

- This document is for GObject Introspection version 1.45.2 + This document is for GObject Introspection version 1.45.3 . The latest version of this documentation can be found on-line at http://developer.gnome.org/gi/unstable/. @@ -131,6 +131,6 @@

+
Generated by GTK-Doc V1.24.1
\ No newline at end of file diff -Nru gobject-introspection-1.45.2/docs/reference/html/index.sgml gobject-introspection-1.45.3/docs/reference/html/index.sgml --- gobject-introspection-1.45.2/docs/reference/html/index.sgml 2015-05-26 07:57:45.000000000 +0000 +++ gobject-introspection-1.45.3/docs/reference/html/index.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,568 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -Nru gobject-introspection-1.45.2/docs/reference/html/overview.html gobject-introspection-1.45.3/docs/reference/html/overview.html --- gobject-introspection-1.45.2/docs/reference/html/overview.html 2015-05-26 07:57:45.000000000 +0000 +++ gobject-introspection-1.45.3/docs/reference/html/overview.html 2015-07-03 20:31:19.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -57,6 +57,6 @@
+
Generated by GTK-Doc V1.24.1
\ No newline at end of file diff -Nru gobject-introspection-1.45.2/docs/reference/Makefile.in gobject-introspection-1.45.3/docs/reference/Makefile.in --- gobject-introspection-1.45.2/docs/reference/Makefile.in 2015-05-26 06:40:27.000000000 +0000 +++ gobject-introspection-1.45.3/docs/reference/Makefile.in 2015-07-03 20:30:32.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -20,7 +20,17 @@ # Everything below here is generic # #################################### VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -83,8 +93,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/gtk-doc.make $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(srcdir)/version.xml.in subdir = docs/reference ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ @@ -94,6 +102,7 @@ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = version.xml @@ -118,6 +127,8 @@ *) (install-info --version) >/dev/null 2>&1;; \ esac am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/version.xml.in \ + $(top_srcdir)/gtk-doc.make DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -498,7 +509,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign docs/reference/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign docs/reference/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -507,7 +517,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/gtk-doc.make: +$(top_srcdir)/gtk-doc.make $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -684,6 +694,8 @@ mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ uninstall-am uninstall-local +.PRECIOUS: Makefile + gtkdoc-check.test: Makefile $(AM_V_GEN)echo "#!/bin/sh -e" > $@; \ diff -Nru gobject-introspection-1.45.2/docs/reference/version.xml gobject-introspection-1.45.3/docs/reference/version.xml --- gobject-introspection-1.45.2/docs/reference/version.xml 2015-05-26 06:40:37.000000000 +0000 +++ gobject-introspection-1.45.3/docs/reference/version.xml 2015-07-03 20:30:38.000000000 +0000 @@ -1 +1 @@ -1.45.2 +1.45.3 diff -Nru gobject-introspection-1.45.2/gir/gio-2.0.c gobject-introspection-1.45.3/gir/gio-2.0.c --- gobject-introspection-1.45.2/gir/gio-2.0.c 2015-05-26 06:27:56.000000000 +0000 +++ gobject-introspection-1.45.3/gir/gio-2.0.c 2015-06-19 21:06:05.000000000 +0000 @@ -2099,6 +2099,14 @@ /** + * GNativeSocketAddress: + * + * An socket address, corresponding to a general struct + * sockadd address of a type not otherwise handled by glib. + */ + + +/** * GNetworkAddress: * * A #GSocketConnectable for resolving a hostname and connecting to @@ -2256,6 +2264,16 @@ /** + * GPropertyAction:invert-boolean: + * + * If %TRUE, the state of the action will be the negation of the + * property value, provided the property is boolean. + * + * Since: 2.46 + */ + + +/** * GPropertyAction:name: * * The name of the action. This is mostly meaningful for identifying @@ -2880,7 +2898,7 @@ * @client: the #GSocketClient * @event: the event that is occurring * @connectable: the #GSocketConnectable that @event is occurring on - * @connection: the current representation of the connection + * @connection: (nullable): the current representation of the connection * * Emitted when @client's activity on @connectable changes state. * Among other things, this can be used to provide progress @@ -3459,6 +3477,43 @@ /** + * GTlsDatabaseClass: + * @verify_chain: Virtual method implementing + * g_tls_database_verify_chain(). + * @verify_chain_async: Virtual method implementing + * g_tls_database_verify_chain_async(). + * @verify_chain_finish: Virtual method implementing + * g_tls_database_verify_chain_finish(). + * @create_certificate_handle: Virtual method implementing + * g_tls_database_create_certificate_handle(). + * @lookup_certificate_for_handle: Virtual method implementing + * g_tls_database_lookup_certificate_for_handle(). + * @lookup_certificate_for_handle_async: Virtual method implementing + * g_tls_database_lookup_certificate_for_handle_async(). + * @lookup_certificate_for_handle_finish: Virtual method implementing + * g_tls_database_lookup_certificate_for_handle_finish(). + * @lookup_certificate_issuer: Virtual method implementing + * g_tls_database_lookup_certificate_issuer(). + * @lookup_certificate_issuer_async: Virtual method implementing + * g_tls_database_lookup_certificate_issuer_async(). + * @lookup_certificate_issuer_finish: Virtual method implementing + * g_tls_database_lookup_certificate_issuer_finish(). + * @lookup_certificates_issued_by: Virtual method implementing + * g_tls_database_lookup_certificates_issued_by(). + * @lookup_certificates_issued_by_async: Virtual method implementing + * g_tls_database_lookup_certificates_issued_by_async(). + * @lookup_certificates_issued_by_finish: Virtual method implementing + * g_tls_database_lookup_certificates_issued_by_finish(). + * + * The class for #GTlsDatabase. Derived classes should implement the various + * virtual methods. _async and _finish methods have a default + * implementation that runs the corresponding sync method in a thread. + * + * Since: 2.30 + */ + + +/** * GTlsFileDatabase: * * Implemented by a #GTlsDatabase which allows you to load certificates @@ -3501,6 +3556,15 @@ * If the implementation returns %G_TLS_INTERACTION_HANDLED, then the * password argument of the async method should have been filled in by using * g_tls_password_set_value() or a similar function. + * @request_certificate: ask for a certificate synchronously. If the + * implementation returns %G_TLS_INTERACTION_HANDLED, then the connection + * argument should have been filled in by using + * g_tls_connection_set_certificate(). + * @request_certificate_async: ask for a certificate asyncronously. + * @request_certificate_finish: complete operation to ask for a certificate + * asynchronously. If the implementation returns %G_TLS_INTERACTION_HANDLED, + * then the connection argument of the async method should have been + * filled in by using g_tls_connection_set_certificate(). * * The class for #GTlsInteraction. Derived classes implement the various * virtual interaction methods to handle TLS interactions. @@ -3831,6 +3895,24 @@ /** + * GWin32RegistryKey:path: + * + * A path to the key in the registry, in UTF-8. + * + * Since: 2.46 + */ + + +/** + * GWin32RegistryKey:path-utf16: + * + * A path to the key in the registry, in UTF-16. + * + * Since: 2.46 + */ + + +/** * GZlibCompressor: * * Zlib decompression @@ -6410,6 +6492,15 @@ /** + * SECTION:gnativesocketaddress + * @short_description: Native GSocketAddress + * @include: gio/gio.h + * + * An socket address of some unknown native type. + */ + + +/** * SECTION:gnetworkaddress * @short_description: A GSocketConnectable for resolving hostnames * @include: gio/gio.h @@ -6886,7 +6977,8 @@ * * Normally, a schema has as fixed path that determines where the settings * are stored in the conceptual global tree of settings. However, schemas - * can also be 'relocatable', i.e. not equipped with a fixed path. This is + * can also be '[relocatable][gsettings-relocatable]', i.e. not equipped with + * a fixed path. This is * useful e.g. when the schema describes an 'account', and you want to be * able to store a arbitrary number of accounts. * @@ -6918,9 +7010,33 @@ * Similar to GConf, the default values in GSettings schemas can be * localized, but the localized values are stored in gettext catalogs * and looked up with the domain that is specified in the - * gettext-domain attribute of the or - * elements and the category that is specified in the l10n attribute of - * the element. + * `gettext-domain` attribute of the or + * elements and the category that is specified in the `l10n` attribute of + * the element. The string which is translated includes all text in + * the element, including any surrounding quotation marks. + * + * The `l10n` attribute must be set to `messages` or `time`, and sets the + * [locale category for + * translation](https://www.gnu.org/software/gettext/manual/html_node/Aspects.html#index-locale-categories-1). + * The `messages` category should be used by default; use `time` for + * translatable date or time formats. A translation comment can be added as an + * XML comment immediately above the element — it is recommended to + * add these comments to aid translators understand the meaning and + * implications of the default value. An optional translation `context` + * attribute can be set on the element to disambiguate multiple + * defaults which use the same string. + * + * For example: + * |[ + * + * ['bad', 'words'] + * ]| + * + * Translations of default values must remain syntactically valid serialized + * #GVariants (e.g. retaining any surrounding quotation marks) or runtime + * errors will occur. * * GSettings uses schemas in a compact binary form that is created * by the [glib-compile-schemas][glib-compile-schemas] @@ -7050,6 +7166,83 @@ * automatically binds it to the writability of the bound setting. * If this 'magic' gets in the way, it can be suppressed with the * #G_SETTINGS_BIND_NO_SENSITIVITY flag. + * + * ## Relocatable schemas # {#gsettings-relocatable} + * + * A relocatable schema is one with no `path` attribute specified on its + * element. By using g_settings_new_with_path(), a #GSettings object + * can be instantiated for a relocatable schema, assigning a path to the + * instance. Paths passed to g_settings_new_with_path() will typically be + * constructed dynamically from a constant prefix plus some form of instance + * identifier; but they must still be valid GSettings paths. Paths could also + * be constant and used with a globally installed schema originating from a + * dependency library. + * + * For example, a relocatable schema could be used to store geometry information + * for different windows in an application. If the schema ID was + * `org.foo.MyApp.Window`, it could be instantiated for paths + * `/org/foo/MyApp/main/`, `/org/foo/MyApp/document-1/`, + * `/org/foo/MyApp/document-2/`, etc. If any of the paths are well-known + * they can be specified as elements in the parent schema, e.g.: + * |[ + * + * + * + * ]| + * + * ## Build system integration # {#gsettings-build-system} + * + * GSettings comes with autotools integration to simplify compiling and + * installing schemas. To add GSettings support to an application, add the + * following to your `configure.ac`: + * |[ + * GLIB_GSETTINGS + * ]| + * + * In the appropriate `Makefile.am`, use the following snippet to compile and + * install the named schema: + * |[ + * gsettings_SCHEMAS = org.foo.MyApp.gschema.xml + * EXTRA_DIST = $(gsettings_SCHEMAS) + * + * @GSETTINGS_RULES@ + * ]| + * + * No changes are needed to the build system to mark a schema XML file for + * translation. Assuming it sets the `gettext-domain` attribute, a schema may + * be marked for translation by adding it to `POTFILES.in`, assuming gettext + * 0.19 is in use (the preferred method for translation): + * |[ + * data/org.foo.MyApp.gschema.xml + * ]| + * + * Alternatively, if intltool 0.50.1 is in use: + * |[ + * [type: gettext/gsettings]data/org.foo.MyApp.gschema.xml + * ]| + * + * GSettings will use gettext to look up translations for the and + * elements, and also any elements which have a `l10n` + * attribute set. Translations must not be included in the `.gschema.xml` file + * by the build system, for example by using intltool XML rules with a + * `.gschema.xml.in` template. + * + * If an enumerated type defined in a C header file is to be used in a GSettings + * schema, it can either be defined manually using an element in the + * schema XML, or it can be extracted automatically from the C header. This + * approach is preferred, as it ensures the two representations are always + * synchronised. To do so, add the following to the relevant `Makefile.am`: + * |[ + * gsettings_ENUM_NAMESPACE = org.foo.MyApp + * gsettings_ENUM_FILES = my-app-enums.h my-app-misc.h + * ]| + * + * `gsettings_ENUM_NAMESPACE` specifies the schema namespace for the enum files, + * which are specified in `gsettings_ENUM_FILES`. This will generate a + * `org.foo.MyApp.enums.xml` file containing the extracted enums, which will be + * automatically included in the schema compilation, install and uninstall + * rules. It should not be committed to version control or included in + * `EXTRA_DIST`. */ @@ -7219,7 +7412,7 @@ * @include: gio/gio.h * @see_also: #GAsyncResult, #GTask * - * As of GLib 2.36, #GSimpleAsyncResult is deprecated in favor of + * As of GLib 2.46, #GSimpleAsyncResult is deprecated in favor of * #GTask, which provides a simpler API. * * #GSimpleAsyncResult implements #GAsyncResult. @@ -8903,6 +9096,47 @@ /** + * SECTION:gwin32registrykey + * @title: GWin32RegistryKey + * @short_description: W32 registry access helper + * @include: gio/win32/gwin32registrykey.h + * + * #GWin32RegistryKey represents a single Windows Registry key. + * + * #GWin32RegistryKey is used by a number of helper functions that read + * Windows Registry. All keys are opened with read-only access, and at + * the moment there is no API for writing into registry keys or creating + * new ones. + * + * #GWin32RegistryKey implements the #GInitable interface, so if it is manually + * constructed by e.g. g_object_new() you must call g_initable_init() and check + * the results before using the object. This is done automatically + * in g_win32_registry_key_new() and g_win32_registry_key_get_child(), so these + * functions can return %NULL. + * + * To increase efficiency, a UTF-16 variant is available for all functions + * that deal with key or value names in the registry. Use these to perform + * deep registry queries or other operations that require querying a name + * of a key or a value and then opening it (or querying its data). The use + * of UTF-16 functions avoids the overhead of converting names to UTF-8 and + * back. + * + * All functions operate in current user's context (it is not possible to + * access registry tree of a different user). + * + * Key paths must use '\\' as a separator, '/' is not supported. Key names + * must not include '\\', because it's used as a separator. Value names + * can include '\\'. + * + * Key and value names are not case sensitive. + * + * Full key name (excluding the pre-defined ancestor's name) can't exceed + * 255 UTF-16 characters, give or take. Value name can't exceed 16383 UTF-16 + * characters. Tree depth is limited to 512 levels. + */ + + +/** * SECTION:gzcompressor * @short_description: Zlib compressor * @include: gio/gio.h @@ -10982,8 +11216,7 @@ * possible for an action to be removed and for a new action to be added * with the same name but a different state type. * - * Returns: (nullable) (transfer full): the state type, if the action - * is stateful + * Returns: (nullable): the state type, if the action is stateful * Since: 2.28 */ @@ -23458,7 +23691,9 @@ * or the error %G_IO_ERROR_WRONG_ETAG will be returned. * * If @make_backup is %TRUE, this function will attempt to make a backup - * of @file. + * of @file. Internally, it uses g_file_replace(), so will try to replace the + * file contents in the safest way possible. For example, atomic renames are + * used when replacing local files’ contents. * * If @cancellable is not %NULL, then the operation can be cancelled by * triggering the cancellable object from another thread. If the operation @@ -27925,6 +28160,18 @@ /** + * g_native_socket_address_new: + * @address: a #GNativeAddress + * @port: a port number + * + * Creates a new #GNativeSocketAddress for @address and @port. + * + * Returns: a new #GNativeSocketAddress + * Since: 2.46 + */ + + +/** * g_network_address_get_hostname: * @addr: a #GNetworkAddress * @@ -30306,7 +30553,7 @@ * g_resource_ref: * @resource: A #GResource * - * Atomically increments the reference count of @array by one. This + * Atomically increments the reference count of @resource by one. This * function is MT-safe and may be called from any thread. * * Returns: The passed in #GResource @@ -30319,7 +30566,7 @@ * @resource: A #GResource * * Atomically decrements the reference count of @resource by one. If the - * reference count drops to 0, all memory allocated by the array is + * reference count drops to 0, all memory allocated by the resource is * released. This function is MT-safe and may be called from any * thread. * @@ -31632,6 +31879,22 @@ /** + * g_settings_schema_list_keys: + * @schema: a #GSettingsSchema + * + * Introspects the list of keys on @schema. + * + * You should probably not be calling this function from "normal" code + * (since you should already know what keys are in your schema). This + * function is intended for introspection reasons. + * + * Returns: (transfer full) (element-type utf8): a list of the keys on + * @schema + * Since: 2.46 + */ + + +/** * g_settings_schema_ref: * @schema: a #GSettingsSchema * @@ -35547,9 +35810,8 @@ * Returns the value of the environment variable @variable in the * environment of processes launched from this launcher. * - * The returned string is in the GLib file name encoding. On UNIX, this - * means that it can be an arbitrary byte string. On Windows, it will - * be UTF-8. + * On UNIX, the returned string can be an arbitrary byte string. + * On Windows, it will be UTF-8. * * Returns: the value of the environment variable, %NULL if unset * Since: 2.40 @@ -35625,9 +35887,8 @@ * As an alternative, you can use g_subprocess_launcher_setenv(), * g_subprocess_launcher_unsetenv(), etc. * - * All strings in this array are expected to be in the GLib file name - * encoding. On UNIX, this means that they can be arbitrary byte - * strings. On Windows, they should be in UTF-8. + * On UNIX, all strings in this array can be arbitrary byte strings. + * On Windows, they should be in UTF-8. * * Since: 2.40 */ @@ -35730,9 +35991,9 @@ * Sets the environment variable @variable in the environment of * processes launched from this launcher. * - * Both the variable's name and value should be in the GLib file name - * encoding. On UNIX, this means that they can be arbitrary byte - * strings. On Windows, they should be in UTF-8. + * On UNIX, both the variable's name and value can be arbitrary byte + * strings, except that the variable's name cannot contain '='. + * On Windows, they should be in UTF-8. * * Since: 2.40 */ @@ -35875,9 +36136,8 @@ * Removes the environment variable @variable from the environment of * processes launched from this launcher. * - * The variable name should be in the GLib file name encoding. On UNIX, - * this means that they can be arbitrary byte strings. On Windows, they - * should be in UTF-8. + * On UNIX, the variable's name can be an arbitrary byte string not + * containing '='. On Windows, it should be in UTF-8. * * Since: 2.40 */ @@ -39818,6 +40078,596 @@ */ +/** + * g_win32_registry_key_erase_change_indicator: + * @key: (in) (transfer none): a #GWin32RegistryKey + * + * Erases change indicator of the @key. + * + * Subsequent calls to g_win32_registry_key_has_changed() will return %FALSE + * until the key is put on watch again by calling + * g_win32_registry_key_watch() again. + * + * Since: 2.46 + */ + + +/** + * g_win32_registry_key_get_child: + * @key: (in) (transfer none): a parent #GWin32RegistryKey + * @subkey: (in) (transfer none): name of a child key to open (in UTF-8), relative to @key + * @error: (inout) (nullable): a pointer to a %NULL #GError, or %NULL + * + * Opens a @subkey of the @key. + * + * Returns: (nullable): a #GWin32RegistryKey or %NULL if can't be opened. Free + * with g_object_unref(). + */ + + +/** + * g_win32_registry_key_get_child_w: + * @key: (in) (transfer none): a parent #GWin32RegistryKey + * @subkey: (in) (transfer none): name of a child key to open (in UTF-8), relative to @key + * @error: (inout) (nullable): a pointer to a %NULL #GError, or %NULL + * + * Opens a @subkey of the @key. + * + * Returns: (nullable): a #GWin32RegistryKey or %NULL if can't be opened. Free + * with g_object_unref(). + */ + + +/** + * g_win32_registry_key_get_path: + * @key: (in) (transfer none): a #GWin32RegistryKey + * + * Get full path to the key + * + * Returns: (transfer none): a full path to the key (in UTF-8), + * or %NULL if it can't be converted to UTF-8. + * Since: 2.46 + */ + + +/** + * g_win32_registry_key_get_path_w: + * @key: (in) (transfer none): a #GWin32RegistryKey + * + * Get full path to the key + * + * Returns: (transfer none): a full path to the key (in UTF-16) + * Since: 2.46 + */ + + +/** + * g_win32_registry_key_get_value: + * @key: (in) (transfer none): a #GWin32RegistryKey + * @auto_expand: (in): %TRUE to automatically expand G_WIN32_REGISTRY_VALUE_EXPAND_STR + * to G_WIN32_REGISTRY_VALUE_STR. + * @value_name: (in) (transfer none): name of the value to get (in UTF-8). + * Empty string means the '(Default)' value. + * @value_type: (out) (optional): type of the value retrieved. + * @value_data: (out callee-allocates) (optional): contents of the value. + * @value_data_size: (out) (optional): size of the buffer pointed + * by @value_data. + * @error: (nullable): a pointer to %NULL #GError, or %NULL + * + * Get data from a value of a key. String data is guaranteed to be + * appropriately terminated and will be in UTF-8. + * + * Returns: %TRUE on success, %FALSE on failure. + * Since: 2.46 + */ + + +/** + * g_win32_registry_key_get_value_w: + * @key: (in) (transfer none): a #GWin32RegistryKey + * @auto_expand: (in): %TRUE to automatically expand G_WIN32_REGISTRY_VALUE_EXPAND_STR + * to G_WIN32_REGISTRY_VALUE_STR. + * @value_name: (in) (transfer none): name of the value to get (in UTF-16). + * Empty string means the '(Default)' value. + * @value_type: (out) (optional): type of the value retrieved. + * @value_data: (out callee-allocates) (optional): contents of the value. + * @value_data_size: (out) (optional): size of the buffer pointed + * by @value_data. + * @error: (nullable): a pointer to %NULL #GError, or %NULL + * + * Get data from a value of a key. + * + * Get data from a value of a key. String data is guaranteed to be + * appropriately terminated and will be in UTF-16. + * + * When calling with value_data == NULL (to get data size without getting + * the data itself) remember that returned size corresponds to possibly + * unterminated string data (if value is some kind of string), because + * termination cannot be checked and fixed unless the data is retreived + * too. + * + * Returns: %TRUE on success, %FALSE on failure. + * Since: 2.46 + */ + + +/** + * g_win32_registry_key_has_changed: + * @key: (in) (transfer none): a #GWin32RegistryKey + * + * Check the @key's status indicator. + * + * Returns: %TRUE if the @key was put under watch at some point and has changed + * since then, %FALSE if it either wasn't changed or wasn't watched at all. + * Since: 2.46 + */ + + +/** + * g_win32_registry_key_new: + * @path: absolute full name of a key to open (in UTF-8) + * @error: (nullable): a pointer to a %NULL #GError, or %NULL + * + * Creates an object that represents a registry key specified by @path. + * @path must start with one of the following pre-defined names: + * - HKEY_CLASSES_ROOT + * - HKEY_CURRENT_CONFIG + * - HKEY_CURRENT_USER + * - HKEY_CURRENT_USER_LOCAL_SETTINGS + * - HKEY_LOCAL_MACHINE + * - HKEY_PERFORMANCE_DATA + * - HKEY_PERFORMANCE_NLSTEXT + * - HKEY_PERFORMANCE_TEXT + * - HKEY_USERS + * @path must not end with '\\'. + * + * Returns: (nullable) (transfer full): a #GWin32RegistryKey or %NULL if can't + * be opened. Free with g_object_unref(). + */ + + +/** + * g_win32_registry_key_new_w: + * @path: (in) (transfer none): absolute full name of a key to open (in UTF-16) + * @error: (inout) (nullable): a pointer to a %NULL #GError, or %NULL + * + * Creates an object that represents a registry key specified by @path. + * @path must start with one of the following pre-defined names: + * - HKEY_CLASSES_ROOT + * - HKEY_CURRENT_CONFIG + * - HKEY_CURRENT_USER + * - HKEY_CURRENT_USER_LOCAL_SETTINGS + * - HKEY_LOCAL_MACHINE + * - HKEY_PERFORMANCE_DATA + * - HKEY_PERFORMANCE_NLSTEXT + * - HKEY_PERFORMANCE_TEXT + * - HKEY_USERS + * @path must not end with L'\\'. + * + * Returns: (nullable) (transfer full): a #GWin32RegistryKey or %NULL if can't + * be opened. Free with g_object_unref(). + */ + + +/** + * g_win32_registry_key_watch: + * @key: (in) (transfer none): a #GWin32RegistryKey + * @watch_children: (in): %TRUE also watch the children of the @key, %FALSE + * to watch the key only. + * @change_flags: (in): specifies the types of changes to watch for. + * @callback: (in) (nullable): a function to invoke when a change occurs. + * @user_data: (in) (nullable): a pointer to pass to @callback on invocation. + * @error: (nullable): a pointer to %NULL #GError, or %NULL + * + * Puts @key under a watch. + * + * When the key changes, an APC will be queued in the current thread. The APC + * will run when the current thread enters alertable state (GLib main loop + * should do that; if you are not using it, see MSDN documentation for W32API + * calls that put thread into alertable state). When it runs, it will + * atomically switch an indicator in the @key. If a callback was specified, + * it is invoked at that point. Subsequent calls to + * g_win32_registry_key_has_changed() will return %TRUE, and the callback (if + * it was specified) will not be invoked anymore. + * Calling g_win32_registry_key_erase_change_indicator() will reset the indicator, + * and g_win32_registry_key_has_changed() will start returning %FALSE. + * To resume the watch, call g_win32_registry_key_watch_for_changes() again. + * + * Calling g_win32_registry_key_watch_for_changes() for a key that is already + * being watched is allowed and affects nothing. + * + * The fact that the key is being watched will be used internally to update + * key path (if it changes). + * + * Returns: %TRUE on success, %FALSE on failure. + * Since: 2.46 + */ + + +/** + * g_win32_registry_subkey_iter_assign: + * @iter: a #GWin32RegistrySubkeyIter + * @other: another #GWin32RegistrySubkeyIter + * + * Assigns the value of @other to @iter. This function + * is not useful in applications, because iterators can be assigned + * with `GWin32RegistrySubkeyIter i = j;`. The + * function is used by language bindings. + * + * Since: 2.46 + */ + + +/** + * g_win32_registry_subkey_iter_clear: + * @iter: (in) (transfer none): a #GWin32RegistrySubkeyIter + * + * Frees internal buffers of a #GWin32RegistrySubkeyIter. + * + * Since: 2.46 + */ + + +/** + * g_win32_registry_subkey_iter_copy: + * @iter: an iterator + * + * Creates a dynamically-allocated copy of an iterator. Dynamically-allocated + * state of the iterator is duplicated too. + * + * Returns: (transfer full): a copy of the @iter, + * free with g_win32_registry_subkey_iter_free () + * Since: 2.46 + */ + + +/** + * g_win32_registry_subkey_iter_free: + * @iter: a dynamically-allocated iterator + * + * Free an iterator allocated on the heap. For iterators that are allocated + * on the stack use g_win32_registry_subkey_iter_clear () instead. + * + * Since: 2.46 + */ + + +/** + * g_win32_registry_subkey_iter_get_name: + * @iter: (in) (transfer none): a #GWin32RegistrySubkeyIter + * @subkey_name: (out callee-allocates) (transfer none): Pointer to a location + * to store the name of a subkey (in UTF-8). Free with g_free(). + * @subkey_name_len: (out) (optional): Pointer to a location to store the + * length of @subkey_name, in gchars, excluding NUL-terminator. + * %NULL if length is not needed. + * @error: (nullable): a pointer to %NULL #GError, or %NULL + * + * Gets the name of the subkey at the @iter potision. + * + * Returns: %TRUE if the name was retrieved, %FALSE otherwise. + * Since: 2.46 + */ + + +/** + * g_win32_registry_subkey_iter_get_name_w: + * @iter: (in) (transfer none): a #GWin32RegistrySubkeyIter + * @subkey_name: (out callee-allocates) (transfer none): Pointer to a location + * to store the name of a subkey (in UTF-16). + * @subkey_name_len: (out) (optional) (transfer none): Pointer to a location + * to store the length of @subkey_name, in gunichar2s, excluding + * NUL-terminator. + * %NULL if length is not needed. + * @error: (nullable): a pointer to %NULL #GError, or %NULL + * + * Same as g_win32_registry_subkey_iter_get_next(), but outputs UTF-16-encoded + * data, without converting it to UTF-8 first. + * + * Returns: %TRUE if the name was retrieved, %FALSE otherwise. + * Since: 2.46 + */ + + +/** + * g_win32_registry_subkey_iter_init: + * @iter: (in) (transfer none): a pointer to a #GWin32RegistrySubkeyIter + * @key: (in) (transfer none): a #GWin32RegistryKey to iterate over + * @error: (inout) (nullable): a pointer to %NULL #GError, or %NULL + * + * Initialises (without allocating) a #GWin32RegistrySubkeyIter. @iter may be + * completely uninitialised prior to this call; its old value is + * ignored. + * + * The iterator remains valid for as long as @key exists. + * Clean up its internal buffers with a call to + * g_win32_registry_subkey_iter_clear() when done. + * + * Returns: %TRUE if iterator was initialized successfully, %FALSE on error. + * Since: 2.46 + */ + + +/** + * g_win32_registry_subkey_iter_n_subkeys: + * @iter: (in) (transfer none): a #GWin32RegistrySubkeyIter + * + * Queries the number of subkeys items in the key that we are + * iterating over. This is the total number of subkeys -- not the number + * of items remaining. + * + * This information is accurate at the point of iterator initialization, + * and may go out of sync with reality even while subkeys are enumerated. + * + * Returns: the number of subkeys in the key + * Since: 2.46 + */ + + +/** + * g_win32_registry_subkey_iter_next: + * @iter: (in) (transfer none): a #GWin32RegistrySubkeyIter + * @skip_errors: (in): %TRUE if iterator should silently ignore errors (such as + * the actual number of subkeys being less than expected) and + * proceed forward + * @error: (nullable): a pointer to %NULL #GError, or %NULL + * + * Moves iterator to the next subkey. + * Enumeration errors can be ignored if @skip_errors is %TRUE + * + * Here is an example for iterating with g_win32_registry_subkey_iter_next(): + * |[ + * // recursively iterate a key + * void + * iterate_key_recursive (GWin32RegistryKey *key) + * { + * GWin32RegistrySubkeyIter iter; + * gchar *name; + * GWin32RegistryKey *child; + * + * if (!g_win32_registry_subkey_iter_init (&iter, key, NULL)) + * return; + * + * while (g_win32_registry_subkey_iter_next (&iter, TRUE, NULL)) + * { + * if (!g_win32_registry_subkey_iter_get_name (&iter, &name, NULL, NULL)) + * continue; + * + * g_print ("subkey '%s'\n", name); + * child = g_win32_registry_key_get_child (key, name, NULL); + * + * if (child) + * iterate_key_recursive (child); + * } + * + * g_win32_registry_subkey_iter_clear (&iter); + * } + * ]| + * + * Returns: %TRUE if next subkey info was retrieved, %FALSE otherwise. + * Since: 2.46 + */ + + +/** + * g_win32_registry_value_iter_assign: + * @iter: a #GWin32RegistryValueIter + * @other: another #GWin32RegistryValueIter + * + * Assigns the value of @other to @iter. This function + * is not useful in applications, because iterators can be assigned + * with `GWin32RegistryValueIter i = j;`. The + * function is used by language bindings. + * + * Since: 2.46 + */ + + +/** + * g_win32_registry_value_iter_clear: + * @iter: (in) (transfer none): a #GWin32RegistryValueIter + * + * Frees internal buffers of a #GWin32RegistryValueIter. + * + * Since: 2.46 + */ + + +/** + * g_win32_registry_value_iter_copy: + * @iter: an iterator + * + * Creates a dynamically-allocated copy of an iterator. Dynamically-allocated + * state of the iterator is duplicated too. + * + * Returns: (transfer full): a copy of the @iter, + * free with g_win32_registry_value_iter_free (). + * Since: 2.46 + */ + + +/** + * g_win32_registry_value_iter_free: + * @iter: a dynamically-allocated iterator + * + * Free an iterator allocated on the heap. For iterators that are allocated + * on the stack use g_win32_registry_value_iter_clear () instead. + * + * Since: 2.46 + */ + + +/** + * g_win32_registry_value_iter_get_data: + * @iter: (in) (transfer none): a #GWin32RegistryValueIter + * @value_data: (out callee-allocates) (optional) (transfer none): Pointer to a + * location to store the data of the value (in UTF-8, if it's a string). + * @value_data_size: (out) (optional): Pointer to a location to store the length + * of @value_data, in bytes (including any NUL-terminators, if it's a + * string). + * %NULL if length is not needed. + * @error: (nullable): a pointer to %NULL #GError, or %NULL + * + * Stores the data of the value currently being iterated over in @value_data, + * and its length - in @value_data_len (if not %NULL). + * + * Returns: %TRUE if value data was retrieved, %FALSE otherwise. + * Since: 2.46 + */ + + +/** + * g_win32_registry_value_iter_get_data_w: + * @iter: (in) (transfer none): a #GWin32RegistryValueIter + * @auto_expand: (in): %TRUE to automatically expand G_WIN32_REGISTRY_VALUE_EXPAND_STR to + * G_WIN32_REGISTRY_VALUE_STR. + * @value_data: (out callee-allocates) (optional) (transfer none): Pointer to a + * location to store the data of the value (in UTF-16, if it's a string). + * @value_data_len: (out) (optional): Pointer to a location to store the size + * of @value_data, in bytes (including any NUL-terminators, if it's a + * string). + * %NULL if length is not needed. + * @error: (nullable): a pointer to %NULL #GError, or %NULL + * + * Stores the data of the value currently being iterated over in @value_data, + * and its length - in @value_data_len (if not %NULL). + * + * Returns: %TRUE if value data was retrieved, %FALSE otherwise. + * Since: 2.46 + */ + + +/** + * g_win32_registry_value_iter_get_name: + * @iter: (in) (transfer none): a #GWin32RegistryValueIter + * @value_name: (out callee-allocates) (transfer none): Pointer to a location + * to store the name of a value (in UTF-8). + * @value_name_len: (out) (optional): Pointer to a location to store the length + * of @value_name, in gchars, excluding NUL-terminator. + * %NULL if length is not needed. + * @error: (nullable): a pointer to %NULL #GError, or %NULL + * + * Stores the name of the value currently being iterated over in @value_name, + * and its length - in @value_name_len (if not %NULL). + * + * Returns: %TRUE if value name was retrieved, %FALSE otherwise. + * Since: 2.46 + */ + + +/** + * g_win32_registry_value_iter_get_name_w: + * @iter: (in) (transfer none): a #GWin32RegistryValueIter + * @value_name: (out callee-allocates) (transfer none): Pointer to a location + * to store the name of a value (in UTF-16). + * @value_name_len: (out) (optional): Pointer to a location to store the length + * of @value_name, in gunichar2s, excluding NUL-terminator. + * %NULL if length is not needed. + * @error: (nullable): a pointer to %NULL #GError, or %NULL + * + * Stores the name of the value currently being iterated over in @value_name, + * and its length - in @value_name (if not %NULL). + * + * Returns: %TRUE if value name was retrieved, %FALSE otherwise. + * Since: 2.46 + */ + + +/** + * g_win32_registry_value_iter_get_value_type: + * @iter: (in) (transfer none): a #GWin32RegistryValueIter + * @value_type: (out): Pointer to a location to store the type of + * the value. + * @error: (nullable): a pointer to %NULL #GError, or %NULL + * + * Stores the type of the value currently being iterated over in @value_type. + * + * Returns: %TRUE if value type was retrieved, %FALSE otherwise. + * Since: 2.46 + */ + + +/** + * g_win32_registry_value_iter_init: + * @iter: (in) (transfer none): a pointer to a #GWin32RegistryValueIter + * @key: (in) (transfer none): a #GWin32RegistryKey to iterate over + * @error: (nullable): a pointer to %NULL #GError, or %NULL + * + * Initialises (without allocating) a #GWin32RegistryValueIter. @iter may be + * completely uninitialised prior to this call; its old value is + * ignored. + * + * The iterator remains valid for as long as @key exists. + * Clean up its internal buffers with a call to + * g_win32_registry_value_iter_clear() when done. + * + * Returns: %TRUE if iterator was initialized successfully, %FALSE on error. + * Since: 2.46 + */ + + +/** + * g_win32_registry_value_iter_n_values: + * @iter: (in) (transfer none): a #GWin32RegistryValueIter + * + * Queries the number of values items in the key that we are + * iterating over. This is the total number of values -- not the number + * of items remaining. + * + * This information is accurate at the point of iterator initialization, + * and may go out of sync with reality even while values are enumerated. + * + * Returns: the number of values in the key + * Since: 2.46 + */ + + +/** + * g_win32_registry_value_iter_next: + * @iter: (in) (transfer none): a #GWin32RegistryValueIter + * @skip_errors: (in): %TRUE if iterator should silently ignore errors (such as + * the actual number of values being less than expected) and + * proceed forward + * @error: (nullable): a pointer to %NULL #GError, or %NULL + * + * Advances iterator to the next value in the key. If no more values remain then + * FALSE is returned. + * Enumeration errors can be ignored if @skip_errors is %TRUE + * + * Here is an example for iterating with g_win32_registry_value_iter_next(): + * |[ + * // iterate values of a key + * void + * iterate_values_recursive (GWin32RegistryKey *key) + * { + * GWin32RegistryValueIter iter; + * gchar *name; + * GWin32RegistryValueType val_type; + * gchar *val_data; + * + * if (!g_win32_registry_value_iter_init (&iter, key, NULL)) + * return; + * + * while (g_win32_registry_value_iter_next (&iter, TRUE, NULL)) + * { + * if ((!g_win32_registry_value_iter_get_value_type (&iter, &value)) || + * ((val_type != G_WIN32_REGISTRY_VALUE_STR) && + * (val_type != G_WIN32_REGISTRY_VALUE_EXPAND_STR))) + * continue; + * + * if (g_win32_registry_value_iter_get_value (&iter, TRUE, &name, NULL, + * &val_data, NULL, NULL)) + * g_print ("value '%s' = '%s'\n", name, val_data); + * } + * + * g_win32_registry_value_iter_clear (&iter); + * } + * ]| + * + * Returns: %TRUE if next value info was retrieved, %FALSE otherwise. + * Since: 2.46 + */ + + /** * g_zlib_compressor_get_file_info: * @compressor: a #GZlibCompressor diff -Nru gobject-introspection-1.45.2/gir/glib-2.0.c gobject-introspection-1.45.3/gir/glib-2.0.c --- gobject-introspection-1.45.2/gir/glib-2.0.c 2015-05-26 06:27:54.000000000 +0000 +++ gobject-introspection-1.45.3/gir/glib-2.0.c 2015-07-03 11:46:47.000000000 +0000 @@ -9256,6 +9256,36 @@ /** + * g_async_queue_push_front: + * @queue: a #GAsyncQueue + * @data: @data to push into the @queue + * + * Pushes the @data into the @queue. @data must not be %NULL. + * In contrast to g_async_queue_push(), this function + * pushes the new item ahead of the items already in the queue, + * so that it will be the next one to be popped off the queue. + * + * Since: 2.46 + */ + + +/** + * g_async_queue_push_front_unlocked: + * @queue: a #GAsyncQueue + * @data: @data to push into the @queue + * + * Pushes the @data into the @queue. @data must not be %NULL. + * In contrast to g_async_queue_push_unlocked(), this function + * pushes the new item ahead of the items already in the queue, + * so that it will be the next one to be popped off the queue. + * + * This function must be called while holding the @queue's lock. + * + * Since: 2.46 + */ + + +/** * g_async_queue_push_sorted: * @queue: a #GAsyncQueue * @data: the @data to push into the @queue @@ -9339,6 +9369,32 @@ /** + * g_async_queue_remove: + * @queue: a #GAsyncQueue + * @data: the @data to remove from the @queue + * + * Remove an item from the queue. This function does not block. + * + * Returns: %TRUE if the item was removed + * Since: 2.46 + */ + + +/** + * g_async_queue_remove_unlocked: + * @queue: a #GAsyncQueue + * @data: the @data to remove from the @queue + * + * Remove an item from the queue. This function does not block. + * + * This function must be called while holding the @queue's lock. + * + * Returns: %TRUE if the item was removed + * Since: 2.46 + */ + + +/** * g_async_queue_sort: * @queue: a #GAsyncQueue * @func: the #GCompareDataFunc is used to sort @queue @@ -12732,8 +12788,8 @@ * @date: a #GDate * * Returns the week of the year, where weeks are understood to start on - * Monday. If the date is before the first Monday of the year, return - * 0. The date must be valid. + * Monday. If the date is before the first Monday of the year, return 0. + * The date must be valid. * * Returns: week of the year */ @@ -12769,9 +12825,9 @@ * g_date_get_sunday_week_of_year: * @date: a #GDate * - * Returns the week of the year during which this date falls, if weeks - * are understood to being on Sunday. The date must be valid. Can return - * 0 if the day is before the first Sunday of the year. + * Returns the week of the year during which this date falls, if + * weeks are understood to being on Sunday. The date must be valid. + * Can return 0 if the day is before the first Sunday of the year. * * Returns: week number */ @@ -14339,8 +14395,7 @@ * @envp: (allow-none) (array zero-terminated=1) (transfer none): an environment * list (eg, as returned from g_get_environ()), or %NULL * for an empty environment list - * @variable: the environment variable to get, in the GLib file name - * encoding + * @variable: the environment variable to get * * Returns the value of the environment variable @variable in the * provided list @envp. @@ -14438,7 +14493,7 @@ * If @domain contains a `FAILED` (or otherwise generic) error code, * you should generally not check for it explicitly, but should * instead treat any not-explicitly-recognized error code as being - * equilalent to the `FAILED` code. This way, if the domain is + * equivalent to the `FAILED` code. This way, if the domain is * extended in the future to provide a more specific error code for * a certain case, your code will still work. * @@ -15478,14 +15533,13 @@ /** * g_getenv: - * @variable: the environment variable to get, in the GLib file name - * encoding + * @variable: the environment variable to get * * Returns the value of an environment variable. * - * The name and value are in the GLib file name encoding. On UNIX, - * this means the actual bytes which might or might not be in some - * consistent character set and encoding. On Windows, it is in UTF-8. + * On UNIX, the name and value are byte strings which might or might not + * be in some consistent character set and encoding. On Windows, they are + * in UTF-8. * On Windows, in case the environment variable's value contains * references to other environment variables, they are expanded. * @@ -17489,6 +17543,8 @@ * @group_name. If both @key and @group_name are %NULL, then * @comment will be read from above the first group in the file. * + * Note that the returned string includes the '#' comment markers. + * * Returns: a comment that should be freed with g_free() * Since: 2.6 */ @@ -18012,10 +18068,14 @@ * @error: return location for a #GError * * Places a comment above @key from @group_name. + * * If @key is %NULL then @comment will be written above @group_name. * If both @key and @group_name are %NULL, then @comment will be * written above the first group in the file. * + * Note that this function prepends a '#' comment marker to + * each line of @comment. + * * Returns: %TRUE if the comment was written, %FALSE otherwise * Since: 2.6 */ @@ -18984,6 +19044,25 @@ /** + * g_log_set_handler_full: (rename-to g_log_set_handler) + * @log_domain: (allow-none): the log domain, or %NULL for the default "" + * application domain + * @log_levels: the log levels to apply the log handler for. + * To handle fatal and recursive messages as well, combine + * the log levels with the #G_LOG_FLAG_FATAL and + * #G_LOG_FLAG_RECURSION bit flags. + * @log_func: the log handler function + * @user_data: data passed to the log handler + * @destroy: destroy notify for @user_data, or %NULL + * + * Like g_log_sets_handler(), but takes a destroy notify for the @user_data. + * + * Returns: the id of the new handler + * Since: 2.46 + */ + + +/** * g_logv: * @log_domain: the log domain * @log_level: the log level @@ -25410,10 +25489,9 @@ * @value: the value for to set the variable to. * @overwrite: whether to change the variable if it already exists. * - * Sets an environment variable. Both the variable's name and value - * should be in the GLib file name encoding. On UNIX, this means that - * they can be arbitrary byte strings. On Windows, they should be in - * UTF-8. + * Sets an environment variable. On UNIX, both the variable's name and + * value can be arbitrary byte strings, except that the variable's name + * cannot contain '='. On Windows, they should be in UTF-8. * * Note that on some systems, when variables are overwritten, the memory * used for the previous variables and its value isn't reclaimed. @@ -29803,6 +29881,19 @@ */ +/** + * g_thread_pool_move_to_front: + * @pool: a #GThreadPool + * @data: an unprocessed item in the pool + * + * Moves the item to the front of the queue of unprocessed + * items, so that it will be processed next. + * + * Returns: %TRUE if the item was found and moved + * Since: 2.46 + */ + + /** * g_thread_pool_new: * @func: a function to execute in the threads of the new thread pool diff -Nru gobject-introspection-1.45.2/girepository/gicallableinfo.c gobject-introspection-1.45.3/girepository/gicallableinfo.c --- gobject-introspection-1.45.2/girepository/gicallableinfo.c 2014-10-01 06:29:14.000000000 +0000 +++ gobject-introspection-1.45.3/girepository/gicallableinfo.c 2015-06-22 17:07:46.000000000 +0000 @@ -96,6 +96,17 @@ g_callable_info_can_throw_gerror (GICallableInfo *info) { GIRealInfo *rinfo = (GIRealInfo*)info; + SignatureBlob *signature; + + signature = (SignatureBlob *)&rinfo->typelib->data[signature_offset (info)]; + if (signature->throws) + return TRUE; + + /* Functions and VFuncs store "throws" in their own blobs. + * This info was additionally added to the SignatureBlob + * to support the other callables. For Functions and VFuncs, + * also check their legacy flag for compatibility. + */ switch (rinfo->type) { case GI_INFO_TYPE_FUNCTION: { diff -Nru gobject-introspection-1.45.2/girepository/girnode.c gobject-introspection-1.45.3/girepository/girnode.c --- gobject-introspection-1.45.2/girepository/girnode.c 2014-08-04 14:37:07.000000000 +0000 +++ gobject-introspection-1.45.3/girepository/girnode.c 2015-06-22 17:07:46.000000000 +0000 @@ -1641,7 +1641,7 @@ blob->getter = function->is_getter; blob->constructor = function->is_constructor; blob->wraps_vfunc = function->wraps_vfunc; - blob->throws = function->throws; + blob->throws = function->throws; /* Deprecated. Also stored in SignatureBlob. */ blob->index = 0; blob->name = _g_ir_write_string (node->name, strings, data, offset2); blob->symbol = _g_ir_write_string (function->symbol, strings, data, offset2); @@ -1667,6 +1667,7 @@ blob2->instance_transfer_ownership = function->instance_transfer_full; blob2->reserved = 0; blob2->n_arguments = n; + blob2->throws = function->throws; signature += 4; @@ -1708,6 +1709,7 @@ blob2->caller_owns_return_container = function->result->shallow_transfer; blob2->reserved = 0; blob2->n_arguments = n; + blob2->throws = function->throws; signature += 4; @@ -1797,7 +1799,7 @@ blob->must_be_implemented = 0; /* FIXME */ blob->must_not_be_implemented = 0; /* FIXME */ blob->class_closure = 0; /* FIXME */ - blob->throws = vfunc->throws; + blob->throws = vfunc->throws; /* Deprecated. Also stored in SignatureBlob. */ blob->reserved = 0; if (vfunc->invoker) @@ -1825,6 +1827,7 @@ blob2->instance_transfer_ownership = vfunc->instance_transfer_full; blob2->reserved = 0; blob2->n_arguments = n; + blob2->throws = vfunc->throws; signature += 4; diff -Nru gobject-introspection-1.45.2/girepository/girwriter.c gobject-introspection-1.45.3/girepository/girwriter.c --- gobject-introspection-1.45.2/girepository/girwriter.c 2015-02-19 13:02:09.000000000 +0000 +++ gobject-introspection-1.45.3/girepository/girwriter.c 2015-06-22 17:07:46.000000000 +0000 @@ -454,6 +454,9 @@ GITypeInfo *type; gint i; + if (g_callable_info_can_throw_gerror (info)) + xml_printf (file, " throws=\"1\""); + write_attributes (file, (GIBaseInfo*) info); type = g_callable_info_get_return_type (info); @@ -558,13 +561,11 @@ const gchar *name; const gchar *symbol; gboolean deprecated; - gboolean throws; flags = g_function_info_get_flags (info); name = g_base_info_get_name ((GIBaseInfo *)info); symbol = g_function_info_get_symbol (info); deprecated = g_base_info_is_deprecated ((GIBaseInfo *)info); - throws = flags & GI_FUNCTION_THROWS; if (flags & GI_FUNCTION_IS_CONSTRUCTOR) tag = "constructor"; @@ -585,9 +586,6 @@ if (deprecated) xml_printf (file, " deprecated=\"1\""); - if (throws) - xml_printf (file, " throws=\"1\""); - write_callable_info (namespace, (GICallableInfo*)info, file); xml_end_element (file, tag); } @@ -914,9 +912,6 @@ else if (flags & GI_VFUNC_MUST_NOT_OVERRIDE) xml_printf (file, " override=\"never\""); - if (flags & GI_VFUNC_THROWS) - xml_printf (file, " throws=\"1\""); - xml_printf (file, " offset=\"%d\"", offset); if (invoker) diff -Nru gobject-introspection-1.45.2/girepository/gistructinfo.c gobject-introspection-1.45.3/girepository/gistructinfo.c --- gobject-introspection-1.45.2/girepository/gistructinfo.c 2014-08-04 14:37:07.000000000 +0000 +++ gobject-introspection-1.45.3/girepository/gistructinfo.c 2015-06-22 17:07:46.000000000 +0000 @@ -22,6 +22,8 @@ #include "config.h" +#include + #include #include @@ -115,6 +117,47 @@ } /** + * g_struct_info_find_field: + * @info: a #GIStructInfo + * @name: a field name + * + * Obtain the type information for field named @name. + * + * Returns: (transfer full): the #GIFieldInfo or %NULL if not found, + * free it with g_base_info_unref() when done. + */ +GIFieldInfo * +g_struct_info_find_field (GIStructInfo *info, + const gchar *name) +{ + GIRealInfo *rinfo = (GIRealInfo *)info; + StructBlob *blob = (StructBlob *)&rinfo->typelib->data[rinfo->offset]; + Header *header = (Header *)rinfo->typelib->data; + guint32 offset = rinfo->offset + header->struct_blob_size; + gint i; + + for (i = 0; i < blob->n_fields; i++) + { + FieldBlob *field_blob = (FieldBlob *)&rinfo->typelib->data[offset]; + const gchar *fname = (const gchar *)&rinfo->typelib->data[field_blob->name]; + + if (strcmp (name, fname) == 0) + { + return (GIFieldInfo *) g_info_new (GI_INFO_TYPE_FIELD, + (GIBaseInfo* )info, + rinfo->typelib, + offset); + } + + offset += header->field_blob_size; + if (field_blob->has_embedded_type) + offset += header->callback_blob_size; + } + + return NULL; +} + +/** * g_struct_info_get_n_methods: * @info: a #GIStructInfo * diff -Nru gobject-introspection-1.45.2/girepository/gistructinfo.h gobject-introspection-1.45.3/girepository/gistructinfo.h --- gobject-introspection-1.45.2/girepository/gistructinfo.h 2014-08-15 06:12:46.000000000 +0000 +++ gobject-introspection-1.45.3/girepository/gistructinfo.h 2015-06-22 17:07:46.000000000 +0000 @@ -49,6 +49,10 @@ gint n); GI_AVAILABLE_IN_ALL +GIFieldInfo * g_struct_info_find_field (GIStructInfo *info, + const gchar *name); + +GI_AVAILABLE_IN_ALL gint g_struct_info_get_n_methods (GIStructInfo *info); GI_AVAILABLE_IN_ALL diff -Nru gobject-introspection-1.45.2/girepository/gitypelib-internal.h gobject-introspection-1.45.3/girepository/gitypelib-internal.h --- gobject-introspection-1.45.2/girepository/gitypelib-internal.h 2015-02-19 13:02:09.000000000 +0000 +++ gobject-introspection-1.45.3/girepository/gitypelib-internal.h 2015-06-22 17:07:46.000000000 +0000 @@ -467,6 +467,8 @@ * be skipped. * @instance_transfer_ownership: When calling, the function assumes ownership of * the instance parameter. + * @throws: Denotes the signature takes an additional #GError argument beyond + * the annotated arguments. * @reserved: Reserved for future use. * @n_arguments: The number of arguments that this function expects, also the * length of the array of ArgBlobs. @@ -482,7 +484,8 @@ guint16 caller_owns_return_container : 1; guint16 skip_return : 1; guint16 instance_transfer_ownership : 1; - guint16 reserved :11; + guint16 throws : 1; + guint16 reserved :10; guint16 n_arguments; @@ -522,7 +525,7 @@ * @constructor: The function acts as a constructor for the object it is * contained in. * @wraps_vfunc: The function is a simple wrapper for a virtual function. - * @throws: TODO + * @throws: (deprecated): This is now additionally stored in the #SignatureBlob. * @index: 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. @@ -990,7 +993,7 @@ * virtual function. * @class_closure: Set if this virtual function is the class closure of a * signal. - * @throws: TODO + * @throws: (deprecated): This is now additionally stored in the #SignatureBlob. * @reserved: Reserved for future use. * @signal: The index of the signal in the list of signals of the object or * interface to which this virtual function belongs. diff -Nru gobject-introspection-1.45.2/giscanner/annotationparser.py gobject-introspection-1.45.3/giscanner/annotationparser.py --- gobject-introspection-1.45.2/giscanner/annotationparser.py 2015-05-26 06:27:30.000000000 +0000 +++ gobject-introspection-1.45.3/giscanner/annotationparser.py 2015-07-03 11:46:48.000000000 +0000 @@ -1103,14 +1103,11 @@ * unexpected introspection behavior, for example missing parameters in the generated .gir and .typelib files - .. NOTE:: :class:`GtkDocCommentBlockParser` functionality is heavily based on gtkdoc-mkdb's - `ScanSourceFile()`_ function and is currently in sync with GTK-Doc - commit `47abcd5`_. + .. NOTE:: :class:`GtkDocCommentBlockParser` functionality is based on gtkdoc-mkdb's + `ScanSourceFile()`_ function. .. _ScanSourceFile(): http://git.gnome.org/browse/gtk-doc/tree/gtkdoc-mkdb.in#n3722 - .. _47abcd5: - https://git.gnome.org/browse/gtk-doc/commit/?id=47abcd53b8489ebceec9e394676512a181c1f1f6 ''' def parse_comment_blocks(self, comments): @@ -1172,10 +1169,8 @@ # Skip single line comment blocks if comment_lines_len == 1: position = Position(filename, lineno) - marker = ' ' * result.end('code') + '^' - error('Skipping invalid GTK-Doc comment block:' - '\n%s\n%s' % (comment_lines[0], marker), - position) + error('Skipping invalid GTK-Doc comment block:', + position, None, result.end('code'), comment_lines[0]) return None code_before = result.group('code') @@ -1183,17 +1178,14 @@ if code_before: position = Position(filename, lineno) - marker = ' ' * result.end('code') + '^' - warn('GTK-Doc comment block start token "/**" should ' - 'not be preceded by code:\n%s\n%s' % (comment_lines[0], marker), - position) + warn('GTK-Doc comment block start token "/**" should not be preceded by code:', + position, None, result.end('code'), comment_lines[0]) if comment: position = Position(filename, lineno) - marker = ' ' * result.start('comment') + '^' warn('GTK-Doc comment block start token "/**" should ' - 'not be followed by comment text:\n%s\n%s' % (comment_lines[0], marker), - position) + 'not be followed by comment text:', + position, None, result.start('comment'), comment_lines[0]) comment_lines[0] = comment else: @@ -1209,17 +1201,15 @@ comment = result.group('comment') if code_after: position = Position(filename, lineno + comment_lines_len - 1) - marker = ' ' * result.end('code') + '^' warn('GTK-Doc comment block end token "*/" should ' - 'not be followed by code:\n%s\n%s' % (comment_lines[-1], marker), - position) + 'not be followed by code:', + position, None, result.end('code'), comment_lines[-1]) if comment: position = Position(filename, lineno + comment_lines_len - 1) - marker = ' ' * result.end('comment') + '^' warn('GTK-Doc comment block end token "*/" should ' - 'not be preceded by comment text:\n%s\n%s' % (comment_lines[-1], marker), - position) + 'not be preceded by comment text:', + position, None, result.end('comment'), comment_lines[-1]) comment_lines[-1] = comment else: @@ -1257,10 +1247,8 @@ if result: comment = result.group('comment') if comment: - marker = ' ' * result.start('comment') + '^' - error('invalid comment text:\n%s\n%s' % - (original_line, marker), - position) + error('invalid comment text:', + position, None, result.start('comment'), original_line) column_offset = result.end(0) line = line[result.end(0):] @@ -1332,20 +1320,16 @@ comment_block.annotations = res.annotations if not identifier_delimiter and res.annotations: - marker_position = column_offset + result.start('delimiter') - marker = ' ' * marker_position + '^' - warn('missing ":" at column %s:\n%s\n%s' % - (marker_position + 1, original_line, marker), - position) + marker_pos = column_offset + result.start('delimiter') + warn('missing ":" at column %s:' % (marker_pos + 1, ), + position, None, marker_pos, original_line) if not result: # Emit a single warning when the identifier is not found on the first line if not identifier_warned: identifier_warned = True - marker = ' ' * column_offset + '^' - error('identifier not found on the first line:\n%s\n%s' % - (original_line, marker), - position) + error('identifier not found on the first line:', + position, None, column_offset, original_line) continue #################################################################### @@ -1358,12 +1342,11 @@ param_name_lower = param_name.lower() param_fields = result.group('fields') param_fields_start = result.start('fields') - marker = ' ' * (result.start('parameter_name') + column_offset) + '^' + marker_pos = result.start('parameter_name') + column_offset if in_part not in [PART_IDENTIFIER, PART_PARAMETERS]: - warn('"@%s" parameter unexpected at this location:\n%s\n%s' % - (param_name, original_line, marker), - position) + warn('"@%s" parameter unexpected at this location:' % (param_name, ), + position, None, marker_pos, original_line) in_part = PART_PARAMETERS @@ -1394,15 +1377,15 @@ elif (param_name == 'Varargs' or (param_name.endswith('...') and param_name != '...')): # Deprecated @Varargs notation or named __VA_ARGS__ instead of @... - warn('"@%s" parameter is deprecated, please use "@..." instead:\n%s\n%s' % - (param_name, original_line, marker), - position) + warn('"@%s" parameter is deprecated, please use "@..." instead:' % + (param_name, ), + position, None, marker_pos, original_line) param_name = '...' if param_name in comment_block.params.keys(): - error('multiple "@%s" parameters for identifier "%s":\n%s\n%s' % - (param_name, comment_block.name, original_line, marker), - position) + error('multiple "@%s" parameters for identifier "%s":' % + (param_name, comment_block.name), + position, None, marker_pos, original_line) parameter = GtkDocParameter(param_name, position) @@ -1445,7 +1428,7 @@ tag_name_lower = tag_name.lower() tag_fields = result.group('fields') tag_fields_start = result.start('fields') - marker = ' ' * (result.start('tag_name') + column_offset) + '^' + marker_pos = result.start('tag_name') + column_offset if tag_name_lower in DEPRECATED_GI_ANN_TAGS: # Deprecated GObject-Introspection specific tags. @@ -1453,8 +1436,8 @@ # instead, as agreed upon in http://bugzilla.gnome.org/show_bug.cgi?id=676133 warn('GObject-Introspection specific GTK-Doc tag "%s" ' 'has been deprecated, please use annotations on the identifier ' - 'instead:\n%s\n%s' % (tag_name, original_line, marker), - position) + 'instead:' % (tag_name, ), + position, None, marker_pos, original_line) # Translate deprecated tag name into corresponding annotation name ann_name = tag_name_lower.replace(' ', '-') @@ -1471,8 +1454,10 @@ if result.success: for annotation in result.annotations: - ann_options = self._parse_annotation_options_list(position, marker, - line, annotation) + ann_options = self._parse_annotation_options_list(position, + marker_pos, + line, + annotation) n_options = len(ann_options) if n_options == 1: transformed = '%s %s' % (transformed, ann_options[0], ) @@ -1481,9 +1466,8 @@ ann_options[1]) else: # Malformed Attributes: tag - error('malformed "Attributes:" tag will be ignored:\n%s\n%s' % - (original_line, marker), - position) + error('malformed "Attributes:" tag will be ignored:', + position, None, marker_pos, original_line) transformed = None if transformed: @@ -1496,8 +1480,8 @@ stored_annotation = comment_block.annotations.get('attributes') if stored_annotation: error('Duplicate "Attributes:" annotation will ' - 'be ignored:\n%s\n%s' % (original_line, marker), - position) + 'be ignored:', + position, None, marker_pos, original_line) else: comment_block.annotations[ann_name] = docannotation else: @@ -1510,9 +1494,8 @@ continue elif tag_name_lower == TAG_DESCRIPTION: # Deprecated GTK-Doc Description: tag - warn('GTK-Doc tag "Description:" has been deprecated:\n%s\n%s' % - (original_line, marker), - position) + warn('GTK-Doc tag "Description:" has been deprecated:', + position, None, marker_pos, original_line) in_part = PART_DESCRIPTION @@ -1531,9 +1514,8 @@ if in_part != PART_TAGS: in_part = PART_TAGS - warn('"%s:" tag unexpected at this location:\n%s\n%s' % - (tag_name, original_line, marker), - position) + warn('"%s:" tag unexpected at this location:' % (tag_name, ), + position, None, marker_pos, original_line) if tag_name_lower in [TAG_RETURN, TAG_RETURNS, TAG_RETURN_VALUE, TAG_RETURNS_VALUE]: @@ -1560,9 +1542,9 @@ continue else: if tag_name_lower in comment_block.tags.keys(): - error('multiple "%s:" tags for identifier "%s":\n%s\n%s' % - (tag_name, comment_block.name, original_line, marker), - position) + error('multiple "%s:" tags for identifier "%s":' % + (tag_name, comment_block.name), + position, None, marker_pos, original_line) tag = GtkDocTag(tag_name_lower, position) @@ -1683,10 +1665,9 @@ if options: result = options.find('=') if result >= 0: - marker = ' ' * (column + result) + '^' warn('invalid annotation options: expected a "list" but ' - 'received "key=value pairs":\n%s\n%s' % (line, marker), - position) + 'received "key=value pairs":', + position, None, column + result, line) parsed = self._parse_annotation_options_unknown(position, column, line, options) else: parsed = options.split(' ') @@ -1780,17 +1761,15 @@ ann_options = parts[1] if len(parts) == 2 else None if ann_name == ANN_INOUT_ALT: - marker = ' ' * (column) + '^' - warn('"%s" annotation has been deprecated, please use "%s" instead:\n%s\n%s' % - (ANN_INOUT_ALT, ANN_INOUT, line, marker), - position) + warn('"%s" annotation has been deprecated, please use "%s" instead:' % + (ANN_INOUT_ALT, ANN_INOUT), + position, None, column, line) ann_name = ANN_INOUT elif ann_name == ANN_ATTRIBUTE: - marker = ' ' * (column) + '^' - warn('"%s" annotation has been deprecated, please use "%s" instead:\n%s\n%s' % - (ANN_ATTRIBUTE, ANN_ATTRIBUTES, line, marker), - position) + warn('"%s" annotation has been deprecated, please use "%s" instead:' % + (ANN_ATTRIBUTE, ANN_ATTRIBUTES), + position, None, column, line) ann_name = ANN_ATTRIBUTES ann_options = self._parse_annotation_options_list(position, column, line, ann_options) @@ -1800,10 +1779,8 @@ elif n_options == 2: ann_options = '%s=%s' % (ann_options[0], ann_options[1]) else: - marker = ' ' * (column) + '^' - error('malformed "(attribute)" annotation will be ignored:\n%s\n%s' % - (line, marker), - position) + error('malformed "(attribute)" annotation will be ignored:', + position, None, column, line) return None, None column += len(ann_name) + 2 @@ -1862,10 +1839,8 @@ start_pos = i if prev_char == ANN_LPAR: - marker = ' ' * (column + i) + '^' - error('unexpected parentheses, annotations will be ignored:\n%s\n%s' % - (line, marker), - position) + error('unexpected parentheses, annotations will be ignored:', + position, None, column + i, line) return _ParseAnnotationsResult(False, None, None, None, None) elif parens_level > 1: char_buffer.append(cur_char) @@ -1873,16 +1848,12 @@ parens_level -= 1 if prev_char == ANN_LPAR: - marker = ' ' * (column + i) + '^' - error('unexpected parentheses, annotations will be ignored:\n%s\n%s' % - (line, marker), - position) + error('unexpected parentheses, annotations will be ignored:', + position, None, column + i, line) return _ParseAnnotationsResult(False, None, None, None, None) elif parens_level < 0: - marker = ' ' * (column + i) + '^' - error('unbalanced parentheses, annotations will be ignored:\n%s\n%s' % - (line, marker), - position) + error('unbalanced parentheses, annotations will be ignored:', + position, None, column + i, line) return _ParseAnnotationsResult(False, None, None, None, None) elif parens_level == 0: end_pos = i + 1 @@ -1894,9 +1865,8 @@ ''.join(char_buffer).strip()) if name is not None: if name in parsed_annotations: - marker = ' ' * (column + i) + '^' - error('multiple "%s" annotations:\n%s\n%s' % - (name, line, marker), position) + error('multiple "%s" annotations:' % (name, ), + position, None, column + i, line) parsed_annotations[name] = options parsed_annotations_changed = True else: @@ -1918,10 +1888,8 @@ prev_char = cur_char if parens_level > 0: - marker = ' ' * (column + i) + '^' - error('unbalanced parentheses, annotations will be ignored:\n%s\n%s' % - (line, marker), - position) + error('unbalanced parentheses, annotations will be ignored:', + position, None, column + i, line) return _ParseAnnotationsResult(False, None, None, None, None) else: return _ParseAnnotationsResult(True, parsed_annotations, parsed_annotations_changed, @@ -1960,11 +1928,9 @@ description_field = description_field[1:] else: if result.end_pos > 0: - marker_position = column + result.end_pos - marker = ' ' * marker_position + '^' - warn('missing ":" at column %s:\n%s\n%s' % - (marker_position + 1, line, marker), - position) + marker_pos = column + result.end_pos + warn('missing ":" at column %s:' % (marker_pos + 1, ), + position, None, marker_pos, line) return _ParseFieldsResult(result.success, result.annotations, result.annotations_changed, description_field) diff -Nru gobject-introspection-1.45.2/giscanner/ast.py gobject-introspection-1.45.3/giscanner/ast.py --- gobject-introspection-1.45.2/giscanner/ast.py 2015-05-26 06:27:41.000000000 +0000 +++ gobject-introspection-1.45.3/giscanner/ast.py 2015-07-03 11:46:48.000000000 +0000 @@ -172,13 +172,10 @@ def __init__(self): Type.__init__(self, _target_unknown=True) -###### -## Fundamental types -###### -# Two special ones +# Fundamental types, two special ones TYPE_NONE = Type(target_fundamental='none', ctype='void') TYPE_ANY = Type(target_fundamental='gpointer', ctype='gpointer') -# "Basic" types +# Fundamental types, "Basic" types TYPE_BOOLEAN = Type(target_fundamental='gboolean', ctype='gboolean') TYPE_INT8 = Type(target_fundamental='gint8', ctype='gint8') TYPE_UINT8 = Type(target_fundamental='guint8', ctype='guint8') @@ -328,10 +325,7 @@ # Obj-C type_names['id'] = TYPE_ANY -## -## Parameters -## - +# Parameters PARAM_DIRECTION_IN = 'in' PARAM_DIRECTION_OUT = 'out' PARAM_DIRECTION_INOUT = 'inout' diff -Nru gobject-introspection-1.45.2/giscanner/cachestore.py gobject-introspection-1.45.3/giscanner/cachestore.py --- gobject-introspection-1.45.2/giscanner/cachestore.py 2014-08-04 14:37:07.000000000 +0000 +++ gobject-introspection-1.45.3/giscanner/cachestore.py 2015-07-03 11:46:48.000000000 +0000 @@ -29,59 +29,34 @@ import giscanner +from . import utils + + _CACHE_VERSION_FILENAME = '.cache-version' def _get_versionhash(): toplevel = os.path.dirname(giscanner.__file__) - # Use pyc instead of py to avoid extra IO - sources = glob.glob(os.path.join(toplevel, '*.pyc')) + sources = glob.glob(os.path.join(toplevel, '*.py')) sources.append(sys.argv[0]) # Using mtimes is a bit (5x) faster than hashing the file contents mtimes = (str(os.stat(source).st_mtime) for source in sources) return hashlib.sha1(''.join(mtimes)).hexdigest() -def _get_cachedir(): - if 'GI_SCANNER_DISABLE_CACHE' in os.environ: - return None - homedir = os.path.expanduser('~') - if homedir is None: - return None - if not os.path.exists(homedir): - return None - - cachedir = os.path.join(homedir, '.cache') - if not os.path.exists(cachedir): - try: - os.mkdir(cachedir, 0o755) - except OSError: - return None - - scannerdir = os.path.join(cachedir, 'g-ir-scanner') - if not os.path.exists(scannerdir): - try: - os.mkdir(scannerdir, 0o755) - except OSError: - return None - # If it exists and is a file, don't cache at all - elif not os.path.isdir(scannerdir): - return None - return scannerdir - - class CacheStore(object): def __init__(self): - try: - self._directory = _get_cachedir() - except OSError as e: - if e.errno != errno.EPERM: - raise - self._directory = None - + self._directory = self._get_cachedir() self._check_cache_version() + def _get_cachedir(self): + if 'GI_SCANNER_DISABLE_CACHE' in os.environ: + return None + else: + cachedir = utils.get_user_cache_dir('g-ir-scanner') + return cachedir + def _check_cache_version(self): if self._directory is None: return diff -Nru gobject-introspection-1.45.2/giscanner/ccompiler.py gobject-introspection-1.45.3/giscanner/ccompiler.py --- gobject-introspection-1.45.2/giscanner/ccompiler.py 2014-09-03 06:03:58.000000000 +0000 +++ gobject-introspection-1.45.3/giscanner/ccompiler.py 2015-07-03 11:46:48.000000000 +0000 @@ -20,12 +20,6 @@ import os import subprocess -import sys -import distutils - -from distutils.msvccompiler import MSVCCompiler -from distutils.cygwinccompiler import Mingw32CCompiler -from distutils.sysconfig import customize_compiler from . import utils diff -Nru gobject-introspection-1.45.2/giscanner/docmain.py gobject-introspection-1.45.3/giscanner/docmain.py --- gobject-introspection-1.45.2/giscanner/docmain.py 2014-08-04 14:37:07.000000000 +0000 +++ gobject-introspection-1.45.3/giscanner/docmain.py 2015-06-18 09:24:02.000000000 +0000 @@ -19,7 +19,7 @@ # import os -import optparse +import argparse from .docwriter import DocWriter from .sectionparser import generate_sections_file, write_sections_file @@ -27,46 +27,44 @@ def doc_main(args): - parser = optparse.OptionParser('%prog [options] GIR-file') + parser = argparse.ArgumentParser() - parser.add_option("-o", "--output", + parser.add_argument("girfile") + parser.add_argument("-o", "--output", action="store", dest="output", help="Directory to write output to") - parser.add_option("-l", "--language", + parser.add_argument("-l", "--language", action="store", dest="language", default="c", help="Output language") - parser.add_option("", "--add-include-path", + parser.add_argument("-I", "--add-include-path", action="append", dest="include_paths", default=[], help="include paths for other GIR files") - parser.add_option("", "--write-sections-file", + parser.add_argument("-s", "--write-sections-file", action="store_true", dest="write_sections", help="Generate and write out a sections file") - options, args = parser.parse_args(args) - if not options.output: + args = parser.parse_args(args[1:]) + if not args.output: raise SystemExit("missing output parameter") - if len(args) < 2: - raise SystemExit("Need an input GIR filename") - if 'UNINSTALLED_INTROSPECTION_SRCDIR' in os.environ: top_srcdir = os.environ['UNINSTALLED_INTROSPECTION_SRCDIR'] top_builddir = os.environ['UNINSTALLED_INTROSPECTION_BUILDDIR'] extra_include_dirs = [os.path.join(top_srcdir, 'gir'), top_builddir] else: extra_include_dirs = [] - extra_include_dirs.extend(options.include_paths) - transformer = Transformer.parse_from_gir(args[1], extra_include_dirs) + extra_include_dirs.extend(args.include_paths) + transformer = Transformer.parse_from_gir(args.girfile, extra_include_dirs) - if options.write_sections: + if args.write_sections: sections_file = generate_sections_file(transformer) - fp = open(options.output, 'w') + fp = open(args.output, 'w') write_sections_file(fp, sections_file) fp.close() else: - writer = DocWriter(transformer, options.language) - writer.write(options.output) + writer = DocWriter(transformer, args.language) + writer.write(args.output) return 0 diff -Nru gobject-introspection-1.45.2/giscanner/gdumpparser.py gobject-introspection-1.45.3/giscanner/gdumpparser.py --- gobject-introspection-1.45.2/giscanner/gdumpparser.py 2014-08-04 14:37:07.000000000 +0000 +++ gobject-introspection-1.45.3/giscanner/gdumpparser.py 2015-07-03 11:46:48.000000000 +0000 @@ -203,7 +203,7 @@ def _initparse_gobject_record(self, record): if (record.name.startswith('ParamSpec') - and not record.name in ('ParamSpecPool', 'ParamSpecClass', 'ParamSpecTypeInfo')): + and record.name not in ('ParamSpecPool', 'ParamSpecClass', 'ParamSpecTypeInfo')): parent = None if record.name != 'ParamSpec': parent = ast.Type(target_giname='GObject.ParamSpec') @@ -359,7 +359,7 @@ else: self._namespace.append(node, replace=True) - ## WORKAROUND ## + # WORKAROUND # https://bugzilla.gnome.org/show_bug.cgi?id=550616 def _introspect_boxed_gstreamer_workaround(self, xmlnode): node = ast.Boxed('ParamSpecMiniObject', gtype_name='GParamSpecMiniObject', diff -Nru gobject-introspection-1.45.2/giscanner/girparser.py gobject-introspection-1.45.3/giscanner/girparser.py --- gobject-introspection-1.45.2/giscanner/girparser.py 2015-03-17 18:37:02.000000000 +0000 +++ gobject-introspection-1.45.3/giscanner/girparser.py 2015-07-03 11:46:48.000000000 +0000 @@ -489,7 +489,7 @@ lenidx = typenode.attrib.get('length') if lenidx is not None: idx = int(lenidx) - assert idx < len(siblings), "%r %d >= %d" % (parent, idx, len(siblings)) + assert idx < len(siblings), "%r %d >= %d" % (siblings, idx, len(siblings)) if isinstance(siblings[idx], ast.Field): typeval.length_param_name = siblings[idx].name else: diff -Nru gobject-introspection-1.45.2/giscanner/introspectablepass.py gobject-introspection-1.45.3/giscanner/introspectablepass.py --- gobject-introspection-1.45.2/giscanner/introspectablepass.py 2014-08-04 14:37:07.000000000 +0000 +++ gobject-introspection-1.45.3/giscanner/introspectablepass.py 2015-07-03 11:46:48.000000000 +0000 @@ -96,7 +96,7 @@ if (is_parameter and isinstance(target, ast.Callback) - and not node.type.target_giname in ('GLib.DestroyNotify', 'Gio.AsyncReadyCallback') + and node.type.target_giname not in ('GLib.DestroyNotify', 'Gio.AsyncReadyCallback') and node.scope is None): self._parameter_warning( parent, diff -Nru gobject-introspection-1.45.2/giscanner/libtoolimporter.py gobject-introspection-1.45.3/giscanner/libtoolimporter.py --- gobject-introspection-1.45.2/giscanner/libtoolimporter.py 2014-08-04 14:37:07.000000000 +0000 +++ gobject-introspection-1.45.3/giscanner/libtoolimporter.py 2015-07-03 11:46:48.000000000 +0000 @@ -20,7 +20,6 @@ import imp import os -import platform import sys from .utils import extract_libtool @@ -54,16 +53,14 @@ def load_module(self, name): realpath = extract_libtool(self.path) - platform_system = platform.system() - if platform_system == 'Darwin': - extension = '.dylib' - elif platform_system == 'Windows': - extension = '.dll' - else: - extension = '.so' + # The first item of the suffix tuple (which can be, depending on platform, + # one or more valid filename extensions used to name c extension modules) + # is ignored by imp.load_module(). Thus, there is no use in pretending it + # is important and we set it to an empty string. + suffix = ('', 'rb', imp.C_EXTENSION) - mod = imp.load_module(name, open(realpath), realpath, (extension, 'rb', 3)) + mod = imp.load_module(name, open(realpath), realpath, suffix) mod.__loader__ = self return mod diff -Nru gobject-introspection-1.45.2/giscanner/maintransformer.py gobject-introspection-1.45.3/giscanner/maintransformer.py --- gobject-introspection-1.45.2/giscanner/maintransformer.py 2015-03-17 18:34:34.000000000 +0000 +++ gobject-introspection-1.45.3/giscanner/maintransformer.py 2015-07-03 11:46:48.000000000 +0000 @@ -349,7 +349,7 @@ # (except enums and flags) or basic types that are # as big as a gpointer if array_type == ast.Array.GLIB_PTRARRAY: - if ((element_type in ast.BASIC_GIR_TYPES and not element_type in ast.POINTER_TYPES) + if ((element_type in ast.BASIC_GIR_TYPES and element_type not in ast.POINTER_TYPES) or isinstance(element_type, (ast.Enum, ast.Bitfield))): message.warn("invalid (element-type) for a GPtrArray, " "must be a pointer", annotations.position) @@ -358,7 +358,7 @@ if array_type == ast.Array.GLIB_BYTEARRAY: if element_type == ast.TYPE_ANY: array.element_type = ast.TYPE_UINT8 - elif not element_type in [ast.TYPE_UINT8, ast.TYPE_INT8, ast.TYPE_CHAR]: + elif element_type not in [ast.TYPE_UINT8, ast.TYPE_INT8, ast.TYPE_CHAR]: message.warn("invalid (element-type) for a GByteArray, " "must be one of guint8, gint8 or gchar", annotations.position) @@ -1250,8 +1250,8 @@ """Look for virtual methods from the class structure.""" if not node.glib_type_struct: # https://bugzilla.gnome.org/show_bug.cgi?id=629080 - #message.warn_node(node, - # "Failed to find class structure for %r" % (node.name, )) + # message.warn_node(node, + # "Failed to find class structure for %r" % (node.name, )) return node_type = node.create_type() diff -Nru gobject-introspection-1.45.2/giscanner/message.py gobject-introspection-1.45.3/giscanner/message.py --- gobject-introspection-1.45.2/giscanner/message.py 2014-08-04 14:37:07.000000000 +0000 +++ gobject-introspection-1.45.3/giscanner/message.py 2015-07-03 11:46:48.000000000 +0000 @@ -94,7 +94,7 @@ def get_error_count(self): return self._error_count - def log(self, log_type, text, positions=None, prefix=None): + def log(self, log_type, text, positions=None, prefix=None, marker_pos=None, marker_line=None): """ Log a warning, using optional file positioning information. If the warning is related to a ast.Node type, see log_node(). @@ -103,7 +103,7 @@ self._warning_count += 1 - if not log_type in self._enable_warnings: + if log_type not in self._enable_warnings: return if type(positions) == set: @@ -126,6 +126,9 @@ elif log_type == FATAL: error_type = "Fatal" + if marker_pos is not None and marker_line is not None: + text = '%s\n%s\n%s' % (text, marker_line, ' ' * marker_pos + '^') + if prefix: text = ('%s: %s: %s: %s: %s\n' % (last_position, error_type, self._namespace.name, prefix, text)) @@ -179,9 +182,9 @@ ml.log_node(log_type, node, text, context=context, positions=positions) -def warn(text, positions=None, prefix=None): +def warn(text, positions=None, prefix=None, marker_pos=None, marker_line=None): ml = MessageLogger.get() - ml.log(WARNING, text, positions, prefix) + ml.log(WARNING, text, positions, prefix, marker_pos, marker_line) def warn_node(node, text, context=None, positions=None): @@ -193,11 +196,11 @@ ml.log_symbol(WARNING, symbol, text) -def error(text, positions=None, prefix=None): +def error(text, positions=None, prefix=None, marker_pos=None, marker_line=None): ml = MessageLogger.get() - ml.log(ERROR, text, positions, prefix) + ml.log(ERROR, text, positions, prefix, marker_pos, marker_line) -def fatal(text, positions=None, prefix=None): +def fatal(text, positions=None, prefix=None, marker_pos=None, marker_line=None): ml = MessageLogger.get() - ml.log(FATAL, text, positions, prefix) + ml.log(FATAL, text, positions, prefix, marker_pos, marker_line) diff -Nru gobject-introspection-1.45.2/giscanner/scannermain.py gobject-introspection-1.45.3/giscanner/scannermain.py --- gobject-introspection-1.45.2/giscanner/scannermain.py 2015-05-26 06:27:30.000000000 +0000 +++ gobject-introspection-1.45.3/giscanner/scannermain.py 2015-07-03 11:46:48.000000000 +0000 @@ -375,7 +375,7 @@ identifier_filter_cmd=options.identifier_filter_cmd, symbol_filter_cmd=options.symbol_filter_cmd) transformer.set_include_paths(options.include_paths) - if options.passthrough_gir: + if options.passthrough_gir or options.reparse_validate_gir: transformer.disable_cache() transformer.set_passthrough_mode() diff -Nru gobject-introspection-1.45.2/giscanner/shlibs.py gobject-introspection-1.45.3/giscanner/shlibs.py --- gobject-introspection-1.45.2/giscanner/shlibs.py 2014-08-05 14:34:40.000000000 +0000 +++ gobject-introspection-1.45.3/giscanner/shlibs.py 2015-07-03 11:46:48.000000000 +0000 @@ -24,7 +24,7 @@ import re import subprocess -from .utils import get_libtool_command, extract_libtool_shlib, which +from .utils import get_libtool_command, extract_libtool_shlib from .ccompiler import CCompiler diff -Nru gobject-introspection-1.45.2/giscanner/sourcescanner.py gobject-introspection-1.45.3/giscanner/sourcescanner.py --- gobject-introspection-1.45.2/giscanner/sourcescanner.py 2015-02-15 07:18:25.000000000 +0000 +++ gobject-introspection-1.45.3/giscanner/sourcescanner.py 2015-07-03 11:46:48.000000000 +0000 @@ -236,7 +236,7 @@ ('-U', undefines)]: for arg in (args or []): opt = prefix + arg - if not opt in self._cpp_options: + if opt not in self._cpp_options: self._cpp_options.append(opt) def parse_files(self, filenames): diff -Nru gobject-introspection-1.45.2/giscanner/transformer.py gobject-introspection-1.45.3/giscanner/transformer.py --- gobject-introspection-1.45.2/giscanner/transformer.py 2015-05-26 06:27:30.000000000 +0000 +++ gobject-introspection-1.45.3/giscanner/transformer.py 2015-07-03 11:46:48.000000000 +0000 @@ -24,6 +24,7 @@ from . import ast from . import message +from . import utils from .cachestore import CacheStore from .girparser import GIRParser from .sourcescanner import ( @@ -40,13 +41,6 @@ pass -_xdg_data_dirs = [x for x in os.environ.get('XDG_DATA_DIRS', '').split(os.pathsep)] -_xdg_data_dirs.append(DATADIR) - -if os.name != 'nt': - _xdg_data_dirs.append('/usr/share') - - class Transformer(object): namespace = property(lambda self: self._namespace) @@ -102,7 +96,7 @@ def parse(self, symbols): for symbol in symbols: - ## WORKAROUND ## + # WORKAROUND # https://bugzilla.gnome.org/show_bug.cgi?id=550616 if symbol.ident in ['gst_g_error_get_type']: continue @@ -165,7 +159,7 @@ if ns == self._namespace.name: return self._namespace.get(giname) # Fallback to the main namespace if not a dependency and matches a prefix - if ns in self._namespace.identifier_prefixes and not ns in self._parsed_includes: + if ns in self._namespace.identifier_prefixes and ns not in self._parsed_includes: message.warn(("Deprecated reference to identifier " + "prefix %s in GIName %s") % (ns, name)) return self._namespace.get(giname) @@ -182,9 +176,17 @@ # Private + def _get_gi_data_dirs(self): + data_dirs = utils.get_system_data_dirs() + data_dirs.append(DATADIR) + if os.name != 'nt': + # For backwards compatibility, was always unconditionally added to the list. + data_dirs.append('/usr/share') + return data_dirs + def _find_include(self, include): searchdirs = self._includepaths[:] - for path in _xdg_data_dirs: + for path in self._get_gi_data_dirs(): searchdirs.append(os.path.join(path, 'gir-1.0')) searchdirs.append(os.path.join(DATADIR, 'gir-1.0')) @@ -500,8 +502,6 @@ return value def _create_parameters(self, symbol, base_type): - # warn if we see annotations for unknown parameters - param_names = set(child.ident for child in base_type.child_list) for i, child in enumerate(base_type.child_list): yield self._create_parameter(symbol, i, child) diff -Nru gobject-introspection-1.45.2/giscanner/utils.py gobject-introspection-1.45.3/giscanner/utils.py --- gobject-introspection-1.45.2/giscanner/utils.py 2014-08-04 14:37:07.000000000 +0000 +++ gobject-introspection-1.45.3/giscanner/utils.py 2015-06-22 17:07:46.000000000 +0000 @@ -18,6 +18,7 @@ # Boston, MA 02111-1307, USA. # +import errno import re import os import subprocess @@ -209,3 +210,81 @@ return exe_file + '.exe' return None + + +def makedirs(name, mode=0o777, exist_ok=False): + """Super-mkdir; create a leaf directory and all intermediate ones. Works like + mkdir, except that any intermediate path segment (not just the rightmost) + will be created if it does not exist. If the target directory already + exists, raise an OSError if exist_ok is False. Otherwise no exception is + raised. This is recursive. + + Note: This function has been imported from Python 3.4 sources and adapted to work + with Python 2.X because get_user_cache_dir() uses the exist_ok parameter. It can + be removed again when Python 2.X support is dropped. + """ + head, tail = os.path.split(name) + if not tail: + head, tail = os.path.split(head) + if head and tail and not os.path.exists(head): + try: + makedirs(head, mode, exist_ok) + except OSError as e: + # be happy if someone already created the path + if e.errno != errno.EEXIST: + raise + if tail == cdir: # xxx/newdir/. exists if xxx/newdir exists + return + try: + os.mkdir(name, mode) + except OSError as e: + if not exist_ok or e.errno != errno.EEXIST or not os.path.isdir(name): + raise + + +def get_user_cache_dir(dir=None): + ''' + This is a Python reimplemention of `g_get_user_cache_dir()` because we don't want to + rely on the python-xdg package and we can't depend on GLib via introspection. + If any changes are made to that function they'll need to be copied here. + ''' + + xdg_cache_home = os.environ.get('XDG_CACHE_HOME') + if xdg_cache_home is not None: + if dir is not None: + xdg_cache_home = os.path.join(xdg_cache_home, dir) + try: + makedirs(xdg_cache_home, mode=0o755, exist_ok=True) + except: + # Let's fall back to ~/.cache below + pass + else: + return xdg_cache_home + + homedir = os.path.expanduser('~') + if homedir is not None: + cachedir = os.path.join(homedir, '.cache') + if dir is not None: + cachedir = os.path.join(cachedir, dir) + try: + makedirs(cachedir, mode=0o755, exist_ok=True) + except: + return None + else: + return cachedir + + return None + + +def get_system_data_dirs(): + ''' + This is a Python reimplemention of `g_get_system_data_dirs()` because we don't want to + rely on the python-xdg package and we can't depend on GLib via introspection. + If any changes are made to that function they'll need to be copied here. + ''' + xdg_data_dirs = [x for x in os.environ.get('XDG_DATA_DIRS', '').split(os.pathsep)] + if not xdg_data_dirs and os.name != 'nt': + xdg_data_dirs.append('/usr/local/share') + xdg_data_dirs.append('/usr/share') + + return xdg_data_dirs diff -Nru gobject-introspection-1.45.2/gobject-introspection-1.0.pc gobject-introspection-1.45.3/gobject-introspection-1.0.pc --- gobject-introspection-1.45.2/gobject-introspection-1.0.pc 2015-05-26 06:40:37.000000000 +0000 +++ gobject-introspection-1.45.3/gobject-introspection-1.0.pc 2015-07-03 20:30:38.000000000 +0000 @@ -1,4 +1,4 @@ -prefix=/usr +prefix=/home/fmuellner/opt/gnome exec_prefix=${prefix} libdir=${exec_prefix}/lib bindir=${exec_prefix}/bin @@ -21,4 +21,4 @@ Name: gobject-introspection Description: GObject Introspection -Version: 1.45.2 +Version: 1.45.3 diff -Nru gobject-introspection-1.45.2/gobject-introspection-no-export-1.0.pc gobject-introspection-1.45.3/gobject-introspection-no-export-1.0.pc --- gobject-introspection-1.45.2/gobject-introspection-no-export-1.0.pc 2015-05-26 06:40:37.000000000 +0000 +++ gobject-introspection-1.45.3/gobject-introspection-no-export-1.0.pc 2015-07-03 20:30:38.000000000 +0000 @@ -1,4 +1,4 @@ -prefix=/usr +prefix=/home/fmuellner/opt/gnome exec_prefix=${prefix} libdir=${exec_prefix}/lib bindir=${exec_prefix}/bin @@ -20,4 +20,4 @@ Name: gobject-introspection Description: GObject Introspection -Version: 1.45.2 +Version: 1.45.3 diff -Nru gobject-introspection-1.45.2/m4/libtool.m4 gobject-introspection-1.45.3/m4/libtool.m4 --- gobject-introspection-1.45.2/m4/libtool.m4 2015-05-26 06:40:19.000000000 +0000 +++ gobject-introspection-1.45.3/m4/libtool.m4 2015-07-03 20:30:26.000000000 +0000 @@ -1324,19 +1324,12 @@ LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - case `/usr/bin/file conftest.o` in - *x86-64*) - LD="${LD-ld} -m elf32_x86_64" - ;; - *) - LD="${LD-ld} -m elf_i386" - ;; - esac + LD="${LD-ld} -m elf_i386" ;; - powerpc64le-*) + powerpc64le-*linux*) LD="${LD-ld} -m elf32lppclinux" ;; - powerpc64-*) + powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -1355,10 +1348,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - powerpcle-*) + powerpcle-*linux*) LD="${LD-ld} -m elf64lppc" ;; - powerpc-*) + powerpc-*linux*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -1701,8 +1694,7 @@ ;; *) lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len" && \ - test undefined != "$lt_cv_sys_max_cmd_len"; then + if test -n "$lt_cv_sys_max_cmd_len"; then lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` else @@ -2526,6 +2518,17 @@ esac ;; +gnu*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + haiku*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no @@ -2642,7 +2645,7 @@ ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) +linux* | k*bsd*-gnu | kopensolaris*-gnu) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no @@ -2672,10 +2675,14 @@ # before this can be enabled. hardcode_into_libs=yes + # Add ABI-specific directories to the system library path. + sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" + # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" + fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -2687,18 +2694,6 @@ dynamic_linker='GNU/Linux ld.so' ;; -netbsdelf*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='NetBSD ld.elf_so' - ;; - netbsd*) version_type=sunos need_lib_prefix=no @@ -3258,6 +3253,10 @@ fi ;; +gnu*) + lt_cv_deplibs_check_method=pass_all + ;; + haiku*) lt_cv_deplibs_check_method=pass_all ;; @@ -3296,11 +3295,11 @@ ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) +linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; -netbsd* | netbsdelf*-gnu) +netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' else @@ -4048,7 +4047,7 @@ ;; esac ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in KCC*) # KAI C++ Compiler @@ -4112,7 +4111,7 @@ ;; esac ;; - netbsd* | netbsdelf*-gnu) + netbsd*) ;; *qnx* | *nto*) # QNX uses GNU C++, but need to define -shared option too, otherwise @@ -4347,7 +4346,7 @@ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in # old Intel for x86_64 which still supported -KPIC. ecc*) @@ -4589,9 +4588,6 @@ ;; esac ;; - linux* | k*bsd*-gnu | gnu*) - _LT_TAGVAR(link_all_deplibs, $1)=no - ;; *) _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ;; @@ -4654,9 +4650,6 @@ openbsd*) with_gnu_ld=no ;; - linux* | k*bsd*-gnu | gnu*) - _LT_TAGVAR(link_all_deplibs, $1)=no - ;; esac _LT_TAGVAR(ld_shlibs, $1)=yes @@ -4878,7 +4871,7 @@ fi ;; - netbsd* | netbsdelf*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -5055,7 +5048,6 @@ if test "$aix_use_runtimelinking" = yes; then shared_flag="$shared_flag "'${wl}-G' fi - _LT_TAGVAR(link_all_deplibs, $1)=no else # not using gcc if test "$host_cpu" = ia64; then @@ -5360,7 +5352,7 @@ _LT_TAGVAR(link_all_deplibs, $1)=yes ;; - netbsd* | netbsdelf*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -6240,6 +6232,9 @@ _LT_TAGVAR(ld_shlibs, $1)=yes ;; + gnu*) + ;; + haiku*) _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' _LT_TAGVAR(link_all_deplibs, $1)=yes @@ -6401,7 +6396,7 @@ _LT_TAGVAR(inherit_rpath, $1)=yes ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler diff -Nru gobject-introspection-1.45.2/Makefile.am gobject-introspection-1.45.3/Makefile.am --- gobject-introspection-1.45.2/Makefile.am 2014-08-04 14:37:07.000000000 +0000 +++ gobject-introspection-1.45.3/Makefile.am 2015-07-03 11:46:47.000000000 +0000 @@ -55,7 +55,10 @@ $(man_MANS) \ $(m4_DATA) \ misc/pep8.py \ - misc/pyflakes.py + misc/pyflakes.py \ + misc/update-glib-annotations.py \ + misc/update-gtkdoc-tests.py \ + misc/verbump.py # Default pep8.py --exclude + emacs backup files PEP8_EXCLUDES=--exclude='.svn,CVS,.bzr,.hg,.git,__pycache__,.\#*' @@ -63,9 +66,9 @@ check-local: @echo "TEST: PEP-8 INQUISITION" @find $(top_srcdir)/giscanner -name \*.py | sort | uniq | xargs \ - $(PYTHON) $(top_srcdir)/misc/pep8.py --max-line-length=99 --ignore=E128 $(PEP8_EXCLUDES) + $(PYTHON) $(top_srcdir)/misc/pep8.py --max-line-length=99 --ignore=E128,W503 $(PEP8_EXCLUDES) @find $(top_srcdir)/tests -name \*.py | sort | uniq | xargs \ - $(PYTHON) $(top_srcdir)/misc/pep8.py --ignore=E127,E501 $(PEP8_EXCLUDES) + $(PYTHON) $(top_srcdir)/misc/pep8.py --ignore=E127,E402,E501,E731 $(PEP8_EXCLUDES) check-pyflakes: @echo " CHECK Pyflakes" @@ -96,7 +99,7 @@ git tag -m "Tag $(TAG_VERSION)" -a $(TAG_PREFIX)$(TAG_VERSION) prepare-minor-release: $(DISTNAME) prepare-release-tag Makefile - env top_srcdir=$(top_srcdir) python $(top_srcdir)/tools/verbump.py + env top_srcdir=$(top_srcdir) python $(top_srcdir)/misc/verbump.py upload-release: $(DISTNAME) Makefile git log origin/master..master diff -Nru gobject-introspection-1.45.2/Makefile.in gobject-introspection-1.45.3/Makefile.in --- gobject-introspection-1.45.2/Makefile.in 2015-05-26 06:40:26.000000000 +0000 +++ gobject-introspection-1.45.3/Makefile.in 2015-07-03 20:30:32.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -70,7 +70,17 @@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -138,31 +148,6 @@ noinst_PROGRAMS = $(am__EXEEXT_1) glib-print$(EXEEXT) EXTRA_PROGRAMS = cmph-bdz-test$(EXEEXT) gthash-test$(EXEEXT) TESTS = cmph-bdz-test$(EXEEXT) gthash-test$(EXEEXT) -DIST_COMMON = $(srcdir)/common.mk $(srcdir)/Makefile.introspection \ - $(srcdir)/Makefile-cmph.am $(srcdir)/Makefile-girepository.am \ - $(srcdir)/Makefile-giscanner.am $(srcdir)/Makefile-examples.am \ - $(srcdir)/Makefile-gir.am $(srcdir)/Makefile-tools.am \ - $(srcdir)/Makefile-msvcproj.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/configure \ - $(am__configure_deps) $(srcdir)/config.h.in \ - $(srcdir)/gobject-introspection-1.0.pc.in \ - $(srcdir)/gobject-introspection-no-export-1.0.pc.in \ - $(srcdir)/config.h.win32.in scannerlexer.c scannerparser.h \ - scannerparser.c $(top_srcdir)/build-aux/depcomp \ - $(top_srcdir)/build-aux/ylwrap $(collections_PYTHON) \ - $(pkgpyexec_PYTHON) $(top_srcdir)/build-aux/py-compile \ - $(dist_make_DATA) $(nobase_dist_template_DATA) \ - $(girepo_HEADERS) $(top_srcdir)/build-aux/test-driver AUTHORS \ - COPYING ChangeLog NEWS README TODO build-aux/compile \ - build-aux/config.guess build-aux/config.sub build-aux/depcomp \ - build-aux/install-sh build-aux/missing build-aux/py-compile \ - build-aux/ylwrap build-aux/ltmain.sh \ - $(top_srcdir)/build-aux/compile \ - $(top_srcdir)/build-aux/config.guess \ - $(top_srcdir)/build-aux/config.sub \ - $(top_srcdir)/build-aux/install-sh \ - $(top_srcdir)/build-aux/ltmain.sh \ - $(top_srcdir)/build-aux/missing @OS_WIN32_FALSE@am__append_1 = gi-dump-types # Windows requires Python extension modules to be explicitly @@ -187,6 +172,11 @@ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ + $(am__configure_deps) $(collections_PYTHON) \ + $(pkgpyexec_PYTHON) $(dist_make_DATA) \ + $(nobase_dist_template_DATA) $(girepo_HEADERS) \ + $(am__DIST_COMMON) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d @@ -664,6 +654,30 @@ TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ $(TEST_LOG_FLAGS) +am__DIST_COMMON = $(srcdir)/Makefile-cmph.am \ + $(srcdir)/Makefile-examples.am $(srcdir)/Makefile-gir.am \ + $(srcdir)/Makefile-girepository.am \ + $(srcdir)/Makefile-giscanner.am $(srcdir)/Makefile-msvcproj.am \ + $(srcdir)/Makefile-tools.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.introspection $(srcdir)/common.mk \ + $(srcdir)/config.h.in $(srcdir)/config.h.win32.in \ + $(srcdir)/gobject-introspection-1.0.pc.in \ + $(srcdir)/gobject-introspection-no-export-1.0.pc.in \ + $(top_srcdir)/build-aux/compile \ + $(top_srcdir)/build-aux/config.guess \ + $(top_srcdir)/build-aux/config.sub \ + $(top_srcdir)/build-aux/depcomp \ + $(top_srcdir)/build-aux/install-sh \ + $(top_srcdir)/build-aux/ltmain.sh \ + $(top_srcdir)/build-aux/missing \ + $(top_srcdir)/build-aux/py-compile \ + $(top_srcdir)/build-aux/test-driver \ + $(top_srcdir)/build-aux/ylwrap AUTHORS COPYING ChangeLog NEWS \ + README TODO build-aux/compile build-aux/config.guess \ + build-aux/config.sub build-aux/depcomp build-aux/install-sh \ + build-aux/ltmain.sh build-aux/missing build-aux/py-compile \ + build-aux/ylwrap scannerlexer.c scannerparser.c \ + scannerparser.h DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -889,11 +903,11 @@ docs/g-ir-scanner.1 EXTRA_DIST = girepository/docs.c $(STATIC_GIRSOURCES) \ gir/cairo-1.0.gir.in gir/glib-2.0.c gir/gmodule-2.0.c \ - gir/gobject-2.0.c gir/gio-2.0.c tools/g-ir-scanner.in \ - tools/g-ir-annotation-tool.in tools/g-ir-doc-tool.in \ + gir/gobject-2.0.c gir/gio-2.0.c tools/g-ir-tool-template.in \ $(GENERATED_MSVC_FILES) COPYING.LGPL COPYING.GPL CONTRIBUTORS \ $(pkgconfig_DATA) $(man_MANS) $(m4_DATA) misc/pep8.py \ - misc/pyflakes.py + misc/pyflakes.py misc/update-glib-annotations.py \ + misc/update-gtkdoc-tests.py misc/verbump.py lib_LTLIBRARIES = libgirepository-1.0.la noinst_LTLIBRARIES = libgirepository-internals.la \ libgirepository-gthash.la libgiscanner.la @@ -922,7 +936,8 @@ --add-include-path=$(srcdir) \ --add-include-path=$(top_srcdir)/gir \ --add-include-path=$(builddir) \ - --add-include-path=$(top_builddir) + --add-include-path=$(top_builddir) \ + --add-include-path=$(top_builddir)/gir INTROSPECTION_COMPILER = \ env PATH=".libs:$(PATH)" \ @@ -932,7 +947,8 @@ --includedir=$(srcdir) \ --includedir=$(top_srcdir)/gir \ --includedir=$(builddir) \ - --includedir=$(top_builddir) + --includedir=$(top_builddir) \ + --includedir=$(top_builddir)/gir INTROSPECTION_DOCTOOL = \ env PATH=".libs:$(PATH)" \ @@ -946,7 +962,8 @@ --add-include-path=$(srcdir) \ --add-include-path=$(top_srcdir)/gir \ --add-include-path=$(builddir) \ - --add-include-path=$(top_builddir) + --add-include-path=$(top_builddir) \ + --add-include-path=$(top_builddir)/gir # Private functions @@ -1411,7 +1428,7 @@ gir_DATA = $(STATIC_GIRSOURCES) $(SUBSTITUTED_GIRSOURCES) $(BUILT_GIRSOURCES) typelibsdir = $(libdir)/girepository-1.0 typelibs_DATA = $(gir_DATA:.gir=.typelib) -TOOL_SUBSTITUTIONS = sed -e s,@libdir\@,$(libdir), -e s,@datarootdir\@,$(datarootdir), -e s,@PYTHON\@,$(PYTHON), +TOOL_SUBSTITUTIONS = -e s,@libdir\@,$(libdir), -e s,@datarootdir\@,$(datarootdir), -e s,@PYTHON\@,$(PYTHON), g_ir_compiler_SOURCES = tools/compiler.c g_ir_compiler_CPPFLAGS = -DGIREPO_DEFAULT_SEARCH_PATH="\"$(libdir)\"" \ -I$(top_srcdir)/girepository @@ -1497,7 +1514,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -1507,7 +1523,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ esac; -$(srcdir)/common.mk $(srcdir)/Makefile.introspection $(srcdir)/Makefile-cmph.am $(srcdir)/Makefile-girepository.am $(srcdir)/Makefile-giscanner.am $(srcdir)/Makefile-examples.am $(srcdir)/Makefile-gir.am $(srcdir)/Makefile-tools.am $(srcdir)/Makefile-msvcproj.am: +$(srcdir)/common.mk $(srcdir)/Makefile.introspection $(srcdir)/Makefile-cmph.am $(srcdir)/Makefile-girepository.am $(srcdir)/Makefile-giscanner.am $(srcdir)/Makefile-examples.am $(srcdir)/Makefile-gir.am $(srcdir)/Makefile-tools.am $(srcdir)/Makefile-msvcproj.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck @@ -2829,7 +2845,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -3049,15 +3065,15 @@ $(am__post_remove_distdir) dist-tarZ: distdir - @echo WARNING: "Support for shar distribution archives is" \ - "deprecated." >&2 + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' is deprecated." >&2 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__post_remove_distdir) dist-shar: distdir - @echo WARNING: "Support for distribution archives compressed with" \ - "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "Support for shar distribution archives is" \ + "deprecated." >&2 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz $(am__post_remove_distdir) @@ -3093,17 +3109,17 @@ esac chmod -R a-w $(distdir) chmod u+w $(distdir) - mkdir $(distdir)/_build $(distdir)/_inst + mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst chmod a-w $(distdir) test -d $(distdir)/_build || exit 0; \ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ && am__cwd=`pwd` \ - && $(am__cd) $(distdir)/_build \ - && ../configure \ + && $(am__cd) $(distdir)/_build/sub \ + && ../../configure \ $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ - --srcdir=.. --prefix="$$dc_install_base" \ + --srcdir=../.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \ @@ -3335,6 +3351,8 @@ uninstall-pkgpyexecLTLIBRARIES uninstall-pkgpyexecPYTHON \ uninstall-typelibsDATA +.PRECIOUS: Makefile + # Make sure the required variables are set, these should under normal # circumstances come from introspection.m4 @@ -3459,16 +3477,16 @@ # girepository GIRepository-2.0.gir: GObject-2.0.gir libgirepository-1.0.la -g-ir-scanner: tools/g-ir-scanner.in _giscanner.la Makefile - $(AM_V_GEN) $(TOOL_SUBSTITUTIONS) $< > $@.tmp && mv $@.tmp $@ +g-ir-scanner: tools/g-ir-tool-template.in _giscanner.la Makefile + $(AM_V_GEN) sed $(TOOL_SUBSTITUTIONS) -e s,@TOOL_MODULE\@,scannermain, -e s,@TOOL_FUNCTION\@,scanner_main, $< > $@.tmp && mv $@.tmp $@ @chmod a+x $@ -g-ir-annotation-tool: tools/g-ir-annotation-tool.in _giscanner.la Makefile - $(AM_V_GEN) $(TOOL_SUBSTITUTIONS) $< > $@.tmp && mv $@.tmp $@ +g-ir-annotation-tool: tools/g-ir-tool-template.in _giscanner.la Makefile + $(AM_V_GEN) sed $(TOOL_SUBSTITUTIONS) -e s,@TOOL_MODULE\@,annotationmain, -e s,@TOOL_FUNCTION\@,annotation_main, $< > $@.tmp && mv $@.tmp $@ @chmod a+x $@ -g-ir-doc-tool: tools/g-ir-doc-tool.in _giscanner.la Makefile - $(AM_V_GEN) $(TOOL_SUBSTITUTIONS) $< > $@.tmp && mv $@.tmp $@ +g-ir-doc-tool: tools/g-ir-tool-template.in _giscanner.la Makefile + $(AM_V_GEN) sed $(TOOL_SUBSTITUTIONS) -e s,@TOOL_MODULE\@,docmain, -e s,@TOOL_FUNCTION\@,doc_main, $< > $@.tmp && mv $@.tmp $@ @chmod a+x $@ # -------------------------- @@ -3659,9 +3677,9 @@ check-local: @echo "TEST: PEP-8 INQUISITION" @find $(top_srcdir)/giscanner -name \*.py | sort | uniq | xargs \ - $(PYTHON) $(top_srcdir)/misc/pep8.py --max-line-length=99 --ignore=E128 $(PEP8_EXCLUDES) + $(PYTHON) $(top_srcdir)/misc/pep8.py --max-line-length=99 --ignore=E128,W503 $(PEP8_EXCLUDES) @find $(top_srcdir)/tests -name \*.py | sort | uniq | xargs \ - $(PYTHON) $(top_srcdir)/misc/pep8.py --ignore=E127,E501 $(PEP8_EXCLUDES) + $(PYTHON) $(top_srcdir)/misc/pep8.py --ignore=E127,E402,E501,E731 $(PEP8_EXCLUDES) check-pyflakes: @echo " CHECK Pyflakes" @@ -3671,7 +3689,7 @@ git tag -m "Tag $(TAG_VERSION)" -a $(TAG_PREFIX)$(TAG_VERSION) prepare-minor-release: $(DISTNAME) prepare-release-tag Makefile - env top_srcdir=$(top_srcdir) python $(top_srcdir)/tools/verbump.py + env top_srcdir=$(top_srcdir) python $(top_srcdir)/misc/verbump.py upload-release: $(DISTNAME) Makefile git log origin/master..master diff -Nru gobject-introspection-1.45.2/Makefile-tools.am gobject-introspection-1.45.3/Makefile-tools.am --- gobject-introspection-1.45.2/Makefile-tools.am 2014-08-04 14:37:07.000000000 +0000 +++ gobject-introspection-1.45.3/Makefile-tools.am 2015-07-03 11:46:47.000000000 +0000 @@ -6,22 +6,20 @@ endif EXTRA_DIST += \ - tools/g-ir-scanner.in \ - tools/g-ir-annotation-tool.in \ - tools/g-ir-doc-tool.in + tools/g-ir-tool-template.in -TOOL_SUBSTITUTIONS = sed -e s,@libdir\@,$(libdir), -e s,@datarootdir\@,$(datarootdir), -e s,@PYTHON\@,$(PYTHON), +TOOL_SUBSTITUTIONS = -e s,@libdir\@,$(libdir), -e s,@datarootdir\@,$(datarootdir), -e s,@PYTHON\@,$(PYTHON), -g-ir-scanner: tools/g-ir-scanner.in _giscanner.la Makefile - $(AM_V_GEN) $(TOOL_SUBSTITUTIONS) $< > $@.tmp && mv $@.tmp $@ +g-ir-scanner: tools/g-ir-tool-template.in _giscanner.la Makefile + $(AM_V_GEN) sed $(TOOL_SUBSTITUTIONS) -e s,@TOOL_MODULE\@,scannermain, -e s,@TOOL_FUNCTION\@,scanner_main, $< > $@.tmp && mv $@.tmp $@ @chmod a+x $@ -g-ir-annotation-tool: tools/g-ir-annotation-tool.in _giscanner.la Makefile - $(AM_V_GEN) $(TOOL_SUBSTITUTIONS) $< > $@.tmp && mv $@.tmp $@ +g-ir-annotation-tool: tools/g-ir-tool-template.in _giscanner.la Makefile + $(AM_V_GEN) sed $(TOOL_SUBSTITUTIONS) -e s,@TOOL_MODULE\@,annotationmain, -e s,@TOOL_FUNCTION\@,annotation_main, $< > $@.tmp && mv $@.tmp $@ @chmod a+x $@ -g-ir-doc-tool: tools/g-ir-doc-tool.in _giscanner.la Makefile - $(AM_V_GEN) $(TOOL_SUBSTITUTIONS) $< > $@.tmp && mv $@.tmp $@ +g-ir-doc-tool: tools/g-ir-tool-template.in _giscanner.la Makefile + $(AM_V_GEN) sed $(TOOL_SUBSTITUTIONS) -e s,@TOOL_MODULE\@,docmain, -e s,@TOOL_FUNCTION\@,doc_main, $< > $@.tmp && mv $@.tmp $@ @chmod a+x $@ g_ir_compiler_SOURCES = tools/compiler.c diff -Nru gobject-introspection-1.45.2/misc/pep8.py gobject-introspection-1.45.3/misc/pep8.py --- gobject-introspection-1.45.2/misc/pep8.py 2014-08-04 14:37:07.000000000 +0000 +++ gobject-introspection-1.45.3/misc/pep8.py 2015-07-03 11:46:48.000000000 +0000 @@ -1,7 +1,8 @@ #!/usr/bin/env python # pep8.py - Check Python source code formatting, according to PEP 8 # Copyright (C) 2006-2009 Johann C. Rocholl -# Copyright (C) 2009-2013 Florent Xicluna +# Copyright (C) 2009-2014 Florent Xicluna +# Copyright (C) 2014 Ian Lee # # Permission is hereby granted, free of charge, to any person # obtaining a copy of this software and associated documentation files @@ -24,8 +25,7 @@ # SOFTWARE. r""" -Check Python source code formatting, according to PEP 8: -http://www.python.org/dev/peps/pep-0008/ +Check Python source code formatting, according to PEP 8. For usage and a list of options, try this: $ python pep8.py -h @@ -45,7 +45,7 @@ 700 statements 900 syntax error """ -__version__ = '1.4.6' +from __future__ import with_statement import os import sys @@ -62,13 +62,21 @@ except ImportError: from ConfigParser import RawConfigParser -DEFAULT_EXCLUDE = '.svn,CVS,.bzr,.hg,.git,__pycache__' -DEFAULT_IGNORE = 'E123,E226,E24' -if sys.platform == 'win32': - DEFAULT_CONFIG = os.path.expanduser(r'~\.pep8') -else: - DEFAULT_CONFIG = os.path.join(os.getenv('XDG_CONFIG_HOME') or - os.path.expanduser('~/.config'), 'pep8') +__version__ = '1.6.2' + +DEFAULT_EXCLUDE = '.svn,CVS,.bzr,.hg,.git,__pycache__,.tox' +DEFAULT_IGNORE = 'E121,E123,E126,E226,E24,E704' +try: + if sys.platform == 'win32': + USER_CONFIG = os.path.expanduser(r'~\.pep8') + else: + USER_CONFIG = os.path.join( + os.getenv('XDG_CONFIG_HOME') or os.path.expanduser('~/.config'), + 'pep8' + ) +except ImportError: + USER_CONFIG = None + PROJECT_CONFIG = ('setup.cfg', 'tox.ini', '.pep8') TESTSUITE_PATH = os.path.join(os.path.dirname(__file__), 'testsuite') MAX_LINE_LENGTH = 79 @@ -87,18 +95,22 @@ '**=', '*=', '/=', '//=', '+=', '-=', '!=', '<>', '<', '>', '%=', '^=', '&=', '|=', '==', '<=', '>=', '<<=', '>>=', '=']) WHITESPACE = frozenset(' \t') -SKIP_TOKENS = frozenset([tokenize.COMMENT, tokenize.NL, tokenize.NEWLINE, - tokenize.INDENT, tokenize.DEDENT]) +NEWLINE = frozenset([tokenize.NL, tokenize.NEWLINE]) +SKIP_TOKENS = NEWLINE.union([tokenize.INDENT, tokenize.DEDENT]) +# ERRORTOKEN is triggered by backticks in Python 3 +SKIP_COMMENTS = SKIP_TOKENS.union([tokenize.COMMENT, tokenize.ERRORTOKEN]) BENCHMARK_KEYS = ['directories', 'files', 'logical lines', 'physical lines'] INDENT_REGEX = re.compile(r'([ \t]*)') RAISE_COMMA_REGEX = re.compile(r'raise\s+\w+\s*,') -RERAISE_COMMA_REGEX = re.compile(r'raise\s+\w+\s*,\s*\w+\s*,\s*\w+') +RERAISE_COMMA_REGEX = re.compile(r'raise\s+\w+\s*,.*,\s*\w+\s*$') ERRORCODE_REGEX = re.compile(r'\b[A-Z]\d{3}\b') DOCSTRING_REGEX = re.compile(r'u?r?["\']') EXTRANEOUS_WHITESPACE_REGEX = re.compile(r'[[({] | []}),;:]') WHITESPACE_AFTER_COMMA_REGEX = re.compile(r'[,;:]\s*(?: |\t)') -COMPARE_SINGLETON_REGEX = re.compile(r'([=!]=)\s*(None|False|True)') +COMPARE_SINGLETON_REGEX = re.compile(r'\b(None|False|True)?\s*([=!]=)' + r'\s*(?(1)|(None|False|True))\b') +COMPARE_NEGATIVE_REGEX = re.compile(r'\b(not)\s+[^][)(}{ ]+\s+(in|is)\s') COMPARE_TYPE_REGEX = re.compile(r'(?:[=!]=|is(?:\s+not)?)\s*type(?:s.\w+Type' r'|\s*\(\s*([^)]*[^ )])\s*\))') KEYWORD_REGEX = re.compile(r'(\s*)\b(?:%s)\b(\s*)' % r'|'.join(KEYWORDS)) @@ -117,8 +129,7 @@ def tabs_or_spaces(physical_line, indent_char): - r""" - Never mix tabs and spaces. + r"""Never mix tabs and spaces. The most popular way of indenting Python is with spaces only. The second-most popular way is with tabs only. Code indented with a mixture @@ -137,9 +148,7 @@ def tabs_obsolete(physical_line): - r""" - For new projects, spaces-only are strongly recommended over tabs. Most - editors have features that make this easy to do. + r"""For new projects, spaces-only are strongly recommended over tabs. Okay: if True:\n return W191: if True:\n\treturn @@ -150,16 +159,7 @@ def trailing_whitespace(physical_line): - r""" - JCR: Trailing whitespace is superfluous. - FBM: Except when it occurs as part of a blank line (i.e. the line is - nothing but whitespace). According to Python docs[1] a line with only - whitespace is considered a blank line, and is to be ignored. However, - matching a blank line to its indentation level avoids mistakenly - terminating a multi-line statement (e.g. class declaration) when - pasting code into the standard Python interpreter. - - [1] http://docs.python.org/reference/lexical_analysis.html#blank-lines + r"""Trailing whitespace is superfluous. The warning returned varies on whether the line itself is blank, for easier filtering for those who want to indent their blank lines. @@ -179,30 +179,24 @@ return 0, "W293 blank line contains whitespace" -def trailing_blank_lines(physical_line, lines, line_number): - r""" - JCR: Trailing blank lines are superfluous. +def trailing_blank_lines(physical_line, lines, line_number, total_lines): + r"""Trailing blank lines are superfluous. Okay: spam(1) W391: spam(1)\n - """ - if not physical_line.rstrip() and line_number == len(lines): - return 0, "W391 blank line at end of file" - -def missing_newline(physical_line): + However the last line should end with a new line (warning W292). """ - JCR: The last line should have a newline. - - Reports warning W292. - """ - if physical_line.rstrip() == physical_line: - return len(physical_line), "W292 no newline at end of file" + if line_number == total_lines: + stripped_last_line = physical_line.rstrip() + if not stripped_last_line: + return 0, "W391 blank line at end of file" + if stripped_last_line == physical_line: + return len(physical_line), "W292 no newline at end of file" -def maximum_line_length(physical_line, max_line_length): - """ - Limit all lines to a maximum of 79 characters. +def maximum_line_length(physical_line, max_line_length, multiline): + r"""Limit all lines to a maximum of 79 characters. There are still many devices around that are limited to 80 character lines; plus, limiting windows to 80 characters makes it possible to have @@ -216,6 +210,13 @@ line = physical_line.rstrip() length = len(line) if length > max_line_length and not noqa(line): + # Special case for long URLs in multi-line docstrings or comments, + # but still report the error when the 72 first chars are whitespaces. + chunks = line.split() + if ((len(chunks) == 1 and multiline) or + (len(chunks) == 2 and chunks[0] == '#')) and \ + len(line) - len(chunks[-1]) < max_line_length - 7: + return if hasattr(line, 'decode'): # Python 2 # The line could contain multi-byte characters try: @@ -233,9 +234,8 @@ def blank_lines(logical_line, blank_lines, indent_level, line_number, - previous_logical, previous_indent_level): - r""" - Separate top-level function and class definitions with two blank lines. + blank_before, previous_logical, previous_indent_level): + r"""Separate top-level function and class definitions with two blank lines. Method definitions inside a class are separated by a single blank line. @@ -263,19 +263,18 @@ yield 0, "E303 too many blank lines (%d)" % blank_lines elif logical_line.startswith(('def ', 'class ', '@')): if indent_level: - if not (blank_lines or previous_indent_level < indent_level or + if not (blank_before or previous_indent_level < indent_level or DOCSTRING_REGEX.match(previous_logical)): yield 0, "E301 expected 1 blank line, found 0" - elif blank_lines != 2: - yield 0, "E302 expected 2 blank lines, found %d" % blank_lines + elif blank_before != 2: + yield 0, "E302 expected 2 blank lines, found %d" % blank_before def extraneous_whitespace(logical_line): - """ - Avoid extraneous whitespace in the following situations: + r"""Avoid extraneous whitespace. + Avoid extraneous whitespace in these situations: - Immediately inside parentheses, brackets or braces. - - Immediately before a comma, semicolon, or colon. Okay: spam(ham[1], {eggs: 2}) @@ -304,8 +303,7 @@ def whitespace_around_keywords(logical_line): - r""" - Avoid extraneous whitespace around keywords. + r"""Avoid extraneous whitespace around keywords. Okay: True and False E271: True and False @@ -328,8 +326,7 @@ def missing_whitespace(logical_line): - """ - JCR: Each comma, semicolon or colon should be followed by whitespace. + r"""Each comma, semicolon or colon should be followed by whitespace. Okay: [a, b] Okay: (3,) @@ -356,8 +353,7 @@ def indentation(logical_line, previous_logical, indent_char, indent_level, previous_indent_level): - r""" - Use 4 spaces per indentation level. + r"""Use 4 spaces per indentation level. For really old code that you don't want to mess up, you can continue to use 8-space tabs. @@ -365,33 +361,37 @@ Okay: a = 1 Okay: if a == 0:\n a = 1 E111: a = 1 + E114: # a = 1 Okay: for item in items:\n pass E112: for item in items:\npass + E115: for item in items:\n# Hi\n pass Okay: a = 1\nb = 2 E113: a = 1\n b = 2 + E116: a = 1\n # b = 2 """ - if indent_char == ' ' and indent_level % 4: - yield 0, "E111 indentation is not a multiple of four" + c = 0 if logical_line else 3 + tmpl = "E11%d %s" if logical_line else "E11%d %s (comment)" + if indent_level % 4: + yield 0, tmpl % (1 + c, "indentation is not a multiple of four") indent_expect = previous_logical.endswith(':') if indent_expect and indent_level <= previous_indent_level: - yield 0, "E112 expected an indented block" - if indent_level > previous_indent_level and not indent_expect: - yield 0, "E113 unexpected indentation" + yield 0, tmpl % (2 + c, "expected an indented block") + elif not indent_expect and indent_level > previous_indent_level: + yield 0, tmpl % (3 + c, "unexpected indentation") def continued_indentation(logical_line, tokens, indent_level, hang_closing, - noqa, verbose): - r""" - Continuation lines should align wrapped elements either vertically using - Python's implicit line joining inside parentheses, brackets and braces, or - using a hanging indent. + indent_char, noqa, verbose): + r"""Continuation lines indentation. - When using a hanging indent the following considerations should be applied: + Continuation lines should align wrapped elements either vertically + using Python's implicit line joining inside parentheses, brackets + and braces, or using a hanging indent. + When using a hanging indent these considerations should be applied: - there should be no arguments on the first line, and - - further indentation should be used to clearly distinguish itself as a continuation line. @@ -403,10 +403,12 @@ E122: a = (\n42) E123: a = (\n 42\n ) E124: a = (24,\n 42\n) - E125: if (a or\n b):\n pass + E125: if (\n b):\n pass E126: a = (\n 42) E127: a = (24,\n 42) E128: a = (24,\n 42) + E129: if (a or\n b):\n pass + E131: a = (\n 42\n 24) """ first_row = tokens[0][2][0] nrows = 1 + tokens[-1][2][0] - first_row @@ -420,13 +422,21 @@ indent_next = logical_line.endswith(':') row = depth = 0 + valid_hangs = (4,) if indent_char != '\t' else (4, 8) # remember how many brackets were opened on each line parens = [0] * nrows # relative indents of physical lines rel_indent = [0] * nrows + # for each depth, collect a list of opening rows + open_rows = [[0]] + # for each depth, memorize the hanging indentation + hangs = [None] # visual indents indent_chances = {} last_indent = tokens[0][2] + visual_indent = None + last_token_multiline = False + # for each depth, memorize the visual indent column indent = [last_indent[1]] if verbose >= 3: print(">>> " + tokens[0][4].rstrip()) @@ -436,8 +446,7 @@ newline = row < start[0] - first_row if newline: row = start[0] - first_row - newline = (not last_token_multiline and - token_type not in (tokenize.NL, tokenize.NEWLINE)) + newline = not last_token_multiline and token_type not in NEWLINE if newline: # this is the beginning of a continuation line. @@ -448,17 +457,18 @@ # record the initial indent. rel_indent[row] = expand_indent(line) - indent_level - if depth: - # a bracket expression in a continuation line. - # find the line that it was opened on - for open_row in range(row - 1, -1, -1): - if parens[open_row]: - break - else: - # an unbracketed continuation line (ie, backslash) - open_row = 0 - hang = rel_indent[row] - rel_indent[open_row] + # identify closing bracket close_bracket = (token_type == tokenize.OP and text in ']})') + + # is the indent relative to an opening bracket line? + for open_row in reversed(open_rows[depth]): + hang = rel_indent[row] - rel_indent[open_row] + hanging_indent = hang in valid_hangs + if hanging_indent: + break + if hangs[depth]: + hanging_indent = (hang == hangs[depth]) + # is there any chance of visual indent? visual_indent = (not close_bracket and hang > 0 and indent_chances.get(start[1])) @@ -471,37 +481,43 @@ # closing bracket matches indentation of opening bracket's line if hang_closing: yield start, "E133 closing bracket is missing indentation" - elif visual_indent is True: - # visual indent is verified - if not indent[depth]: - indent[depth] = start[1] - elif visual_indent in (text, str): - # ignore token lined up with matching one from a previous line - pass elif indent[depth] and start[1] < indent[depth]: - # visual indent is broken - yield (start, "E128 continuation line " - "under-indented for visual indent") - elif hang == 4 or (indent_next and rel_indent[row] == 8): + if visual_indent is not True: + # visual indent is broken + yield (start, "E128 continuation line " + "under-indented for visual indent") + elif hanging_indent or (indent_next and rel_indent[row] == 8): # hanging indent is verified if close_bracket and not hang_closing: yield (start, "E123 closing bracket does not match " "indentation of opening bracket's line") + hangs[depth] = hang + elif visual_indent is True: + # visual indent is verified + indent[depth] = start[1] + elif visual_indent in (text, str): + # ignore token lined up with matching one from a previous line + pass else: # indent is broken if hang <= 0: error = "E122", "missing indentation or outdented" elif indent[depth]: error = "E127", "over-indented for visual indent" - elif hang % 4: - error = "E121", "indentation is not a multiple of four" + elif not close_bracket and hangs[depth]: + error = "E131", "unaligned for hanging indent" else: - error = "E126", "over-indented for hanging indent" + hangs[depth] = hang + if hang > 4: + error = "E126", "over-indented for hanging indent" + else: + error = "E121", "under-indented for hanging indent" yield start, "%s continuation line %s" % error # look for visual indenting - if (parens[row] and token_type not in (tokenize.NL, tokenize.COMMENT) - and not indent[depth]): + if (parens[row] and + token_type not in (tokenize.NL, tokenize.COMMENT) and + not indent[depth]): indent[depth] = start[1] indent_chances[start[1]] = True if verbose >= 4: @@ -513,12 +529,18 @@ # special case for the "if" statement because len("if (") == 4 elif not indent_chances and not row and not depth and text == 'if': indent_chances[end[1] + 1] = True + elif text == ':' and line[end[1]:].isspace(): + open_rows[depth].append(row) # keep track of bracket depth if token_type == tokenize.OP: if text in '([{': depth += 1 indent.append(0) + hangs.append(None) + if len(open_rows) == depth: + open_rows.append([]) + open_rows[depth].append(row) parens[row] += 1 if verbose >= 4: print("bracket depth %s seen, col %s, visual min = %s" % @@ -526,19 +548,20 @@ elif text in ')]}' and depth > 0: # parent indents should not be more than this one prev_indent = indent.pop() or last_indent[1] + hangs.pop() for d in range(depth): if indent[d] > prev_indent: indent[d] = 0 for ind in list(indent_chances): if ind >= prev_indent: del indent_chances[ind] + del open_rows[depth + 1:] depth -= 1 if depth: indent_chances[indent[depth]] = True for idx in range(row, -1, -1): if parens[idx]: parens[idx] -= 1 - rel_indent[row] = rel_indent[idx] break assert len(indent) == depth + 1 if start[1] not in indent_chances: @@ -546,21 +569,25 @@ indent_chances[start[1]] = text last_token_multiline = (start[0] != end[0]) + if last_token_multiline: + rel_indent[end[0] - first_row] = rel_indent[row] if indent_next and expand_indent(line) == indent_level + 4: - yield (last_indent, "E125 continuation line does not distinguish " - "itself from next logical line") + pos = (start[0], indent[0] + 4) + if visual_indent: + code = "E129 visually indented line" + else: + code = "E125 continuation line" + yield pos, "%s with same indent as next logical line" % code def whitespace_before_parameters(logical_line, tokens): - """ - Avoid extraneous whitespace in the following situations: - - - Immediately before the open parenthesis that starts the argument - list of a function call. + r"""Avoid extraneous whitespace. - - Immediately before the open parenthesis that starts an indexing or - slicing. + Avoid extraneous whitespace in the following situations: + - before the open parenthesis that starts the argument list of a + function call. + - before the open parenthesis that starts an indexing or slicing. Okay: spam(1) E211: spam (1) @@ -587,11 +614,7 @@ def whitespace_around_operator(logical_line): - r""" - Avoid extraneous whitespace in the following situations: - - - More than one space around an assignment (or other) operator to - align it with another. + r"""Avoid extraneous whitespace around an operator. Okay: a = 12 + 3 E221: a = 4 + 5 @@ -614,13 +637,15 @@ def missing_whitespace_around_operator(logical_line, tokens): - r""" + r"""Surround operators with a single space on either side. + - Always surround these binary operators with a single space on either side: assignment (=), augmented assignment (+=, -= etc.), - comparisons (==, <, >, !=, <>, <=, >=, in, not in, is, is not), + comparisons (==, <, >, !=, <=, >=, in, not in, is, is not), Booleans (and, or, not). - - Use spaces around arithmetic operators. + - If operators with different priorities are used, consider adding + whitespace around the operators with the lowest priorities. Okay: i = i + 1 Okay: submitted += 1 @@ -644,8 +669,7 @@ prev_type = tokenize.OP prev_text = prev_end = None for token_type, text, start, end, line in tokens: - if token_type in (tokenize.NL, tokenize.NEWLINE, tokenize.ERRORTOKEN): - # ERRORTOKEN is triggered by backticks in Python 3 + if token_type in SKIP_COMMENTS: continue if text in ('(', 'lambda'): parens += 1 @@ -666,7 +690,7 @@ if need_space is True or need_space[1]: # A needed trailing space was not found yield prev_end, "E225 missing whitespace around operator" - else: + elif prev_text != '**': code, optype = 'E226', 'arithmetic' if prev_text == '%': code, optype = 'E228', 'modulo' @@ -685,14 +709,8 @@ # Check if the operator is being used as a binary operator # Allow unary operators: -123, -x, +1. # Allow argument unpacking: foo(*args, **kwargs). - if prev_type == tokenize.OP: - binary_usage = (prev_text in '}])') - elif prev_type == tokenize.NAME: - binary_usage = (prev_text not in KEYWORDS) - else: - binary_usage = (prev_type not in SKIP_TOKENS) - - if binary_usage: + if (prev_text in '}])' if prev_type == tokenize.OP + else prev_text not in KEYWORDS): need_space = None elif text in WS_OPTIONAL_OPERATORS: need_space = None @@ -711,11 +729,7 @@ def whitespace_around_comma(logical_line): - r""" - Avoid extraneous whitespace in the following situations: - - - More than one space around an assignment (or other) operator to - align it with another. + r"""Avoid extraneous whitespace after a comma or a colon. Note: these checks are disabled by default @@ -733,7 +747,8 @@ def whitespace_around_named_parameter_equals(logical_line, tokens): - """ + r"""Don't use spaces around the '=' sign in function arguments. + Don't use spaces around the '=' sign when used to indicate a keyword argument or a default parameter value. @@ -743,6 +758,7 @@ Okay: boolean(a != b) Okay: boolean(a <= b) Okay: boolean(a >= b) + Okay: def foo(arg: int = 42): E251: def complex(real, imag = 0.0): E251: return magic(r = real, i = imag) @@ -750,56 +766,78 @@ parens = 0 no_space = False prev_end = None + annotated_func_arg = False + in_def = logical_line.startswith('def') message = "E251 unexpected spaces around keyword / parameter equals" for token_type, text, start, end, line in tokens: + if token_type == tokenize.NL: + continue if no_space: no_space = False if start != prev_end: yield (prev_end, message) - elif token_type == tokenize.OP: + if token_type == tokenize.OP: if text == '(': parens += 1 elif text == ')': parens -= 1 - elif parens and text == '=': + elif in_def and text == ':' and parens == 1: + annotated_func_arg = True + elif parens and text == ',' and parens == 1: + annotated_func_arg = False + elif parens and text == '=' and not annotated_func_arg: no_space = True if start != prev_end: yield (prev_end, message) + if not parens: + annotated_func_arg = False + prev_end = end -def whitespace_before_inline_comment(logical_line, tokens): - """ - Separate inline comments by at least two spaces. +def whitespace_before_comment(logical_line, tokens): + r"""Separate inline comments by at least two spaces. An inline comment is a comment on the same line as a statement. Inline comments should be separated by at least two spaces from the statement. They should start with a # and a single space. + Each line of a block comment starts with a # and a single space + (unless it is indented text inside the comment). + Okay: x = x + 1 # Increment x Okay: x = x + 1 # Increment x + Okay: # Block comment E261: x = x + 1 # Increment x E262: x = x + 1 #Increment x E262: x = x + 1 # Increment x + E265: #Block comment + E266: ### Block comment """ prev_end = (0, 0) for token_type, text, start, end, line in tokens: if token_type == tokenize.COMMENT: - if not line[:start[1]].strip(): - continue - if prev_end[0] == start[0] and start[1] < prev_end[1] + 2: - yield (prev_end, - "E261 at least two spaces before inline comment") + inline_comment = line[:start[1]].strip() + if inline_comment: + if prev_end[0] == start[0] and start[1] < prev_end[1] + 2: + yield (prev_end, + "E261 at least two spaces before inline comment") symbol, sp, comment = text.partition(' ') - if symbol not in ('#', '#:') or comment[:1].isspace(): - yield start, "E262 inline comment should start with '# '" + bad_prefix = symbol not in '#:' and (symbol.lstrip('#')[:1] or '#') + if inline_comment: + if bad_prefix or comment[:1] in WHITESPACE: + yield start, "E262 inline comment should start with '# '" + elif bad_prefix and (bad_prefix != '!' or start[0] > 1): + if bad_prefix != '#': + yield start, "E265 block comment should start with '# '" + elif comment: + yield start, "E266 too many leading '#' for block comment" elif token_type != tokenize.NL: prev_end = end def imports_on_separate_lines(logical_line): - r""" - Imports should usually be on separate lines. + r"""Imports should usually be on separate lines. Okay: import os\nimport sys E401: import sys, os @@ -817,14 +855,65 @@ yield found, "E401 multiple imports on one line" +def module_imports_on_top_of_file( + logical_line, indent_level, checker_state, noqa): + r"""Imports are always put at the top of the file, just after any module + comments and docstrings, and before module globals and constants. + + Okay: import os + Okay: # this is a comment\nimport os + Okay: '''this is a module docstring'''\nimport os + Okay: r'''this is a module docstring'''\nimport os + Okay: try:\n import x\nexcept:\n pass\nelse:\n pass\nimport y + Okay: try:\n import x\nexcept:\n pass\nfinally:\n pass\nimport y + E402: a=1\nimport os + E402: 'One string'\n"Two string"\nimport os + E402: a=1\nfrom sys import x + + Okay: if x:\n import os + """ + def is_string_literal(line): + if line[0] in 'uUbB': + line = line[1:] + if line and line[0] in 'rR': + line = line[1:] + return line and (line[0] == '"' or line[0] == "'") + + allowed_try_keywords = ('try', 'except', 'else', 'finally') + + if indent_level: # Allow imports in conditional statements or functions + return + if not logical_line: # Allow empty lines or comments + return + if noqa: + return + line = logical_line + if line.startswith('import ') or line.startswith('from '): + if checker_state.get('seen_non_imports', False): + yield 0, "E402 module level import not at top of file" + elif any(line.startswith(kw) for kw in allowed_try_keywords): + # Allow try, except, else, finally keywords intermixed with imports in + # order to support conditional importing + return + elif is_string_literal(line): + # The first literal is a docstring, allow it. Otherwise, report error. + if checker_state.get('seen_docstring', False): + checker_state['seen_non_imports'] = True + else: + checker_state['seen_docstring'] = True + else: + checker_state['seen_non_imports'] = True + + def compound_statements(logical_line): - r""" - Compound statements (multiple statements on the same line) are - generally discouraged. + r"""Compound statements (on the same line) are generally discouraged. While sometimes it's okay to put an if/for/while with a small body - on the same line, never do this for multi-clause statements. Also - avoid folding such long lines! + on the same line, never do this for multi-clause statements. + Also avoid folding such long lines! + + Always use a def statement instead of an assignment statement that + binds a lambda expression directly to a name. Okay: if foo == 'blah':\n do_blah_thing() Okay: do_one() @@ -839,20 +928,30 @@ E701: try: something() E701: finally: cleanup() E701: if foo == 'blah': one(); two(); three() - E702: do_one(); do_two(); do_three() E703: do_four(); # useless semicolon + E704: def f(x): return 2*x + E731: f = lambda x: 2*x """ line = logical_line last_char = len(line) - 1 found = line.find(':') while -1 < found < last_char: before = line[:found] - if (before.count('{') <= before.count('}') and # {'a': 1} (dict) - before.count('[') <= before.count(']') and # [1:2] (slice) - before.count('(') <= before.count(')') and # (Python 3 annotation) - not LAMBDA_REGEX.search(before)): # lambda x: x - yield found, "E701 multiple statements on one line (colon)" + if ((before.count('{') <= before.count('}') and # {'a': 1} (dict) + before.count('[') <= before.count(']') and # [1:2] (slice) + before.count('(') <= before.count(')'))): # (annotation) + lambda_kw = LAMBDA_REGEX.search(before) + if lambda_kw: + before = line[:lambda_kw.start()].rstrip() + if before[-1:] == '=' and isidentifier(before[:-1].strip()): + yield 0, ("E731 do not assign a lambda expression, use a " + "def") + break + if before.startswith('def '): + yield 0, "E704 multiple statements on one line (def)" + else: + yield found, "E701 multiple statements on one line (colon)" found = line.find(':', found + 1) found = line.find(';') while -1 < found: @@ -864,8 +963,7 @@ def explicit_line_join(logical_line, tokens): - r""" - Avoid explicit line join between brackets. + r"""Avoid explicit line join between brackets. The preferred way of wrapping long lines is by using Python's implied line continuation inside parentheses, brackets and braces. Long lines can be @@ -878,10 +976,15 @@ Okay: aaa = [123,\n 123] Okay: aaa = ("bbb "\n "ccc") Okay: aaa = "bbb " \\n "ccc" + Okay: aaa = 123 # \\ """ prev_start = prev_end = parens = 0 + comment = False + backslash = None for token_type, text, start, end, line in tokens: - if start[0] != prev_start and parens and backslash: + if token_type == tokenize.COMMENT: + comment = True + if start[0] != prev_start and parens and backslash and not comment: yield backslash, "E502 the backslash is redundant between brackets" if end[0] != prev_end: if line.rstrip('\r\n').endswith('\\'): @@ -898,14 +1001,56 @@ parens -= 1 +def break_around_binary_operator(logical_line, tokens): + r""" + Avoid breaks before binary operators. + + The preferred place to break around a binary operator is after the + operator, not before it. + + W503: (width == 0\n + height == 0) + W503: (width == 0\n and height == 0) + + Okay: (width == 0 +\n height == 0) + Okay: foo(\n -x) + Okay: foo(x\n []) + Okay: x = '''\n''' + '' + Okay: foo(x,\n -y) + Okay: foo(x, # comment\n -y) + """ + def is_binary_operator(token_type, text): + # The % character is strictly speaking a binary operator, but the + # common usage seems to be to put it next to the format parameters, + # after a line break. + return ((token_type == tokenize.OP or text in ['and', 'or']) and + text not in "()[]{},:.;@=%") + + line_break = False + unary_context = True + for token_type, text, start, end, line in tokens: + if token_type == tokenize.COMMENT: + continue + if ('\n' in text or '\r' in text) and token_type != tokenize.STRING: + line_break = True + else: + if (is_binary_operator(token_type, text) and line_break and + not unary_context): + yield start, "W503 line break before binary operator" + unary_context = text in '([{,;' + line_break = False + + def comparison_to_singleton(logical_line, noqa): - """ + r"""Comparison to singletons should use "is" or "is not". + Comparisons to singletons like None should always be done with "is" or "is not", never the equality operators. Okay: if arg is not None: E711: if arg != None: + E711: if None == arg: E712: if arg == True: + E712: if False == arg: Also, beware of writing if x when you really mean if x is not None -- e.g. when testing whether a variable or argument that defaults to None was @@ -914,8 +1059,9 @@ """ match = not noqa and COMPARE_SINGLETON_REGEX.search(logical_line) if match: - same = (match.group(1) == '==') - singleton = match.group(2) + singleton = match.group(1) or match.group(3) + same = (match.group(2) == '==') + msg = "'if cond is %s:'" % (('' if same else 'not ') + singleton) if singleton in ('None',): code = 'E711' @@ -924,14 +1070,35 @@ nonzero = ((singleton == 'True' and same) or (singleton == 'False' and not same)) msg += " or 'if %scond:'" % ('' if nonzero else 'not ') - yield match.start(1), ("%s comparison to %s should be %s" % + yield match.start(2), ("%s comparison to %s should be %s" % (code, singleton, msg)) -def comparison_type(logical_line): +def comparison_negative(logical_line): + r"""Negative comparison should be done using "not in" and "is not". + + Okay: if x not in y:\n pass + Okay: assert (X in Y or X is Z) + Okay: if not (X in Y):\n pass + Okay: zz = x is not y + E713: Z = not X in Y + E713: if not X.B in Y:\n pass + E714: if not X is Y:\n pass + E714: Z = not X.B is Y """ - Object type comparisons should always use isinstance() instead of - comparing types directly. + match = COMPARE_NEGATIVE_REGEX.search(logical_line) + if match: + pos = match.start(1) + if match.group(2) == 'in': + yield pos, "E713 test for membership should be 'not in'" + else: + yield pos, "E714 test for object identity should be 'is not'" + + +def comparison_type(logical_line, noqa): + r"""Object type comparisons should always use isinstance(). + + Do not compare types directly. Okay: if isinstance(obj, int): E721: if type(obj) is type(1): @@ -944,35 +1111,28 @@ Okay: if type(a1) is type(b1): """ match = COMPARE_TYPE_REGEX.search(logical_line) - if match: + if match and not noqa: inst = match.group(1) if inst and isidentifier(inst) and inst not in SINGLETONS: return # Allow comparison for types which are not obvious yield match.start(), "E721 do not compare types, use 'isinstance()'" -def python_3000_has_key(logical_line): - r""" - The {}.has_key() method is removed in the Python 3. - Use the 'in' operation instead. +def python_3000_has_key(logical_line, noqa): + r"""The {}.has_key() method is removed in Python 3: use the 'in' operator. Okay: if "alph" in d:\n print d["alph"] W601: assert d.has_key('alph') """ pos = logical_line.find('.has_key(') - if pos > -1: + if pos > -1 and not noqa: yield pos, "W601 .has_key() is deprecated, use 'in'" def python_3000_raise_comma(logical_line): - """ - When raising an exception, use "raise ValueError('message')" - instead of the older form "raise ValueError, 'message'". + r"""When raising an exception, use "raise ValueError('message')". - The paren-using form is preferred because when the exception arguments - are long or include string formatting, you don't need to use line - continuation characters thanks to the containing parentheses. The older - form is removed in Python 3. + The older form is removed in Python 3. Okay: raise DummyError("Message") W602: raise DummyError, "Message" @@ -983,9 +1143,8 @@ def python_3000_not_equal(logical_line): - """ - != can also be written <>, but this is an obsolete usage kept for - backwards compatibility only. New code should always use !=. + r"""New code should always use != instead of <>. + The older syntax is removed in Python 3. Okay: if a != 'no': @@ -997,9 +1156,7 @@ def python_3000_backticks(logical_line): - """ - Backticks are removed in Python 3. - Use repr() instead. + r"""Backticks are removed in Python 3: use repr() instead. Okay: val = repr(1 + 2) W604: val = `1 + 2` @@ -1017,47 +1174,40 @@ if '' == ''.encode(): # Python 2: implicit encoding. def readlines(filename): - f = open(filename) - try: + """Read the source code.""" + with open(filename, 'rU') as f: return f.readlines() - finally: - f.close() - isidentifier = re.compile(r'[a-zA-Z_]\w*').match + isidentifier = re.compile(r'[a-zA-Z_]\w*$').match stdin_get_value = sys.stdin.read else: # Python 3 def readlines(filename): - f = open(filename, 'rb') + """Read the source code.""" try: - coding, lines = tokenize.detect_encoding(f.readline) - f = TextIOWrapper(f, coding, line_buffering=True) - return [l.decode(coding) for l in lines] + f.readlines() + with open(filename, 'rb') as f: + (coding, lines) = tokenize.detect_encoding(f.readline) + f = TextIOWrapper(f, coding, line_buffering=True) + return [l.decode(coding) for l in lines] + f.readlines() except (LookupError, SyntaxError, UnicodeError): - f.close() - # Fall back if files are improperly declared - f = open(filename, encoding='latin-1') - return f.readlines() - finally: - f.close() + # Fall back if file encoding is improperly declared + with open(filename, encoding='latin-1') as f: + return f.readlines() isidentifier = str.isidentifier def stdin_get_value(): return TextIOWrapper(sys.stdin.buffer, errors='ignore').read() -readlines.__doc__ = " Read the source code." noqa = re.compile(r'# no(?:qa|pep8)\b', re.I).search def expand_indent(line): - r""" - Return the amount of indentation. + r"""Return the amount of indentation. + Tabs are expanded to the next multiple of 8. >>> expand_indent(' ') 4 >>> expand_indent('\t') 8 - >>> expand_indent(' \t') - 8 >>> expand_indent(' \t') 8 >>> expand_indent(' \t') @@ -1077,8 +1227,7 @@ def mute_string(text): - """ - Replace contents with 'xxx' to prevent syntax matching. + """Replace contents with 'xxx' to prevent syntax matching. >>> mute_string('"abc"') '"xxx"' @@ -1110,7 +1259,7 @@ continue if line[:3] == '@@ ': hunk_match = HUNK_REGEX.match(line) - row, nrows = [int(g or '1') for g in hunk_match.groups()] + (row, nrows) = [int(g or '1') for g in hunk_match.groups()] rv[path].update(range(row, row + nrows)) elif line[:3] == '+++': path = line[4:].split('\t', 1)[0] @@ -1122,9 +1271,27 @@ if rows and filename_match(path, patterns)]) -def filename_match(filename, patterns, default=True): +def normalize_paths(value, parent=os.curdir): + """Parse a comma-separated list of paths. + + Return a list of absolute paths. """ - Check if patterns contains a pattern that matches filename. + if not value: + return [] + if isinstance(value, list): + return value + paths = [] + for path in value.split(','): + path = path.strip() + if '/' in path: + path = os.path.abspath(os.path.join(parent, path)) + paths.append(path.rstrip('/')) + return paths + + +def filename_match(filename, patterns, default=True): + """Check if patterns contains a pattern that matches filename. + If patterns is unspecified, this always returns True. """ if not patterns: @@ -1132,6 +1299,13 @@ return any(fnmatch(filename, pattern) for pattern in patterns) +def _is_eol_token(token): + return token[0] in NEWLINE or token[4][token[3][1]:].lstrip() == '\\\n' +if COMMENT_WITH_NL: + def _is_eol_token(token, _eol_token=_is_eol_token): + return _eol_token(token) or (token[0] == tokenize.COMMENT and + token[1] == token[4]) + ############################################################################## # Framework to run all checks ############################################################################## @@ -1141,9 +1315,7 @@ def register_check(check, codes=None): - """ - Register a new check object. - """ + """Register a new check object.""" def _add_check(check, kind, codes, args): if check in _checks[kind]: _checks[kind][check][0].extend(codes or []) @@ -1161,9 +1333,9 @@ def init_checks_registry(): - """ - Register all globally visible functions where the first argument name - is 'physical_line' or 'logical_line'. + """Register all globally visible functions. + + The first argument name is either 'physical_line' or 'logical_line'. """ mod = inspect.getmodule(register_check) for (name, function) in inspect.getmembers(mod, inspect.isfunction): @@ -1172,9 +1344,7 @@ class Checker(object): - """ - Load a Python source file, tokenize it, check coding style. - """ + """Load a Python source file, tokenize it, check coding style.""" def __init__(self, filename=None, lines=None, options=None, report=None, **kwargs): @@ -1187,9 +1357,12 @@ self._logical_checks = options.logical_checks self._ast_checks = options.ast_checks self.max_line_length = options.max_line_length + self.multiline = False # in a multiline string? self.hang_closing = options.hang_closing self.verbose = options.verbose self.filename = filename + # Dictionary where a checker can store its custom state. + self._checker_states = {} if filename is None: self.filename = 'stdin' self.lines = lines or [] @@ -1200,7 +1373,7 @@ try: self.lines = readlines(filename) except IOError: - exc_type, exc = sys.exc_info()[:2] + (exc_type, exc) = sys.exc_info()[:2] self._io_error = '%s: %s' % (exc_type.__name__, exc) self.lines = [] else: @@ -1216,7 +1389,8 @@ self.report_error = self.report.error def report_invalid_syntax(self): - exc_type, exc = sys.exc_info()[:2] + """Check if the syntax is valid.""" + (exc_type, exc) = sys.exc_info()[:2] if len(exc.args) > 1: offset = exc.args[1] if len(offset) > 2: @@ -1226,150 +1400,174 @@ self.report_error(offset[0], offset[1] or 0, 'E901 %s: %s' % (exc_type.__name__, exc.args[0]), self.report_invalid_syntax) - report_invalid_syntax.__doc__ = " Check if the syntax is valid." def readline(self): - """ - Get the next line from the input buffer. - """ - self.line_number += 1 - if self.line_number > len(self.lines): + """Get the next line from the input buffer.""" + if self.line_number >= self.total_lines: return '' - return self.lines[self.line_number - 1] - - def readline_check_physical(self): - """ - Check and return the next physical line. This method can be - used to feed tokenize.generate_tokens. - """ - line = self.readline() - if line: - self.check_physical(line) + line = self.lines[self.line_number] + self.line_number += 1 + if self.indent_char is None and line[:1] in WHITESPACE: + self.indent_char = line[0] return line def run_check(self, check, argument_names): - """ - Run a check plugin. - """ + """Run a check plugin.""" arguments = [] for name in argument_names: arguments.append(getattr(self, name)) return check(*arguments) + def init_checker_state(self, name, argument_names): + """ Prepares a custom state for the specific checker plugin.""" + if 'checker_state' in argument_names: + self.checker_state = self._checker_states.setdefault(name, {}) + def check_physical(self, line): - """ - Run all physical checks on a raw input line. - """ + """Run all physical checks on a raw input line.""" self.physical_line = line - if self.indent_char is None and line[:1] in WHITESPACE: - self.indent_char = line[0] for name, check, argument_names in self._physical_checks: + self.init_checker_state(name, argument_names) result = self.run_check(check, argument_names) if result is not None: - offset, text = result + (offset, text) = result self.report_error(self.line_number, offset, text, check) + if text[:4] == 'E101': + self.indent_char = line[0] def build_tokens_line(self): - """ - Build a logical line from tokens. - """ - self.mapping = [] + """Build a logical line from tokens.""" logical = [] comments = [] length = 0 - previous = None - for token in self.tokens: - token_type, text = token[0:2] + prev_row = prev_col = mapping = None + for token_type, text, start, end, line in self.tokens: + if token_type in SKIP_TOKENS: + continue + if not mapping: + mapping = [(0, start)] if token_type == tokenize.COMMENT: comments.append(text) continue - if token_type in SKIP_TOKENS: - continue if token_type == tokenize.STRING: text = mute_string(text) - if previous: - end_row, end = previous[3] - start_row, start = token[2] - if end_row != start_row: # different row - prev_text = self.lines[end_row - 1][end - 1] - if prev_text == ',' or (prev_text not in '{[(' - and text not in '}])'): - logical.append(' ') - length += 1 - elif end != start: # different column - fill = self.lines[end_row - 1][end:start] - logical.append(fill) - length += len(fill) - self.mapping.append((length, token)) + if prev_row: + (start_row, start_col) = start + if prev_row != start_row: # different row + prev_text = self.lines[prev_row - 1][prev_col - 1] + if prev_text == ',' or (prev_text not in '{[(' and + text not in '}])'): + text = ' ' + text + elif prev_col != start_col: # different column + text = line[prev_col:start_col] + text logical.append(text) length += len(text) - previous = token + mapping.append((length, end)) + (prev_row, prev_col) = end self.logical_line = ''.join(logical) self.noqa = comments and noqa(''.join(comments)) - # With Python 2, if the line ends with '\r\r\n' the assertion fails - # assert self.logical_line.strip() == self.logical_line + return mapping def check_logical(self): - """ - Build a line from tokens and run all logical checks on it. - """ - self.build_tokens_line() + """Build a line from tokens and run all logical checks on it.""" self.report.increment_logical_line() - first_line = self.lines[self.mapping[0][1][2][0] - 1] - indent = first_line[:self.mapping[0][1][2][1]] - self.previous_indent_level = self.indent_level - self.indent_level = expand_indent(indent) + mapping = self.build_tokens_line() + + if not mapping: + return + + (start_row, start_col) = mapping[0][1] + start_line = self.lines[start_row - 1] + self.indent_level = expand_indent(start_line[:start_col]) + if self.blank_before < self.blank_lines: + self.blank_before = self.blank_lines if self.verbose >= 2: print(self.logical_line[:80].rstrip()) for name, check, argument_names in self._logical_checks: if self.verbose >= 4: print(' ' + name) - for result in self.run_check(check, argument_names): - offset, text = result - if isinstance(offset, tuple): - orig_number, orig_offset = offset - else: - for token_offset, token in self.mapping: - if offset >= token_offset: - orig_number = token[2][0] - orig_offset = (token[2][1] + offset - token_offset) - self.report_error(orig_number, orig_offset, text, check) - self.previous_logical = self.logical_line + self.init_checker_state(name, argument_names) + for offset, text in self.run_check(check, argument_names) or (): + if not isinstance(offset, tuple): + for token_offset, pos in mapping: + if offset <= token_offset: + break + offset = (pos[0], pos[1] + offset - token_offset) + self.report_error(offset[0], offset[1], text, check) + if self.logical_line: + self.previous_indent_level = self.indent_level + self.previous_logical = self.logical_line + self.blank_lines = 0 + self.tokens = [] def check_ast(self): + """Build the file's AST and run all AST checks.""" try: tree = compile(''.join(self.lines), '', 'exec', PyCF_ONLY_AST) except (SyntaxError, TypeError): return self.report_invalid_syntax() - for name, cls, _ in self._ast_checks: + for name, cls, __ in self._ast_checks: checker = cls(tree, self.filename) for lineno, offset, text, check in checker.run(): - if not noqa(self.lines[lineno - 1]): + if not self.lines or not noqa(self.lines[lineno - 1]): self.report_error(lineno, offset, text, check) def generate_tokens(self): + """Tokenize the file, run physical line checks and yield tokens.""" if self._io_error: self.report_error(1, 0, 'E902 %s' % self._io_error, readlines) - tokengen = tokenize.generate_tokens(self.readline_check_physical) + tokengen = tokenize.generate_tokens(self.readline) try: for token in tokengen: + if token[2][0] > self.total_lines: + return + self.maybe_check_physical(token) yield token except (SyntaxError, tokenize.TokenError): self.report_invalid_syntax() + def maybe_check_physical(self, token): + """If appropriate (based on token), check current physical line(s).""" + # Called after every token, but act only on end of line. + if _is_eol_token(token): + # Obviously, a newline token ends a single physical line. + self.check_physical(token[4]) + elif token[0] == tokenize.STRING and '\n' in token[1]: + # Less obviously, a string that contains newlines is a + # multiline string, either triple-quoted or with internal + # newlines backslash-escaped. Check every physical line in the + # string *except* for the last one: its newline is outside of + # the multiline string, so we consider it a regular physical + # line, and will check it like any other physical line. + # + # Subtleties: + # - we don't *completely* ignore the last line; if it contains + # the magical "# noqa" comment, we disable all physical + # checks for the entire multiline string + # - have to wind self.line_number back because initially it + # points to the last line of the string, and we want + # check_physical() to give accurate feedback + if noqa(token[4]): + return + self.multiline = True + self.line_number = token[2][0] + for line in token[1].split('\n')[:-1]: + self.check_physical(line + '\n') + self.line_number += 1 + self.multiline = False + def check_all(self, expected=None, line_offset=0): - """ - Run all checks on the input file. - """ + """Run all checks on the input file.""" self.report.init_file(self.filename, self.lines, expected, line_offset) + self.total_lines = len(self.lines) if self._ast_checks: self.check_ast() self.line_number = 0 self.indent_char = None - self.indent_level = 0 + self.indent_level = self.previous_indent_level = 0 self.previous_logical = '' self.tokens = [] - self.blank_lines = blank_lines_before_comment = 0 + self.blank_lines = self.blank_before = 0 parens = 0 for token in self.generate_tokens(): self.tokens.append(token) @@ -1387,29 +1585,33 @@ elif text in '}])': parens -= 1 elif not parens: - if token_type == tokenize.NEWLINE: - if self.blank_lines < blank_lines_before_comment: - self.blank_lines = blank_lines_before_comment - self.check_logical() - self.tokens = [] - self.blank_lines = blank_lines_before_comment = 0 - elif token_type == tokenize.NL: - if len(self.tokens) == 1: + if token_type in NEWLINE: + if token_type == tokenize.NEWLINE: + self.check_logical() + self.blank_before = 0 + elif len(self.tokens) == 1: # The physical line contains only this token. self.blank_lines += 1 - self.tokens = [] - elif token_type == tokenize.COMMENT and len(self.tokens) == 1: - if blank_lines_before_comment < self.blank_lines: - blank_lines_before_comment = self.blank_lines - self.blank_lines = 0 - if COMMENT_WITH_NL: + del self.tokens[0] + else: + self.check_logical() + elif COMMENT_WITH_NL and token_type == tokenize.COMMENT: + if len(self.tokens) == 1: # The comment also ends a physical line - self.tokens = [] + token = list(token) + token[1] = text.rstrip('\r\n') + token[3] = (token[2][0], token[2][1] + len(token[1])) + self.tokens = [tuple(token)] + self.check_logical() + if self.tokens: + self.check_physical(self.lines[-1]) + self.check_logical() return self.report.get_file_results() class BaseReport(object): """Collect the results of the checks.""" + print_filename = False def __init__(self, options): @@ -1472,8 +1674,7 @@ for key in self.messages if key.startswith(prefix)]) def get_statistics(self, prefix=''): - """ - Get statistics for message codes that start with the prefix. + """Get statistics for message codes that start with the prefix. prefix='' matches all errors and warnings prefix='E' matches all errors @@ -1544,9 +1745,17 @@ else: line = self.lines[line_number - 1] print(line.rstrip()) - print(' ' * offset + '^') + print(re.sub(r'\S', ' ', line[:offset]) + '^') if self._show_pep8 and doc: - print(doc.lstrip('\n').rstrip()) + print(' ' + doc.strip()) + + # stdout is block buffered when not stdout.isatty(). + # line can be broken where buffer boundary since other processes + # write to same file. + # flush() after print() to avoid buffer boundary. + # Typical buffer size is 8192. line written safely when + # len(line) < 8192. + sys.stdout.flush() return self.file_errors @@ -1570,13 +1779,14 @@ # build options from the command line self.checker_class = kwargs.pop('checker_class', Checker) parse_argv = kwargs.pop('parse_argv', False) - config_file = kwargs.pop('config_file', None) + config_file = kwargs.pop('config_file', False) parser = kwargs.pop('parser', None) + # build options from dict + options_dict = dict(*args, **kwargs) + arglist = None if parse_argv else options_dict.get('paths', None) options, self.paths = process_options( - parse_argv=parse_argv, config_file=config_file, parser=parser) - if args or kwargs: - # build options from dict - options_dict = dict(*args, **kwargs) + arglist, parse_argv, config_file, parser) + if options_dict: options.__dict__.update(options_dict) if 'paths' in options_dict: self.paths = options_dict['paths'] @@ -1587,8 +1797,6 @@ if not options.reporter: options.reporter = BaseReport if options.quiet else StandardReport - for index, value in enumerate(options.exclude): - options.exclude[index] = value.rstrip('/') options.select = tuple(options.select or ()) if not (options.select or options.ignore or options.testsuite or options.doctest) and DEFAULT_IGNORE: @@ -1658,8 +1866,9 @@ runner(os.path.join(root, filename)) def excluded(self, filename, parent=None): - """ - Check if options.exclude contains a pattern that matches filename. + """Check if the file should be excluded. + + Check if 'options.exclude' contains a pattern that matches filename. """ if not self.options.exclude: return False @@ -1668,21 +1877,25 @@ return True if parent: filename = os.path.join(parent, filename) + filename = os.path.abspath(filename) return filename_match(filename, self.options.exclude) def ignore_code(self, code): - """ - Check if the error code should be ignored. + """Check if the error code should be ignored. If 'options.select' contains a prefix of the error code, return False. Else, if 'options.ignore' contains a prefix of the error code, return True. """ + if len(code) < 4 and any(s.startswith(code) + for s in self.options.select): + return False return (code.startswith(self.options.ignore) and not code.startswith(self.options.select)) def get_checks(self, argument_name): - """ + """Get all the checks for this category. + Find all globally visible functions where the first argument name starts with argument_name and which contain selected tests. """ @@ -1719,7 +1932,8 @@ parser.add_option('--select', metavar='errors', default='', help="select errors and warnings (e.g. E,W6)") parser.add_option('--ignore', metavar='errors', default='', - help="skip errors and warnings (e.g. E4,W)") + help="skip errors and warnings (e.g. E4,W) " + "(default: %s)" % DEFAULT_IGNORE) parser.add_option('--show-source', action='store_true', help="show source code for each error") parser.add_option('--show-pep8', action='store_true', @@ -1755,22 +1969,39 @@ def read_config(options, args, arglist, parser): - """Read both user configuration and local configuration.""" + """Read and parse configurations + + If a config file is specified on the command line with the "--config" + option, then only it is used for configuration. + + Otherwise, the user configuration (~/.config/pep8) and any local + configurations in the current directory or above will be merged together + (in that order) using the read method of ConfigParser. + """ config = RawConfigParser() - user_conf = options.config - if user_conf and os.path.isfile(user_conf): - if options.verbose: - print('user configuration: %s' % user_conf) - config.read(user_conf) + cli_conf = options.config + + local_dir = os.curdir - parent = tail = args and os.path.abspath(os.path.commonprefix(args)) - while tail: - if config.read([os.path.join(parent, fn) for fn in PROJECT_CONFIG]): + if cli_conf and os.path.isfile(cli_conf): + if options.verbose: + print('cli configuration: %s' % cli_conf) + config.read(cli_conf) + else: + if USER_CONFIG and os.path.isfile(USER_CONFIG): if options.verbose: - print('local configuration: in %s' % parent) - break - parent, tail = os.path.split(parent) + print('user configuration: %s' % USER_CONFIG) + config.read(USER_CONFIG) + + parent = tail = args and os.path.abspath(os.path.commonprefix(args)) + while tail: + if config.read(os.path.join(parent, fn) for fn in PROJECT_CONFIG): + local_dir = parent + if options.verbose: + print('local configuration: in %s' % parent) + break + (parent, tail) = os.path.split(parent) pep8_section = parser.prog if config.has_section(pep8_section): @@ -1778,52 +2009,57 @@ for o in parser.option_list]) # First, read the default values - new_options, _ = parser.parse_args([]) + (new_options, __) = parser.parse_args([]) # Second, parse the configuration for opt in config.options(pep8_section): + if opt.replace('_', '-') not in parser.config_options: + print(" unknown option '%s' ignored" % opt) + continue if options.verbose > 1: print(" %s = %s" % (opt, config.get(pep8_section, opt))) - if opt.replace('_', '-') not in parser.config_options: - print("Unknown option: '%s'\n not in [%s]" % - (opt, ' '.join(parser.config_options))) - sys.exit(1) normalized_opt = opt.replace('-', '_') opt_type = option_list[normalized_opt] if opt_type in ('int', 'count'): value = config.getint(pep8_section, opt) elif opt_type == 'string': value = config.get(pep8_section, opt) + if normalized_opt == 'exclude': + value = normalize_paths(value, local_dir) else: assert opt_type in ('store_true', 'store_false') value = config.getboolean(pep8_section, opt) setattr(new_options, normalized_opt, value) # Third, overwrite with the command-line options - options, _ = parser.parse_args(arglist, values=new_options) + (options, __) = parser.parse_args(arglist, values=new_options) options.doctest = options.testsuite = False return options def process_options(arglist=None, parse_argv=False, config_file=None, parser=None): - """Process options passed either via arglist or via command line args.""" - if not arglist and not parse_argv: - # Don't read the command line if the module is used as a library. - arglist = [] + """Process options passed either via arglist or via command line args. + + Passing in the ``config_file`` parameter allows other tools, such as flake8 + to specify their own options to be processed in pep8. + """ if not parser: parser = get_parser() if not parser.has_option('--config'): - if config_file is True: - config_file = DEFAULT_CONFIG group = parser.add_option_group("Configuration", description=( "The project options are read from the [%s] section of the " "tox.ini file or the setup.cfg file located in any parent folder " "of the path(s) being processed. Allowed options are: %s." % (parser.prog, ', '.join(parser.config_options)))) group.add_option('--config', metavar='path', default=config_file, - help="user config file location (default: %default)") - options, args = parser.parse_args(arglist) + help="user config file location") + # Don't read the command line if the module is used as a library. + if not arglist and not parse_argv: + arglist = [] + # If parse_argv is True and arglist is None, arguments are + # parsed from the command line (sys.argv) + (options, args) = parser.parse_args(arglist) options.reporter = None if options.ensure_value('testsuite', False): @@ -1839,7 +2075,7 @@ options.reporter = parse_argv and options.quiet == 1 and FileReport options.filename = options.filename and options.filename.split(',') - options.exclude = options.exclude.split(',') + options.exclude = normalize_paths(options.exclude) options.select = options.select and options.select.split(',') options.ignore = options.ignore and options.ignore.split(',') @@ -1854,7 +2090,15 @@ def _main(): """Parse options and run checks on Python source.""" - pep8style = StyleGuide(parse_argv=True, config_file=True) + import signal + + # Handle "Broken pipe" gracefully + try: + signal.signal(signal.SIGPIPE, lambda signum, frame: sys.exit(1)) + except AttributeError: + pass # not supported on Windows + + pep8style = StyleGuide(parse_argv=True) options = pep8style.options if options.doctest or options.testsuite: from testsuite.support import run_tests diff -Nru gobject-introspection-1.45.2/misc/update-glib-annotations.py gobject-introspection-1.45.3/misc/update-glib-annotations.py --- gobject-introspection-1.45.2/misc/update-glib-annotations.py 1970-01-01 00:00:00.000000000 +0000 +++ gobject-introspection-1.45.3/misc/update-glib-annotations.py 2013-09-16 15:00:27.000000000 +0000 @@ -0,0 +1,107 @@ +#!/usr/bin/env python +# Scan glib sources. +# e.g.: +# ./update-glib-annotations.py ../../glib ../../glib/_build + + +import os +import sys + +import subprocess + +path=os.path.abspath(os.path.join(os.path.dirname(__file__), '..')) +for k in ['UNINSTALLED_INTROSPECTION_SRCDIR', + 'UNINSTALLED_INTROSPECTION_BUILDDIR']: + if k not in os.environ: + os.environ[k] = path + +possible_builddirs = ['../_build/', '..', '../../build/'] +builddir = None +for d in possible_builddirs: + if os.path.isfile(os.path.join(d, 'g-ir-annotation-tool')): + builddir = d + break +assert builddir is not None +annotation_tool_base_args = [os.path.join(builddir, 'g-ir-annotation-tool'), + '--extract'] + + +def directory_includes(dirs, srcdir, builddir): + result = [] + result.append('-I' + srcdir) + + if srcdir != builddir: + result.append('-I' + builddir) + + for name in dirs: + result.append('-I' + os.path.join(srcdir, name)) + if srcdir != builddir: + result.append('-I' + os.path.join(builddir, name)) + + return result + + +def extract_annotations(module, srcdir, builddir, outfile): + sources = [] + subdir = os.path.join(srcdir, module['name']) + includes = directory_includes(module['includes'], + srcdir, builddir) + + for sourcename in os.listdir(subdir): + if sourcename.endswith('.c'): + sources.append(os.path.join(subdir, sourcename)) + + return subprocess.check_call(annotation_tool_base_args + + module['defines'] + + includes + + sources, + stdout=outfile) + + +if __name__ == '__main__': + srcdir = sys.argv[1] + if len(sys.argv) == 3: + builddir = sys.argv[2] + else: + builddir = srcdir + + print "Using source directory: %r build directory: %r" % (srcdir, builddir) + + modules = [{'name': 'glib', + 'srcname': '../gir/glib-2.0.c', + 'includes': ['glib', 'gmodule'], + 'defines': ['-DGLIB_COMPILATION']}, + + {'name': 'gmodule', + 'srcname': '../gir/gmodule-2.0.c', + 'includes': ['glib', 'gmodule'], + 'defines': ['-DGLIB_COMPILATION']}, + + {'name': 'gobject', + 'srcname': '../gir/gobject-2.0.c', + 'includes': ['glib', 'gobject', 'gmodule'], + 'defines': ['-DGOBJECT_COMPILATION']}, + + {'name': 'gio', + 'srcname': '../gir/gio-2.0.c', + 'includes': ['glib', 'gmodule', 'gobject', 'gio'], + 'defines': ['-DGOBJECT_COMPILATION', '-DGIO_COMPILATION']}] + + for module in modules: + srcname = module['srcname'] + tmpname = module['srcname'] + '.tmp' + + if os.path.isfile(tmpname): + os.unlink(tmpname) + + if os.path.isfile(srcname): + os.unlink(srcname) + + srcfile = open(tmpname, 'w') + extract_annotations(module, srcdir, builddir, srcfile) + srcfile.close() + os.rename(tmpname, srcname) + + print "Updated %r" % (srcname, ) + + print "Done; run \"git diff\" to see any changes." diff -Nru gobject-introspection-1.45.2/misc/update-gtkdoc-tests.py gobject-introspection-1.45.3/misc/update-gtkdoc-tests.py --- gobject-introspection-1.45.2/misc/update-gtkdoc-tests.py 1970-01-01 00:00:00.000000000 +0000 +++ gobject-introspection-1.45.3/misc/update-gtkdoc-tests.py 2015-07-03 11:46:48.000000000 +0000 @@ -0,0 +1,234 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- +# -*- Mode: Python -*- + +# GObject-Introspection - a framework for introspecting GObject libraries +# Copyright (C) 2012-2015 Dieter Verfaillie +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301, USA. +# + + +import os +import sys +import io + +sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..')) +from giscanner.annotationparser import (COMMENT_BLOCK_START_RE, COMMENT_BLOCK_END_RE, + GtkDocCommentBlockParser, GtkDocCommentBlockWriter) +from giscanner.message import MessageLogger, ERROR, FATAL + + +HEADER = ''' + + + +''' + +TEST = ''' + %(docblock)s + +%(tree)s + + %(serialized)s + + +''' + +FOOTER = ''' +''' + + +def parsed2tree(docblock): + parsed = '' + + if docblock is not None: + parsed += ' \n' + + parsed += ' \n' + parsed += ' %s\n' % (docblock.name, ) + if docblock.annotations: + parsed += ' \n' + for ann_name, ann_options in docblock.annotations.items(): + parsed += ' \n' + parsed += ' %s\n' % (ann_name, ) + if ann_options: + parsed += ' \n' + if isinstance(ann_options, list): + for option in ann_options: + parsed += ' \n' + else: + for (option, value) in ann_options.items(): + parsed += ' \n' + parsed += ' \n' + parsed += ' \n' + parsed += ' \n' + parsed += ' \n' + + if docblock.params: + parsed += ' \n' + for param_name in docblock.params: + param = docblock.params.get(param_name) + parsed += ' \n' + parsed += ' %s\n' % (param_name, ) + if param.annotations: + parsed += ' \n' + for ann_name, ann_options in param.annotations.items(): + parsed += ' \n' + parsed += ' %s\n' % (ann_name, ) + if ann_options: + parsed += ' \n' + if isinstance(ann_options, list): + for option in ann_options: + parsed += ' \n' + else: + for (option, value) in ann_options.items(): + parsed += ' \n' + parsed += ' \n' + parsed += ' \n' + parsed += ' \n' + if param.description: + parsed += ' %s\n' % (param.description, ) + parsed += ' \n' + parsed += ' \n' + + if docblock.description: + parsed += ' %s\n' % (docblock.description, ) + + if docblock.tags: + parsed += ' \n' + for tag_name in docblock.tags: + tag = docblock.tags.get(tag_name) + parsed += ' \n' + parsed += ' %s\n' % (tag_name, ) + if tag.annotations: + parsed += ' \n' + for ann_name, ann_options in tag.annotations.items(): + parsed += ' \n' + parsed += ' %s\n' % (ann_name, ) + if ann_options: + parsed += ' \n' + if isinstance(ann_options, list): + for option in ann_options: + parsed += ' \n' + else: + for (option, value) in ann_options.items(): + parsed += ' \n' + parsed += ' \n' + parsed += ' \n' + parsed += ' \n' + if tag.value: + parsed += ' %s\n' % (tag.value, ) + if tag.description: + parsed += ' %s\n' % (tag.description, ) + parsed += ' \n' + parsed += ' \n' + + parsed += ' ' + + return parsed + + +if __name__ == '__main__': + if sys.version_info < (3, 0): + print('Sorry, update-gtkdoc-tests.py requires Python 3.x') + sys.exit(1) + + gi_tests = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', 'tests', 'scanner', 'annotationparser', 'gtkdoc')) + + gtkdoc_tests = None + if len(sys.argv) == 2: + gtkdoc_tests = sys.argv[1] + else: + # Fall back to default jhbuild checkoutroot directory layout + gtkdoc_tests = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..', 'gtk-doc', 'tests')) + + if not gtkdoc_tests or not os.path.isdir(gtkdoc_tests): + print('GTK-Doc source directory "%s" not found' % gtkdoc_tests) + sys.exit(1) + else: + print('Using GTK-Doc source directory "%s"' % gtkdoc_tests) + + for root, dirs, files in os.walk(gtkdoc_tests): + for inputfile in files: + ext = os.path.splitext(inputfile)[-1].lower() + if 'src' in root and ext in ['.c', '.h']: + path = os.path.join(root, inputfile) + print('Reading "%s"' % path) + + relpath = os.path.relpath(path, gtkdoc_tests).split(os.sep) + relpath = os.path.join(relpath[0], relpath[len(relpath) - 1]) + + logger = MessageLogger.get(namespace=None) + parser = GtkDocCommentBlockParser() + writer = GtkDocCommentBlockWriter(indent=True) + logger.enable_warnings((ERROR, FATAL)) + + with io.open(path, 'rU') as f: + lines = f.readlines() + + chunks = [] + in_comment = False + chunk_start = 0 + chunk_end = 0 + + for line_index, line in enumerate(lines): + if not in_comment: + if COMMENT_BLOCK_START_RE.match(line): + # We are at a line that starts a GTK-Doc comment block + in_comment = True + # Store where this GTK-Doc comment block starts + chunk_start = line_index + else: + if COMMENT_BLOCK_END_RE.match(line): + # We are at a line that closes a GTK-Doc comment block + in_comment = False + # Store the GTK-Doc comment block + chunks.append([''.join(lines[chunk_start:line_index + 1]), relpath, chunk_start + 1]) + # Data chunk after the GTK-Doc comment block starts at the next line + chunk_start = line_index + 1 + # Store where the GTK-Doc comment block ends + chunk_end = line_index + + outputfile = os.path.join(gi_tests, '%s.xml.in' % relpath) + print('Writing "%s"' % outputfile) + with io.open(outputfile, 'w', newline='', encoding='utf-8') as f: + f.write(HEADER) + for chunk in chunks: + docblock = parser.parse_comment_block(chunk[0].rstrip(), chunk[1], chunk[2]) + if docblock: + f.write(TEST % {'docblock': chunk[0].rstrip(), + 'tree': parsed2tree(docblock), + 'serialized': writer.write(docblock).rstrip()}) + f.write(FOOTER) diff -Nru gobject-introspection-1.45.2/misc/verbump.py gobject-introspection-1.45.3/misc/verbump.py --- gobject-introspection-1.45.2/misc/verbump.py 1970-01-01 00:00:00.000000000 +0000 +++ gobject-introspection-1.45.3/misc/verbump.py 2015-07-03 11:46:48.000000000 +0000 @@ -0,0 +1,47 @@ +#!/usr/bin/env python +# Automakes a release preparation for a post-release project +# * Create a git tag +# * Bump version in configure.ac and commit it + +import re +import os +import sys +import subprocess + +micro_version_re = re.compile('m4_define.*gi_micro_version, ([0-9]+)') +micro_version_replace = 'm4_define(gi_micro_version, %d)\n' + +def _extract_config_log_variable(name): + f = open('config.log') + keystart = name + '=\'' + for line in f: + if line.startswith(keystart): + return line[len(keystart):-2] + f.close() + fatal("Failed to find '%s' in config.status" % (name, )) + +if not os.path.isfile('config.log'): + fatal("Couldn't find config.log; did you run configure?") +package = _extract_config_log_variable('PACKAGE_TARNAME') +version = _extract_config_log_variable('VERSION') + +configure_path=os.path.join(os.environ['top_srcdir'], 'configure.ac') +f = open(configure_path) +newf = open(configure_path + '.tmp', 'w') +for line in f: + m = micro_version_re.match(line) + if not m: + newf.write(line) + continue + v = int(m.group(1)) + newv = v+1 + print "Will update micro version from %s to %s" % (v, newv) + newf.write(micro_version_replace % (newv, )) +newf.close() + +os.rename(configure_path + '.tmp', configure_path) +print "Successfully wrote new 'configure.ac' with post-release version bump" + +args=['git', 'commit', '-m', "configure: Post-release version bump", configure_path] +print "Running: %r" % (args, ) +subprocess.check_call(args) diff -Nru gobject-introspection-1.45.2/scannerlexer.c gobject-introspection-1.45.3/scannerlexer.c --- gobject-introspection-1.45.2/scannerlexer.c 2015-05-26 06:41:44.000000000 +0000 +++ gobject-introspection-1.45.3/scannerlexer.c 2015-03-24 00:50:26.000000000 +0000 @@ -8,7 +8,7 @@ #define FLEX_SCANNER #define YY_FLEX_MAJOR_VERSION 2 #define YY_FLEX_MINOR_VERSION 5 -#define YY_FLEX_SUBMINOR_VERSION 39 +#define YY_FLEX_SUBMINOR_VERSION 37 #if YY_FLEX_SUBMINOR_VERSION > 0 #define FLEX_BETA #endif @@ -141,15 +141,7 @@ /* Size of default input buffer. */ #ifndef YY_BUF_SIZE -#ifdef __ia64__ -/* On IA-64, the buffer size is 16k, not 8k. - * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case. - * Ditto for the __ia64__ case accordingly. - */ -#define YY_BUF_SIZE 32768 -#else #define YY_BUF_SIZE 16384 -#endif /* __ia64__ */ #endif /* The state buf must be large enough to hold one state per character in the main buffer. @@ -175,7 +167,6 @@ #define EOB_ACT_LAST_MATCH 2 #define YY_LESS_LINENO(n) - #define YY_LINENO_REWIND_TO(ptr) /* Return all but the first "n" matched characters back to the input stream. */ #define yyless(n) \ @@ -1139,7 +1130,7 @@ static int check_identifier (GISourceScanner *scanner, const char *); static int parse_ignored_macro (void); static void print_error (GISourceScanner *scanner); -#line 1143 "scannerlexer.c" +#line 1134 "scannerlexer.c" #define INITIAL 0 @@ -1218,12 +1209,7 @@ /* Amount of stuff to slurp up with each read. */ #ifndef YY_READ_BUF_SIZE -#ifdef __ia64__ -/* On IA-64, the buffer size is 16k, not 8k */ -#define YY_READ_BUF_SIZE 16384 -#else #define YY_READ_BUF_SIZE 8192 -#endif /* __ia64__ */ #endif /* Copy whatever the last rule matched to the standard output. */ @@ -1324,6 +1310,11 @@ register char *yy_cp, *yy_bp; register int yy_act; +#line 73 "giscanner/scannerlexer.l" + + +#line 1317 "scannerlexer.c" + if ( !(yy_init) ) { (yy_init) = 1; @@ -1356,12 +1347,6 @@ yy_load_buffer_state( ); } - { -#line 73 "giscanner/scannerlexer.l" - - -#line 1364 "scannerlexer.c" - while ( 1 ) /* loops until end-of-file is reached */ { yy_cp = (yy_c_buf_p); @@ -1382,7 +1367,7 @@ yy_match: do { - register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ; + register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)]; while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; @@ -2223,7 +2208,7 @@ #line 252 "giscanner/scannerlexer.l" ECHO; YY_BREAK -#line 2227 "scannerlexer.c" +#line 2212 "scannerlexer.c" case YY_STATE_EOF(INITIAL): yyterminate(); @@ -2354,7 +2339,6 @@ "fatal flex scanner internal error--no action found" ); } /* end of action switch */ } /* end of scanning one token */ - } /* end of user's declarations */ } /* end of yylex */ /* yy_get_next_buffer - try to read in a new buffer @@ -3155,7 +3139,7 @@ #define YYTABLES_NAME "yytables" -#line 251 "giscanner/scannerlexer.l" +#line 252 "giscanner/scannerlexer.l" diff -Nru gobject-introspection-1.45.2/tests/Makefile.in gobject-introspection-1.45.3/tests/Makefile.in --- gobject-introspection-1.45.2/tests/Makefile.in 2015-05-26 06:40:27.000000000 +0000 +++ gobject-introspection-1.45.3/tests/Makefile.in 2015-07-03 20:30:33.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -23,7 +23,17 @@ # VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -86,9 +96,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/common.mk $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/build-aux/depcomp \ - $(top_srcdir)/build-aux/test-driver subdir = tests ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ @@ -98,6 +105,7 @@ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -397,6 +405,9 @@ TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ $(TEST_LOG_FLAGS) DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/build-aux/depcomp \ + $(top_srcdir)/build-aux/test-driver $(top_srcdir)/common.mk DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -615,7 +626,8 @@ --add-include-path=$(srcdir) \ --add-include-path=$(top_srcdir)/gir \ --add-include-path=$(builddir) \ - --add-include-path=$(top_builddir) + --add-include-path=$(top_builddir) \ + --add-include-path=$(top_builddir)/gir INTROSPECTION_COMPILER = \ env PATH=".libs:$(PATH)" \ @@ -625,7 +637,8 @@ --includedir=$(srcdir) \ --includedir=$(top_srcdir)/gir \ --includedir=$(builddir) \ - --includedir=$(top_builddir) + --includedir=$(top_builddir) \ + --includedir=$(top_builddir)/gir INTROSPECTION_DOCTOOL = \ env PATH=".libs:$(PATH)" \ @@ -639,7 +652,8 @@ --add-include-path=$(srcdir) \ --add-include-path=$(top_srcdir)/gir \ --add-include-path=$(builddir) \ - --add-include-path=$(top_builddir) + --add-include-path=$(top_builddir) \ + --add-include-path=$(top_builddir)/gir SUBDIRS = . scanner repository offsets warn EXTRA_DIST = gimarshallingtests.h gi-tester gitestmacros.h @@ -679,7 +693,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign tests/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -688,7 +701,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/common.mk: +$(top_srcdir)/common.mk $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -891,7 +904,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1220,6 +1233,8 @@ mostlyclean-libtool pdf pdf-am ps ps-am recheck tags tags-am \ uninstall uninstall-am uninstall-testsDATA +.PRECIOUS: Makefile + everything-stamp.h: Makefile $(AM_V_GEN) $(INTROSPECTION_SCANNER) $(INTROSPECTION_SCANNER_ARGS) \ diff -Nru gobject-introspection-1.45.2/tests/offsets/Makefile.am gobject-introspection-1.45.3/tests/offsets/Makefile.am --- gobject-introspection-1.45.2/tests/offsets/Makefile.am 2014-09-03 06:03:58.000000000 +0000 +++ gobject-introspection-1.45.3/tests/offsets/Makefile.am 2015-07-03 11:46:48.000000000 +0000 @@ -25,7 +25,7 @@ Offsets_1_0_gir_LIBS = liboffsets.la Offsets_1_0_gir_PACKAGES = gobject-2.0 Offsets_1_0_gir_FILES = $(srcdir)/offsets.h $(srcdir)/offsets.c -Offsets_1_0_gir_SCANNERFLAGS = --warn-all --warn-error -I$(top_srcdir)/tests +Offsets_1_0_gir_SCANNERFLAGS = $(INTROSPECTION_SCANNER_ARGS) --warn-all --warn-error -I$(top_srcdir)/tests INTROSPECTION_GIRS += Offsets-1.0.gir CLEANFILES += Offsets-1.0.gir Offsets-1.0.typelib liboffsets.la @@ -47,7 +47,7 @@ ############################################################ -# The trailing "echo" in TESTS_ENVIRONMENT is used to ignore automake passing +# The trailing "echo" in LOG_COMPILER is used to ignore automake passing # gitestoffsets as we already run this in the same command line. TESTS = gitestoffsets LOG_COMPILER = env GI_TYPELIB_PATH=:$(top_builddir) ./gitestoffsets$(EXEEXT) offsets.compiled offsets.introspected && \ diff -Nru gobject-introspection-1.45.2/tests/offsets/Makefile.in gobject-introspection-1.45.3/tests/offsets/Makefile.in --- gobject-introspection-1.45.2/tests/offsets/Makefile.in 2015-05-26 06:40:27.000000000 +0000 +++ gobject-introspection-1.45.3/tests/offsets/Makefile.in 2015-07-03 20:30:33.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -62,7 +62,17 @@ # CLEANFILES = $(dist_gir_DATA) $(typelib_DATA) # VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -125,10 +135,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/common.mk \ - $(top_srcdir)/Makefile.introspection $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/build-aux/depcomp \ - $(top_srcdir)/build-aux/test-driver EXTRA_PROGRAMS = gitestoffsets$(EXEEXT) TESTS = gitestoffsets$(EXEEXT) subdir = tests/offsets @@ -140,6 +146,7 @@ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -423,6 +430,10 @@ TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ $(TEST_LOG_FLAGS) +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/Makefile.introspection \ + $(top_srcdir)/build-aux/depcomp \ + $(top_srcdir)/build-aux/test-driver $(top_srcdir)/common.mk DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -616,7 +627,8 @@ --add-include-path=$(srcdir) \ --add-include-path=$(top_srcdir)/gir \ --add-include-path=$(builddir) \ - --add-include-path=$(top_builddir) + --add-include-path=$(top_builddir) \ + --add-include-path=$(top_builddir)/gir INTROSPECTION_COMPILER = \ env PATH=".libs:$(PATH)" \ @@ -626,7 +638,8 @@ --includedir=$(srcdir) \ --includedir=$(top_srcdir)/gir \ --includedir=$(builddir) \ - --includedir=$(top_builddir) + --includedir=$(top_builddir) \ + --includedir=$(top_builddir)/gir INTROSPECTION_DOCTOOL = \ env PATH=".libs:$(PATH)" \ @@ -640,7 +653,8 @@ --add-include-path=$(srcdir) \ --add-include-path=$(top_srcdir)/gir \ --add-include-path=$(builddir) \ - --add-include-path=$(top_builddir) + --add-include-path=$(top_builddir) \ + --add-include-path=$(top_builddir)/gir # Private functions @@ -699,7 +713,7 @@ Offsets_1_0_gir_LIBS = liboffsets.la Offsets_1_0_gir_PACKAGES = gobject-2.0 Offsets_1_0_gir_FILES = $(srcdir)/offsets.h $(srcdir)/offsets.c -Offsets_1_0_gir_SCANNERFLAGS = --warn-all --warn-error -I$(top_srcdir)/tests +Offsets_1_0_gir_SCANNERFLAGS = $(INTROSPECTION_SCANNER_ARGS) --warn-all --warn-error -I$(top_srcdir)/tests nodist_gitestoffsets_SOURCES = gitestoffsets.c gitestoffsets_CPPFLAGS = $(GIREPO_CFLAGS) -I$(top_srcdir)/girepository -I$(top_srcdir)/tests gitestoffsets_LDADD = $(top_builddir)/libgirepository-1.0.la $(GIREPO_LIBS) @@ -723,7 +737,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/offsets/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign tests/offsets/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -732,7 +745,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/common.mk $(top_srcdir)/Makefile.introspection: +$(top_srcdir)/common.mk $(top_srcdir)/Makefile.introspection $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -889,7 +902,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1180,6 +1193,8 @@ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ recheck tags tags-am uninstall uninstall-am +.PRECIOUS: Makefile + # Make sure the required variables are set, these should under normal # circumstances come from introspection.m4 diff -Nru gobject-introspection-1.45.2/tests/repository/giteststructinfo.c gobject-introspection-1.45.3/tests/repository/giteststructinfo.c --- gobject-introspection-1.45.2/tests/repository/giteststructinfo.c 1970-01-01 00:00:00.000000000 +0000 +++ gobject-introspection-1.45.3/tests/repository/giteststructinfo.c 2015-06-22 17:07:46.000000000 +0000 @@ -0,0 +1,58 @@ + +#include "girepository.h" + + +static void +test_field_iterators (void) +{ + GIRepository *repo; + GITypelib *ret; + GIStructInfo *class_info; + GIFieldInfo *field_info; + GError *error = NULL; + gint i; + + repo = g_irepository_get_default (); + + ret = g_irepository_require (repo, "GIMarshallingTests", NULL, 0, &error); + g_assert_nonnull (ret); + g_assert_no_error (error); + + class_info = g_irepository_find_by_name (repo, "GIMarshallingTests", "ObjectClass"); + g_assert_nonnull (class_info); + g_assert (g_base_info_get_type (class_info) == GI_INFO_TYPE_STRUCT); + + for (i = 0; i < g_struct_info_get_n_fields (class_info); i++) + { + const char *field_name; + GIFieldInfo *found; + + field_info = g_struct_info_get_field (class_info, i); + g_assert_nonnull (field_info); + + field_name = g_base_info_get_name (field_info); + g_assert_nonnull (field_name); + + found = g_struct_info_find_field (class_info, field_name); + g_assert_nonnull (found); + g_assert_cmpstr (g_base_info_get_name (found), ==, field_name); + + g_base_info_unref (found); + g_base_info_unref (field_info); + } + + field_info = g_struct_info_find_field (class_info, "not_a_real_field_name"); + g_assert_null (field_info); + + g_base_info_unref (class_info); +} + +int +main(int argc, char **argv) +{ + g_test_init (&argc, &argv, NULL); + + g_test_add_func ("/girepository/structinfo/field-iterators", test_field_iterators); + + return g_test_run (); +} diff -Nru gobject-introspection-1.45.2/tests/repository/gitestthrows.c gobject-introspection-1.45.3/tests/repository/gitestthrows.c --- gobject-introspection-1.45.2/tests/repository/gitestthrows.c 2014-08-13 13:30:30.000000000 +0000 +++ gobject-introspection-1.45.3/tests/repository/gitestthrows.c 2015-06-22 17:07:46.000000000 +0000 @@ -1,11 +1,9 @@ #include "girepository.h" -#include - -int -main(int argc, char **argv) +static void +test_invoke_gerror (void) { GIRepository *repo; GITypelib *ret; @@ -36,12 +34,101 @@ 0, &ret_arg, &error); - g_free(in_arg[0].v_string); + g_free (in_arg[0].v_string); g_assert (invoke_return == FALSE); g_assert (error != NULL); g_assert (error->domain == G_FILE_ERROR); g_assert (error->code == G_FILE_ERROR_NOENT); +} + +static void +test_vfunc_can_throw_gerror (void) +{ + GIRepository *repo; + GITypelib *ret; + GIBaseInfo *object_info; + GIFunctionInfo *invoker_info; + GIVFuncInfo *vfunc_info; + GError *error = NULL; + + repo = g_irepository_get_default (); + + ret = g_irepository_require (repo, "GIMarshallingTests", NULL, 0, &error); + g_assert_nonnull (ret); + g_assert_no_error (error); + + object_info = g_irepository_find_by_name (repo, "GIMarshallingTests", "Object"); + g_assert_nonnull (object_info); + g_assert (g_base_info_get_type (object_info) == GI_INFO_TYPE_OBJECT); + + invoker_info = g_object_info_find_method ((GIObjectInfo *)object_info, + "vfunc_meth_with_error"); + g_assert_nonnull (invoker_info); + g_assert (g_function_info_get_flags (invoker_info) & GI_FUNCTION_THROWS); + g_assert (g_callable_info_can_throw_gerror ((GICallableInfo *)invoker_info)); + + vfunc_info = g_object_info_find_vfunc ((GIObjectInfo *)object_info, + "vfunc_meth_with_err"); + g_assert_nonnull (vfunc_info); + g_assert (g_vfunc_info_get_flags (vfunc_info) & GI_VFUNC_THROWS); + g_assert (g_callable_info_can_throw_gerror ((GICallableInfo *)vfunc_info)); + + g_base_info_unref (vfunc_info); + g_base_info_unref (invoker_info); + g_base_info_unref (object_info); +} + +static void +test_callback_can_throw_gerror (void) +{ + GIRepository *repo; + GITypelib *ret; + GIStructInfo *class_info; + GIFieldInfo *field_info; + GITypeInfo *field_type; + GICallbackInfo *callback_info; + GError *error = NULL; + + repo = g_irepository_get_default (); + + ret = g_irepository_require (repo, "GIMarshallingTests", NULL, 0, &error); + g_assert_nonnull (ret); + g_assert_no_error (error); + + class_info = g_irepository_find_by_name (repo, "GIMarshallingTests", "ObjectClass"); + g_assert_nonnull (class_info); + g_assert (g_base_info_get_type (class_info) == GI_INFO_TYPE_STRUCT); + + field_info = g_struct_info_find_field (class_info, "vfunc_meth_with_err"); + g_assert_nonnull (field_info); + g_assert (g_base_info_get_type (field_info) == GI_INFO_TYPE_FIELD); + + field_type = g_field_info_get_type (field_info); + g_assert_nonnull (field_type); + g_assert (g_base_info_get_type (field_type) == GI_INFO_TYPE_TYPE); + g_assert (g_type_info_get_tag (field_type) == GI_TYPE_TAG_INTERFACE); + + callback_info = g_type_info_get_interface (field_type); + g_assert_nonnull (callback_info); + g_assert (g_callable_info_can_throw_gerror ((GICallableInfo *)callback_info)); + + g_base_info_unref (callback_info); + g_base_info_unref (field_type); + g_base_info_unref (field_info); + g_base_info_unref (class_info); +} + +int +main(int argc, char **argv) +{ + g_test_init (&argc, &argv, NULL); + + g_test_add_func ("/girepository/throws/invoke-gerror", test_invoke_gerror); + g_test_add_func ("/girepository/throws/vfunc-can-throw-gerror", + test_vfunc_can_throw_gerror); + g_test_add_func ("/girepository/throws/callback-can-throw-gerror", + test_callback_can_throw_gerror); - exit(0); + return g_test_run (); } diff -Nru gobject-introspection-1.45.2/tests/repository/Makefile.am gobject-introspection-1.45.3/tests/repository/Makefile.am --- gobject-introspection-1.45.2/tests/repository/Makefile.am 2015-05-26 06:27:30.000000000 +0000 +++ gobject-introspection-1.45.3/tests/repository/Makefile.am 2015-07-03 11:46:48.000000000 +0000 @@ -2,13 +2,17 @@ AM_LDFLAGS = -module -avoid-version LIBS = $(GOBJECT_LIBS) -EXTRA_PROGRAMS = gitestrepo gitestthrows gitypelibtest +EXTRA_PROGRAMS = gitestrepo giteststructinfo gitestthrows gitypelibtest CLEANFILES = $(EXTRA_PROGRAMS) gitestrepo_SOURCES = $(srcdir)/gitestrepo.c gitestrepo_CPPFLAGS = $(GIREPO_CFLAGS) -I$(top_srcdir)/girepository gitestrepo_LDADD = $(top_builddir)/libgirepository-1.0.la $(GIREPO_LIBS) +giteststructinfo_SOURCES = $(srcdir)/giteststructinfo.c +giteststructinfo_CPPFLAGS = $(GIREPO_CFLAGS) -I$(top_srcdir)/girepository +giteststructinfo_LDADD = $(top_builddir)/libgirepository-1.0.la $(GIREPO_LIBS) + gitestthrows_SOURCES = $(srcdir)/gitestthrows.c gitestthrows_CPPFLAGS = $(GIREPO_CFLAGS) -I$(top_srcdir)/girepository gitestthrows_LDADD = $(top_builddir)/libgirepository-1.0.la $(GIREPO_LIBS) @@ -17,9 +21,8 @@ gitypelibtest_CPPFLAGS = $(GIREPO_CFLAGS) -I$(top_srcdir)/girepository gitypelibtest_LDADD = $(top_builddir)/libgirepository-1.0.la $(GIREPO_LIBS) -TESTS = gitestrepo gitestthrows gitypelibtest +TESTS = gitestrepo giteststructinfo gitestthrows gitypelibtest TESTS_ENVIRONMENT=env GI_TYPELIB_PATH="$(top_builddir):$(top_builddir)/gir:$(top_builddir)/tests:$(top_builddir)/tests/scanner" \ - XDG_DATA_DIRS="$(top_srcdir)/gir:$(XDG_DATA_DIRS)" \ PATH="$(top_builddir)/tests/scanner/.libs:$(PATH)" \ CC="$(CC)" \ LD_LIBRARY_PATH="$(top_builddir)/tests/scanner/.libs:$(LD_LIBRARY_PATH)" \ diff -Nru gobject-introspection-1.45.2/tests/repository/Makefile.in gobject-introspection-1.45.3/tests/repository/Makefile.in --- gobject-introspection-1.45.2/tests/repository/Makefile.in 2015-05-26 06:40:27.000000000 +0000 +++ gobject-introspection-1.45.3/tests/repository/Makefile.in 2015-07-03 20:30:33.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,7 +14,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -77,14 +87,11 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -EXTRA_PROGRAMS = gitestrepo$(EXEEXT) gitestthrows$(EXEEXT) \ - gitypelibtest$(EXEEXT) -TESTS = gitestrepo$(EXEEXT) gitestthrows$(EXEEXT) \ - gitypelibtest$(EXEEXT) +EXTRA_PROGRAMS = gitestrepo$(EXEEXT) giteststructinfo$(EXEEXT) \ + gitestthrows$(EXEEXT) gitypelibtest$(EXEEXT) +TESTS = gitestrepo$(EXEEXT) giteststructinfo$(EXEEXT) \ + gitestthrows$(EXEEXT) gitypelibtest$(EXEEXT) subdir = tests/repository -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/build-aux/depcomp \ - $(top_srcdir)/build-aux/test-driver ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ @@ -93,6 +100,7 @@ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -106,6 +114,11 @@ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent am__v_lt_1 = +am_giteststructinfo_OBJECTS = \ + giteststructinfo-giteststructinfo.$(OBJEXT) +giteststructinfo_OBJECTS = $(am_giteststructinfo_OBJECTS) +giteststructinfo_DEPENDENCIES = \ + $(top_builddir)/libgirepository-1.0.la $(am__DEPENDENCIES_1) am_gitestthrows_OBJECTS = gitestthrows-gitestthrows.$(OBJEXT) gitestthrows_OBJECTS = $(am_gitestthrows_OBJECTS) gitestthrows_DEPENDENCIES = $(top_builddir)/libgirepository-1.0.la \ @@ -148,10 +161,10 @@ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = -SOURCES = $(gitestrepo_SOURCES) $(gitestthrows_SOURCES) \ - $(gitypelibtest_SOURCES) -DIST_SOURCES = $(gitestrepo_SOURCES) $(gitestthrows_SOURCES) \ - $(gitypelibtest_SOURCES) +SOURCES = $(gitestrepo_SOURCES) $(giteststructinfo_SOURCES) \ + $(gitestthrows_SOURCES) $(gitypelibtest_SOURCES) +DIST_SOURCES = $(gitestrepo_SOURCES) $(giteststructinfo_SOURCES) \ + $(gitestthrows_SOURCES) $(gitypelibtest_SOURCES) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -380,6 +393,9 @@ TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ $(TEST_LOG_FLAGS) +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/build-aux/depcomp \ + $(top_srcdir)/build-aux/test-driver DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -564,6 +580,9 @@ gitestrepo_SOURCES = $(srcdir)/gitestrepo.c gitestrepo_CPPFLAGS = $(GIREPO_CFLAGS) -I$(top_srcdir)/girepository gitestrepo_LDADD = $(top_builddir)/libgirepository-1.0.la $(GIREPO_LIBS) +giteststructinfo_SOURCES = $(srcdir)/giteststructinfo.c +giteststructinfo_CPPFLAGS = $(GIREPO_CFLAGS) -I$(top_srcdir)/girepository +giteststructinfo_LDADD = $(top_builddir)/libgirepository-1.0.la $(GIREPO_LIBS) gitestthrows_SOURCES = $(srcdir)/gitestthrows.c gitestthrows_CPPFLAGS = $(GIREPO_CFLAGS) -I$(top_srcdir)/girepository gitestthrows_LDADD = $(top_builddir)/libgirepository-1.0.la $(GIREPO_LIBS) @@ -571,7 +590,6 @@ gitypelibtest_CPPFLAGS = $(GIREPO_CFLAGS) -I$(top_srcdir)/girepository gitypelibtest_LDADD = $(top_builddir)/libgirepository-1.0.la $(GIREPO_LIBS) TESTS_ENVIRONMENT = env GI_TYPELIB_PATH="$(top_builddir):$(top_builddir)/gir:$(top_builddir)/tests:$(top_builddir)/tests/scanner" \ - XDG_DATA_DIRS="$(top_srcdir)/gir:$(XDG_DATA_DIRS)" \ PATH="$(top_builddir)/tests/scanner/.libs:$(PATH)" \ CC="$(CC)" \ LD_LIBRARY_PATH="$(top_builddir)/tests/scanner/.libs:$(LD_LIBRARY_PATH)" \ @@ -593,7 +611,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/repository/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign tests/repository/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -616,6 +633,10 @@ @rm -f gitestrepo$(EXEEXT) $(AM_V_CCLD)$(LINK) $(gitestrepo_OBJECTS) $(gitestrepo_LDADD) $(LIBS) +giteststructinfo$(EXEEXT): $(giteststructinfo_OBJECTS) $(giteststructinfo_DEPENDENCIES) $(EXTRA_giteststructinfo_DEPENDENCIES) + @rm -f giteststructinfo$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(giteststructinfo_OBJECTS) $(giteststructinfo_LDADD) $(LIBS) + gitestthrows$(EXEEXT): $(gitestthrows_OBJECTS) $(gitestthrows_DEPENDENCIES) $(EXTRA_gitestthrows_DEPENDENCIES) @rm -f gitestthrows$(EXEEXT) $(AM_V_CCLD)$(LINK) $(gitestthrows_OBJECTS) $(gitestthrows_LDADD) $(LIBS) @@ -631,6 +652,7 @@ -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gitestrepo-gitestrepo.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/giteststructinfo-giteststructinfo.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gitestthrows-gitestthrows.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gitypelibtest-gitypelibtest.Po@am__quote@ @@ -669,6 +691,20 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gitestrepo_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gitestrepo-gitestrepo.obj `if test -f '$(srcdir)/gitestrepo.c'; then $(CYGPATH_W) '$(srcdir)/gitestrepo.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/gitestrepo.c'; fi` +giteststructinfo-giteststructinfo.o: $(srcdir)/giteststructinfo.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(giteststructinfo_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT giteststructinfo-giteststructinfo.o -MD -MP -MF $(DEPDIR)/giteststructinfo-giteststructinfo.Tpo -c -o giteststructinfo-giteststructinfo.o `test -f '$(srcdir)/giteststructinfo.c' || echo '$(srcdir)/'`$(srcdir)/giteststructinfo.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/giteststructinfo-giteststructinfo.Tpo $(DEPDIR)/giteststructinfo-giteststructinfo.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(srcdir)/giteststructinfo.c' object='giteststructinfo-giteststructinfo.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(giteststructinfo_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o giteststructinfo-giteststructinfo.o `test -f '$(srcdir)/giteststructinfo.c' || echo '$(srcdir)/'`$(srcdir)/giteststructinfo.c + +giteststructinfo-giteststructinfo.obj: $(srcdir)/giteststructinfo.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(giteststructinfo_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT giteststructinfo-giteststructinfo.obj -MD -MP -MF $(DEPDIR)/giteststructinfo-giteststructinfo.Tpo -c -o giteststructinfo-giteststructinfo.obj `if test -f '$(srcdir)/giteststructinfo.c'; then $(CYGPATH_W) '$(srcdir)/giteststructinfo.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/giteststructinfo.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/giteststructinfo-giteststructinfo.Tpo $(DEPDIR)/giteststructinfo-giteststructinfo.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(srcdir)/giteststructinfo.c' object='giteststructinfo-giteststructinfo.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(giteststructinfo_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o giteststructinfo-giteststructinfo.obj `if test -f '$(srcdir)/giteststructinfo.c'; then $(CYGPATH_W) '$(srcdir)/giteststructinfo.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/giteststructinfo.c'; fi` + gitestthrows-gitestthrows.o: $(srcdir)/gitestthrows.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gitestthrows_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gitestthrows-gitestthrows.o -MD -MP -MF $(DEPDIR)/gitestthrows-gitestthrows.Tpo -c -o gitestthrows-gitestthrows.o `test -f '$(srcdir)/gitestthrows.c' || echo '$(srcdir)/'`$(srcdir)/gitestthrows.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gitestthrows-gitestthrows.Tpo $(DEPDIR)/gitestthrows-gitestthrows.Po @@ -785,7 +821,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -903,6 +939,13 @@ --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) +giteststructinfo.log: giteststructinfo$(EXEEXT) + @p='giteststructinfo$(EXEEXT)'; \ + b='giteststructinfo'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) gitestthrows.log: gitestthrows$(EXEEXT) @p='gitestthrows$(EXEEXT)'; \ b='gitestthrows'; \ @@ -1087,6 +1130,8 @@ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ recheck tags tags-am uninstall uninstall-am +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru gobject-introspection-1.45.2/tests/scanner/annotationparser/gi/annotation_array.xml gobject-introspection-1.45.3/tests/scanner/annotationparser/gi/annotation_array.xml --- gobject-introspection-1.45.2/tests/scanner/annotationparser/gi/annotation_array.xml 2015-03-17 18:34:34.000000000 +0000 +++ gobject-introspection-1.45.3/tests/scanner/annotationparser/gi/annotation_array.xml 2015-07-03 11:46:48.000000000 +0000 @@ -405,6 +405,61 @@ /** + * annotation_array_fixed_size: + * @data1: (array fixed-size): a value + * @data2: (array fixed-size=a): a value + */ + + + + annotation_array_fixed_size + + + + data1 + + + array + + + + + + a value + + + data2 + + + array + + + + + + a value + + + + + 3: Warning: Test: "array" annotation option "fixed-size" needs a value + 4: Warning: Test: invalid "array" annotation option "fixed-size" value "a", must be an integer + + + /** + * annotation_array_fixed_size: + * @data1: (array fixed-size): a value + * @data2: (array fixed-size=a): a value + */ + + + + /** * g_app_launch_context_get_environment: * @arg1: (array zero-terminated): ... * @arg2: (array length): ... diff -Nru gobject-introspection-1.45.2/tests/scanner/annotationparser/gtkdoc/annotations/tester.c.xml gobject-introspection-1.45.3/tests/scanner/annotationparser/gtkdoc/annotations/tester.c.xml --- gobject-introspection-1.45.2/tests/scanner/annotationparser/gtkdoc/annotations/tester.c.xml 2014-08-04 14:37:07.000000000 +0000 +++ gobject-introspection-1.45.3/tests/scanner/annotationparser/gtkdoc/annotations/tester.c.xml 2015-07-03 11:46:48.000000000 +0000 @@ -6,6 +6,7 @@ /** * SECTION:tester * @short_description: module for gtk-doc unit test + * @stability: stable * * This file contains non-sense code for the sole purpose of testing the docs. */ @@ -19,6 +20,10 @@ short_description module for gtk-doc unit test + + stability + stable + This file contains non-sense code for the sole purpose of testing the docs. @@ -26,6 +31,7 @@ /** * SECTION:tester * @short_description: module for gtk-doc unit test + * @stability: stable * * This file contains non-sense code for the sole purpose of testing the docs. */ @@ -85,7 +91,7 @@ /** - * annotation_nullable: + * annotation_allow_none: * @uri: a uri * @label: (allow-none): an optional string, which is used in ways too * complicated to describe in a single line, making it necessary to wrap it @@ -98,7 +104,7 @@ - annotation_nullable + annotation_allow_none @@ -140,7 +146,7 @@ /** - * annotation_nullable: + * annotation_allow_none: * @uri: a uri * @label: (allow-none): an optional string, which is used in ways too * complicated to describe in a single line, making it necessary to wrap it @@ -154,6 +160,75 @@ /** + * annotation_nullable: + * @uri: a uri + * @label: (nullable): an optional string, which is used in ways too + * complicated to describe in a single line, making it necessary to wrap it + * + * Document optional parameters. + * + * Returns: (transfer full) (nullable): Returns stuff which you have to + * free after use, whose description is also rather long + */ + + + + annotation_nullable + + + + uri + a uri + + + label + + + nullable + + + an optional string, which is used in ways too + complicated to describe in a single line, making it necessary to wrap it + + + Document optional parameters. + + + returns + + + transfer + + + + + + nullable + + + Returns stuff which you have to + free after use, whose description is also rather long + + + + + /** + * annotation_nullable: + * @uri: a uri + * @label: (nullable): an optional string, which is used in ways too + * complicated to describe in a single line, making it necessary to wrap it + * + * Document optional parameters. + * + * Returns: (transfer full) (nullable): Returns stuff which you have to + * free after use, whose description is also rather long + */ + + + + /** * annotation_elementtype: * @list: (element-type GObject): list of #GObject instances to search * @@ -353,6 +428,180 @@ /** + * annotation_outparams_optional: + * @list: (out) (transfer none) (optional): a pointer to take a list, or %NULL + * + * Document optional parameters. + * + * Returns: %TRUE for success + */ + + + + annotation_outparams_optional + + + + list + + + out + + + transfer + + + + + + optional + + + a pointer to take a list, or %NULL + + + Document optional parameters. + + + returns + %TRUE for success + + + + + /** + * annotation_outparams_optional: + * @list: (out) (transfer none) (optional): a pointer to take a list, or %NULL + * + * Document optional parameters. + * + * Returns: %TRUE for success + */ + + + + /** + * annotation_outparams_nullable: + * @list: (out) (transfer none) (nullable): a pointer to take a list; but %NULL + * may also be returned + * + * Document optional parameters. + * + * Returns: %TRUE for success + */ + + + + annotation_outparams_nullable + + + + list + + + out + + + transfer + + + + + + nullable + + + a pointer to take a list; but %NULL +may also be returned + + + Document optional parameters. + + + returns + %TRUE for success + + + + + /** + * annotation_outparams_nullable: + * @list: (out) (transfer none) (nullable): a pointer to take a list; but %NULL + * may also be returned + * + * Document optional parameters. + * + * Returns: %TRUE for success + */ + + + + /** + * annotation_outparams_optional_nullable: + * @list: (out) (transfer none) (optional) (nullable): a pointer to take a + * list, or %NULL; but %NULL may also be returned in @list — isn’t that cool? + * + * Document optional parameters. + * + * Returns: %TRUE for success + */ + + + + annotation_outparams_optional_nullable + + + + list + + + out + + + transfer + + + + + + optional + + + nullable + + + a pointer to take a +list, or %NULL; but %NULL may also be returned in @list — isn’t that cool? + + + Document optional parameters. + + + returns + %TRUE for success + + + + + /** + * annotation_outparams_optional_nullable: + * @list: (out) (transfer none) (optional) (nullable): a pointer to take a + * list, or %NULL; but %NULL may also be returned in @list — isn’t that cool? + * + * Document optional parameters. + * + * Returns: %TRUE for success + */ + + + + /** * annotation_skip: (skip) * @list: a pointer to take a list * @@ -477,6 +726,138 @@ * * Documentation for this function. */ + + + + /** + * annotation_rename_to: (rename-to annotation_scope) + * + * Documentation for this function. + */ + + + + annotation_rename_to + + + rename-to + + + + + + + Documentation for this function. + + + /** + * annotation_rename_to: (rename-to annotation_scope) + * + * Documentation for this function. + */ + + + + /** + * stability_unstable: + * + * An experimental function. + * + * Stability: unstable + */ + + + + stability_unstable + + An experimental function. + + + stability + Unstable + + + + + /** + * stability_unstable: + * + * An experimental function. + * + * Stability: Unstable + */ + + + + /** + * annotation_multiline_on_function: (rename-to annotation_scope) + * (skip) + * + * Documentation for this function. + */ + + + + annotation_multiline_on_function + + + rename-to + + + + + + skip + + + + Documentation for this function. + + + /** + * annotation_multiline_on_function: (rename-to annotation_scope) (skip) + * + * Documentation for this function. + */ + + + + /** + * annotation_multiline_on_function2: + * (rename-to annotation_scope)(skip) + * + * Documentation for this function. + */ + + + + annotation_multiline_on_function2 + + + rename-to + + + + + + skip + + + + Documentation for this function. + + + /** + * annotation_multiline_on_function2: (rename-to annotation_scope) (skip) + * + * Documentation for this function. + */ diff -Nru gobject-introspection-1.45.2/tests/scanner/annotationparser/gtkdoc/bugs/tester.c.xml gobject-introspection-1.45.3/tests/scanner/annotationparser/gtkdoc/bugs/tester.c.xml --- gobject-introspection-1.45.2/tests/scanner/annotationparser/gtkdoc/bugs/tester.c.xml 2014-08-04 14:37:07.000000000 +0000 +++ gobject-introspection-1.45.3/tests/scanner/annotationparser/gtkdoc/bugs/tester.c.xml 2015-07-03 11:46:48.000000000 +0000 @@ -973,6 +973,8 @@ * bug_624001a: * * http://bugzilla.gnome.org/show_bug.cgi?id=624001 + * + * Deprecated: Use main() instead. */ @@ -980,12 +982,20 @@ bug_624001a http://bugzilla.gnome.org/show_bug.cgi?id=624001 + + + deprecated + Use main() instead. + + /** * bug_624001a: * * http://bugzilla.gnome.org/show_bug.cgi?id=624001 + * + * Deprecated: Use main() instead. */ @@ -994,6 +1004,8 @@ * bug_624001b: * * http://bugzilla.gnome.org/show_bug.cgi?id=624001 + * + * Deprecated: Use main() instead. */ @@ -1001,12 +1013,20 @@ bug_624001b http://bugzilla.gnome.org/show_bug.cgi?id=624001 + + + deprecated + Use main() instead. + + /** * bug_624001b: * * http://bugzilla.gnome.org/show_bug.cgi?id=624001 + * + * Deprecated: Use main() instead. */ @@ -1015,6 +1035,8 @@ * bug_624001c: * * http://bugzilla.gnome.org/show_bug.cgi?id=624001 + * + * Deprecated: Use main() instead. */ @@ -1022,12 +1044,20 @@ bug_624001c http://bugzilla.gnome.org/show_bug.cgi?id=624001 + + + deprecated + Use main() instead. + + /** * bug_624001c: * * http://bugzilla.gnome.org/show_bug.cgi?id=624001 + * + * Deprecated: Use main() instead. */ @@ -1036,6 +1066,8 @@ * bug_624001d: * * http://bugzilla.gnome.org/show_bug.cgi?id=624001 + * + * Deprecated: Use main() instead. */ @@ -1043,12 +1075,20 @@ bug_624001d http://bugzilla.gnome.org/show_bug.cgi?id=624001 + + + deprecated + Use main() instead. + + /** * bug_624001d: * * http://bugzilla.gnome.org/show_bug.cgi?id=624001 + * + * Deprecated: Use main() instead. */ @@ -1057,6 +1097,8 @@ * bug_624001e: * * http://bugzilla.gnome.org/show_bug.cgi?id=624001 + * + * Deprecated: Use main() instead. */ @@ -1064,12 +1106,41 @@ bug_624001e http://bugzilla.gnome.org/show_bug.cgi?id=624001 + + + deprecated + Use main() instead. + + /** * bug_624001e: * * http://bugzilla.gnome.org/show_bug.cgi?id=624001 + * + * Deprecated: Use main() instead. + */ + + + + /** + * bug_711598: + * + * http://bugzilla.gnome.org/show_bug.cgi?id=711598 + */ + + + + bug_711598 + + http://bugzilla.gnome.org/show_bug.cgi?id=711598 + + + /** + * bug_711598: + * + * http://bugzilla.gnome.org/show_bug.cgi?id=711598 */ @@ -1105,4 +1176,125 @@ */ + + /** + * bug_741941: + * @object: the object + * @par: parameter + * + * http://bugzilla.gnome.org/show_bug.cgi?id=741941 + */ + + + + bug_741941 + + + + object + the object + + + par + parameter + + + http://bugzilla.gnome.org/show_bug.cgi?id=741941 + + + /** + * bug_741941: + * @object: the object + * @par: parameter + * + * http://bugzilla.gnome.org/show_bug.cgi?id=741941 + */ + + + + red, green, + * and blue fields of a color. + **/]]> + + + + bug_732689 + + + + spec + the string specifying the color. + + + red, green, +and blue fields of a color.]]> + + + red, green, + * and blue fields of a color. + */]]> + + + + + * int timeout: the timeout. + * + * + * + * Example usage + * |[ + * echo "Hello" | foo + * ]| + * + **/]]> + + + + bug_749142 + + +int timeout: the timeout. + + + +Example usage +|[ +echo "Hello" | foo +]| +]]> + + + + * int timeout: the timeout. + * + * + * + * Example usage + * |[ + * echo "Hello" | foo + * ]| + * + */]]> + + diff -Nru gobject-introspection-1.45.2/tests/scanner/annotationparser/gtkdoc/bugs/tester.h.xml gobject-introspection-1.45.3/tests/scanner/annotationparser/gtkdoc/bugs/tester.h.xml --- gobject-introspection-1.45.2/tests/scanner/annotationparser/gtkdoc/bugs/tester.h.xml 2014-08-04 14:37:07.000000000 +0000 +++ gobject-introspection-1.45.3/tests/scanner/annotationparser/gtkdoc/bugs/tester.h.xml 2015-07-03 11:46:48.000000000 +0000 @@ -165,6 +165,35 @@ /** + * bug_411739_rettype: + * @test: field + * + * http://bugzilla.gnome.org/show_bug.cgi?id=411739 + */ + + + + bug_411739_rettype + + + + test + field + + + http://bugzilla.gnome.org/show_bug.cgi?id=411739 + + + /** + * bug_411739_rettype: + * @test: field + * + * http://bugzilla.gnome.org/show_bug.cgi?id=411739 + */ + + + + /** * Bug446648: * @BUG_446648_FOO: field * @@ -922,4 +951,66 @@ */ + + /** + * BUG_731417_DEPRECATED: + * + * https://bugzilla.gnome.org/show_bug.cgi?id=731417 + */ + + + + BUG_731417_DEPRECATED + + https://bugzilla.gnome.org/show_bug.cgi?id=731417 + + + /** + * BUG_731417_DEPRECATED: + * + * https://bugzilla.gnome.org/show_bug.cgi?id=731417 + */ + + + + /** + * Bug730658: + * @BUG_730658_CAN_READ: Can read + * @BUG_730658_CAN_WRITE: Can write + * @BUG_730658_IS_DEPRECATED: Is deprecated + * + * https://bugzilla.gnome.org/show_bug.cgi?id=730658 + */ + + + + Bug730658 + + + + BUG_730658_CAN_READ + Can read + + + BUG_730658_CAN_WRITE + Can write + + + BUG_730658_IS_DEPRECATED + Is deprecated + + + https://bugzilla.gnome.org/show_bug.cgi?id=730658 + + + /** + * Bug730658: + * @BUG_730658_CAN_READ: Can read + * @BUG_730658_CAN_WRITE: Can write + * @BUG_730658_IS_DEPRECATED: Is deprecated + * + * https://bugzilla.gnome.org/show_bug.cgi?id=730658 + */ + + diff -Nru gobject-introspection-1.45.2/tests/scanner/annotationparser/gtkdoc/empty/tester.c.xml gobject-introspection-1.45.3/tests/scanner/annotationparser/gtkdoc/empty/tester.c.xml --- gobject-introspection-1.45.2/tests/scanner/annotationparser/gtkdoc/empty/tester.c.xml 2014-08-04 14:37:07.000000000 +0000 +++ gobject-introspection-1.45.3/tests/scanner/annotationparser/gtkdoc/empty/tester.c.xml 2015-07-03 11:46:48.000000000 +0000 @@ -69,4 +69,54 @@ */ + + /** + * GtkDocTestIf: + * + * test object + */ + + + + GtkDocTestIf + + test object + + + /** + * GtkDocTestIf: + * + * test object + */ + + + + /** + * GtkDocTestIfInterface: + * @parent: parent interface type. + * + * test interface + */ + + + + GtkDocTestIfInterface + + + + parent + parent interface type. + + + test interface + + + /** + * GtkDocTestIfInterface: + * @parent: parent interface type. + * + * test interface + */ + + diff -Nru gobject-introspection-1.45.2/tests/scanner/annotationparser/gtkdoc/fail/tester.h.xml gobject-introspection-1.45.3/tests/scanner/annotationparser/gtkdoc/fail/tester.h.xml --- gobject-introspection-1.45.2/tests/scanner/annotationparser/gtkdoc/fail/tester.h.xml 2014-08-04 14:37:07.000000000 +0000 +++ gobject-introspection-1.45.3/tests/scanner/annotationparser/gtkdoc/fail/tester.h.xml 2015-07-03 11:46:48.000000000 +0000 @@ -3,7 +3,7 @@ -/** + /** * MACRO_NO_ITEM_DOCS: * * Here we document the macro but not the parameters. @@ -24,7 +24,7 @@ -/** + /** * MACRO_INCOMPLETE_DOCS: * @a: a value * @@ -53,7 +53,7 @@ -/** + /** * MACRO_UNUSED_DOCS: * @a: a value * @b: a value @@ -94,7 +94,7 @@ -/** + /** * EnumNoItemDocs: * * Here we document the enum but not the values. @@ -118,7 +118,7 @@ -/** + /** * EnumIncompleteDocs: * @ENUM_INCOMPLETE_DOCS_1: a value * @@ -147,7 +147,7 @@ -/** + /** * EnumUnusedDocs: * @ENUM_UNUSED_DOCS_1: a value * @ENUM_UNUSED_DOCS_2: a value @@ -188,7 +188,7 @@ -/** + /** * StructNoItemDocs: * * Here we document the struct but not the values. @@ -209,7 +209,7 @@ -/** + /** * StructIncompleteDocs: * @a: a value * @@ -238,7 +238,7 @@ -/** + /** * StructUnusedDocs: * @a: a value * @b: a value diff -Nru gobject-introspection-1.45.2/tests/scanner/annotationparser/gtkdoc/gobject/giface.c.xml gobject-introspection-1.45.3/tests/scanner/annotationparser/gtkdoc/gobject/giface.c.xml --- gobject-introspection-1.45.2/tests/scanner/annotationparser/gtkdoc/gobject/giface.c.xml 2014-08-04 14:37:07.000000000 +0000 +++ gobject-introspection-1.45.3/tests/scanner/annotationparser/gtkdoc/gobject/giface.c.xml 2015-07-03 11:46:48.000000000 +0000 @@ -128,6 +128,7 @@ * Configure a new instance * * Returns: %TRUE for sucess or %FALSE in case of an error + * * Since: 0.1 */ @@ -166,7 +167,7 @@ - /** + /** * GtkdocIface::itest: * @self: myself * diff -Nru gobject-introspection-1.45.2/tests/scanner/annotationparser/gtkdoc/gobject/gobject.c.xml gobject-introspection-1.45.3/tests/scanner/annotationparser/gtkdoc/gobject/gobject.c.xml --- gobject-introspection-1.45.2/tests/scanner/annotationparser/gtkdoc/gobject/gobject.c.xml 2014-08-04 14:37:07.000000000 +0000 +++ gobject-introspection-1.45.3/tests/scanner/annotationparser/gtkdoc/gobject/gobject.c.xml 2015-07-03 11:46:48.000000000 +0000 @@ -10,6 +10,22 @@ * @see_also: #GtkdocIface * @Image: object.png * + * > Two line + * > quote + * + * Offsets are time values to be added to local + * time to get Coordinated Universal Time (UTC) and should be + * "[±]hh[[:]mm[:ss]]". Dates are either + * "Jn" (Julian day with n between 1 and 365, leap + * years not counted), "n" (zero-based Julian day + * with n between 0 and 365) or "Mm.w.d" (day d + * (0 <= d <= 6) of week w (1 <= w <= 5) of month m (1 <= m <= 12), day + * 0 is a Sunday). Times are in local wall clock time, the default is + * 02:00:00. + * + * lang_COUNTRY@MODIFIER + * lang_COUNTRY\@MODIFIER + * * This file contains non-sense code for the sole purpose of testing the docs. * We can link to the #GtkdocObject:otest property and the #GtkdocObject::otest * signal. @@ -24,11 +40,15 @@ * GObject *myobj; * * myobj = gtkdoc_object_new(); - * // do somehing + * // do something * g_object_unref (myobj); * ]| * - * # Examples # + * # Examples # {#examples} + * + * Here are a few examples. + * + * ## Example 1 ## * * You can also change parameters: * @@ -36,12 +56,89 @@ * * * This example serves two main purposes: - * - testing conversion (long description - * follows here) + * + * - `test`ing conversion (`long description + * follows here`) + * * - catching bugs + * + * [GTK](http://www.gtk.org) ![Some image](home.png) + * * - having an example * - * Nothing more to say. + * # Discussion + * + * This is a section with a heading without a trailing hash mark. + * + * > Do not confuse the GtkUIManager UI Definitions described here with + * > the similarly named GtkBuilder UI + * > Definitions. + * + * > Single line quote + * + * + * + * This list is here to ensure the parsing of the above list + * + * + * Doesn't change it. + * + * + * + * This example serves two main purposes: + * + * * testing alternate list syntax + * + * Don't match this as a link [ style | binding ][ : priority ] + * + * * not sure if we want this one + * + * A link + * + * An embedded docbook section + * Some stuff + * + * - A list + * + * - that is not recognised as markdown + * + * + * + * # Coda # {#this-is-an-id-tag} + * + * - One + * - Two + * - Three + * + * 1. This is a ordered list + * + * 1. This is a code block in a list: + * |[{{!-- language="C" --!}} + * GObject *myobj; + * + * myobj = gtkdoc_object_new(); + * // do something + * g_object_unref (myobj); + * ]| + * And another: + * |[{{!-- language="C" --!}} + * GObject *myobj; + * + * myobj = gtkdoc_object_new(); + * /* do something */ + * g_object_unref (myobj); + * ]| + * + * 1. Really + * + * Has a paragraph with a [link to the examples][examples]. + * + * 1. Is + * + * Nothing more to say. Except one more link: + * + * + * */]]> @@ -66,7 +163,23 @@ object.png - Two line +> quote + +Offsets are time values to be added to local +time to get Coordinated Universal Time (UTC) and should be +"[±]hh[[:]mm[:ss]]". Dates are either +"Jn" (Julian day with n between 1 and 365, leap +years not counted), "n" (zero-based Julian day +with n between 0 and 365) or "Mm.w.d" (day d +(0 <= d <= 6) of week w (1 <= w <= 5) of month m (1 <= m <= 12), day +0 is a Sunday). Times are in local wall clock time, the default is +02:00:00. + +lang_COUNTRY@MODIFIER +lang_COUNTRY\@MODIFIER + +This file contains non-sense code for the sole purpose of testing the docs. We can link to the #GtkdocObject:otest property and the #GtkdocObject::otest signal. @@ -80,11 +193,15 @@ GObject *myobj; myobj = gtkdoc_object_new(); -// do somehing +// do something g_object_unref (myobj); ]| -# Examples # +# Examples # {#examples} + +Here are a few examples. + +## Example 1 ## You can also change parameters: @@ -92,12 +209,88 @@ This example serves two main purposes: -- testing conversion (long description - follows here) + +- `test`ing conversion (`long description + follows here`) + - catching bugs + + [GTK](http://www.gtk.org) ![Some image](home.png) + - having an example -Nothing more to say.]]> +# Discussion + +This is a section with a heading without a trailing hash mark. + +> Do not confuse the GtkUIManager UI Definitions described here with +> the similarly named GtkBuilder UI +> Definitions. + +> Single line quote + + + +This list is here to ensure the parsing of the above list + + +Doesn't change it. + + + +This example serves two main purposes: + +* testing alternate list syntax + + Don't match this as a link [ style | binding ][ : priority ] + +* not sure if we want this one + + A link + +An embedded docbook section +Some stuff + +- A list + +- that is not recognised as markdown + + + +# Coda # {#this-is-an-id-tag} + +- One +- Two +- Three + +1. This is a ordered list + +1. This is a code block in a list: + |[{{!-- language="C" --!}} + GObject *myobj; + + myobj = gtkdoc_object_new(); + // do something + g_object_unref (myobj); + ]| + And another: + |[{{!-- language="C" --!}} + GObject *myobj; + + myobj = gtkdoc_object_new(); + /* do something */ + g_object_unref (myobj); + ]| + +1. Really + + Has a paragraph with a [link to the examples][examples]. + +1. Is + +Nothing more to say. Except one more link: + +]]> Two line + * > quote + * + * Offsets are time values to be added to local + * time to get Coordinated Universal Time (UTC) and should be + * "[±]hh[[:]mm[:ss]]". Dates are either + * "Jn" (Julian day with n between 1 and 365, leap + * years not counted), "n" (zero-based Julian day + * with n between 0 and 365) or "Mm.w.d" (day d + * (0 <= d <= 6) of week w (1 <= w <= 5) of month m (1 <= m <= 12), day + * 0 is a Sunday). Times are in local wall clock time, the default is + * 02:00:00. + * + * lang_COUNTRY@MODIFIER + * lang_COUNTRY\@MODIFIER + * * This file contains non-sense code for the sole purpose of testing the docs. * We can link to the #GtkdocObject:otest property and the #GtkdocObject::otest * signal. @@ -121,11 +330,15 @@ * GObject *myobj; * * myobj = gtkdoc_object_new(); - * // do somehing + * // do something * g_object_unref (myobj); * ]| * - * # Examples # + * # Examples # {#examples} + * + * Here are a few examples. + * + * ## Example 1 ## * * You can also change parameters: * @@ -133,12 +346,88 @@ * * * This example serves two main purposes: - * - testing conversion (long description - * follows here) + * + * - `test`ing conversion (`long description + * follows here`) + * * - catching bugs + * + * [GTK](http://www.gtk.org) ![Some image](home.png) + * * - having an example * - * Nothing more to say. + * # Discussion + * + * This is a section with a heading without a trailing hash mark. + * + * > Do not confuse the GtkUIManager UI Definitions described here with + * > the similarly named GtkBuilder UI + * > Definitions. + * + * > Single line quote + * + * + * + * This list is here to ensure the parsing of the above list + * + * + * Doesn't change it. + * + * + * + * This example serves two main purposes: + * + * * testing alternate list syntax + * + * Don't match this as a link [ style | binding ][ : priority ] + * + * * not sure if we want this one + * + * A link + * + * An embedded docbook section + * Some stuff + * + * - A list + * + * - that is not recognised as markdown + * + * + * + * # Coda # {#this-is-an-id-tag} + * + * - One + * - Two + * - Three + * + * 1. This is a ordered list + * + * 1. This is a code block in a list: + * |[{{!-- language="C" --!}} + * GObject *myobj; + * + * myobj = gtkdoc_object_new(); + * // do something + * g_object_unref (myobj); + * ]| + * And another: + * |[{{!-- language="C" --!}} + * GObject *myobj; + * + * myobj = gtkdoc_object_new(); + * /* do something */ + * g_object_unref (myobj); + * ]| + * + * 1. Really + * + * Has a paragraph with a [link to the examples][examples]. + * + * 1. Is + * + * Nothing more to say. Except one more link: + * + * */]]> @@ -155,6 +444,7 @@ * ========= * * All the internal details go here or not: + * * - single item list */ @@ -182,6 +472,7 @@ ========= All the internal details go here or not: + - single item list @@ -197,11 +488,47 @@ * ========= * * All the internal details go here or not: + * * - single item list */ + /** + * SECTION:object3 + * @title: GtkdocObject3 + * @short_description: class that is mostly undocumented + * + * This file contains non-sense code for the sole purpose of testing the docs. + */ + + + + SECTION:object3 + + + + title + GtkdocObject3 + + + short_description + class that is mostly undocumented + + + This file contains non-sense code for the sole purpose of testing the docs. + + + /** + * SECTION:object3 + * @title: GtkdocObject3 + * @short_description: class that is mostly undocumented + * + * This file contains non-sense code for the sole purpose of testing the docs. + */ + + + /** + * gtkdoc_object_do_not_use: + * @self: the object + * + * Test a deprecation without additional message. + * + * Deprecated: 3.10 + */ + + + + gtkdoc_object_do_not_use + + + + self + the object + + + Test a deprecation without additional message. + + + deprecated + 3.10 + + + + + /** + * gtkdoc_object_do_not_use: + * @self: the object + * + * Test a deprecation without additional message. + * + * Deprecated: 3.10 + */ + + + + /** * GtkdocObject::otest: * @self: myself * @@ -445,7 +811,7 @@ - /** + /** * GtkdocObject::dep-otest: * @self: myself * @@ -520,7 +886,7 @@ - /** + /** * GtkdocObject::strings-changed: * * Something has happened. @@ -541,7 +907,7 @@ - /** + /** * GtkdocObject::variant-changed: * * Something has happened. @@ -562,8 +928,8 @@ - /** - * GtkdocObject:otest: + /** + * GtkdocObject:otest: (type GList(GtkdocObject2)) * * Since: 0.1 */ @@ -571,6 +937,16 @@ GtkdocObject:otest + + + type + + + + + @@ -581,14 +957,14 @@ /** - * GtkdocObject:otest: + * GtkdocObject:otest: (type GList(GtkdocObject2)) * * Since: 0.1 */ - /** + /** * GtkdocObject:dep-otest: * * Deprecated: use #GtkdocObject:otest property diff -Nru gobject-introspection-1.45.2/tests/scanner/annotationparser/gtkdoc/gobject/gobject.h.xml gobject-introspection-1.45.3/tests/scanner/annotationparser/gtkdoc/gobject/gobject.h.xml --- gobject-introspection-1.45.2/tests/scanner/annotationparser/gtkdoc/gobject/gobject.h.xml 2014-08-04 14:37:07.000000000 +0000 +++ gobject-introspection-1.45.3/tests/scanner/annotationparser/gtkdoc/gobject/gobject.h.xml 2015-07-03 11:46:48.000000000 +0000 @@ -122,6 +122,70 @@ /** + * GtkdocHelperStruct: + * @a: field + * + * GtkdocHelperStruct + */ + + + + GtkdocHelperStruct + + + + a + field + + + GtkdocHelperStruct + + + /** + * GtkdocHelperStruct: + * @a: field + * + * GtkdocHelperStruct + */ + + + + /** + * GtkdocHelperEnum: + * @GTKDOC_HELPER_ENUM_A: enum a + * @GTKDOC_HELPER_ENUM_B: enum b + * + * GtkdocHelperEnum + */ + + + + GtkdocHelperEnum + + + + GTKDOC_HELPER_ENUM_A + enum a + + + GTKDOC_HELPER_ENUM_B + enum b + + + GtkdocHelperEnum + + + /** + * GtkdocHelperEnum: + * @GTKDOC_HELPER_ENUM_A: enum a + * @GTKDOC_HELPER_ENUM_B: enum b + * + * GtkdocHelperEnum + */ + + + + /** * GTKDOC_OBJECT_MACRO_DUMMY: * @parameter_1: first arg * @parameter_2: second arg diff -Nru gobject-introspection-1.45.2/tests/scanner/annotationparser/gtkdoc/gobject/gtypes.h.xml gobject-introspection-1.45.3/tests/scanner/annotationparser/gtkdoc/gobject/gtypes.h.xml --- gobject-introspection-1.45.2/tests/scanner/annotationparser/gtkdoc/gobject/gtypes.h.xml 2014-08-04 14:37:07.000000000 +0000 +++ gobject-introspection-1.45.3/tests/scanner/annotationparser/gtkdoc/gobject/gtypes.h.xml 2015-07-03 11:46:48.000000000 +0000 @@ -7,7 +7,7 @@ * GtkdocEnum: * @GTKDOC_ENUM_V1: first * @GTKDOC_ENUM_V2: second - * Since: 0.10 + * Since: 0.5 * * Enum values for the #GtkdocEnum type. */ @@ -24,7 +24,7 @@ GTKDOC_ENUM_V2 second - Since: 0.10 + Since: 0.5 Enum values for the #GtkdocEnum type. @@ -34,12 +34,47 @@ * GtkdocEnum: * @GTKDOC_ENUM_V1: first * @GTKDOC_ENUM_V2: second - * Since: 0.10 + * Since: 0.5 * * Enum values for the #GtkdocEnum type. */ + + /** + * GtkdocEnum2: + * @GTKDOC_ENUM2_V1: first + * @GTKDOC_ENUM2_V2: second + * + * Enum values for the #GtkdocEnum2 type. + */ + + + + GtkdocEnum2 + + + + GTKDOC_ENUM2_V1 + first + + + GTKDOC_ENUM2_V2 + second + + + Enum values for the #GtkdocEnum2 type. + + + /** + * GtkdocEnum2: + * @GTKDOC_ENUM2_V1: first + * @GTKDOC_ENUM2_V2: second + * + * Enum values for the #GtkdocEnum2 type. + */ + + /** * GtkdocPlainOldData: diff -Nru gobject-introspection-1.45.2/tests/scanner/annotationparser/Makefile.am gobject-introspection-1.45.3/tests/scanner/annotationparser/Makefile.am --- gobject-introspection-1.45.2/tests/scanner/annotationparser/Makefile.am 2014-08-04 14:37:07.000000000 +0000 +++ gobject-introspection-1.45.3/tests/scanner/annotationparser/Makefile.am 2015-07-03 11:46:48.000000000 +0000 @@ -4,7 +4,7 @@ test_parser.py \ test_patterns.py -TESTS_ENVIRONMENT = builddir=$(builddir) top_builddir=$(top_builddir) srcdir=$(srcdir) top_srcdir=$(top_srcdir) \ +TESTS_ENVIRONMENT = env builddir=$(builddir) top_builddir=$(top_builddir) srcdir=$(srcdir) top_srcdir=$(top_srcdir) \ PYTHON=$(PYTHON) UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) LOG_COMPILER = $(top_srcdir)/tests/gi-tester diff -Nru gobject-introspection-1.45.2/tests/scanner/annotationparser/Makefile.in gobject-introspection-1.45.3/tests/scanner/annotationparser/Makefile.in --- gobject-introspection-1.45.2/tests/scanner/annotationparser/Makefile.in 2015-05-26 06:40:27.000000000 +0000 +++ gobject-introspection-1.45.3/tests/scanner/annotationparser/Makefile.in 2015-07-03 20:30:33.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -22,7 +22,17 @@ # module itself. # VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -85,9 +95,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/common.mk $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/build-aux/test-driver \ - README subdir = tests/scanner/annotationparser ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ @@ -97,6 +104,7 @@ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -325,6 +333,9 @@ TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ $(TEST_LOG_FLAGS) +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/build-aux/test-driver $(top_srcdir)/common.mk \ + README DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -518,7 +529,8 @@ --add-include-path=$(srcdir) \ --add-include-path=$(top_srcdir)/gir \ --add-include-path=$(builddir) \ - --add-include-path=$(top_builddir) + --add-include-path=$(top_builddir) \ + --add-include-path=$(top_builddir)/gir INTROSPECTION_COMPILER = \ env PATH=".libs:$(PATH)" \ @@ -528,7 +540,8 @@ --includedir=$(srcdir) \ --includedir=$(top_srcdir)/gir \ --includedir=$(builddir) \ - --includedir=$(top_builddir) + --includedir=$(top_builddir) \ + --includedir=$(top_builddir)/gir INTROSPECTION_DOCTOOL = \ env PATH=".libs:$(PATH)" \ @@ -542,13 +555,14 @@ --add-include-path=$(srcdir) \ --add-include-path=$(top_srcdir)/gir \ --add-include-path=$(builddir) \ - --add-include-path=$(top_builddir) + --add-include-path=$(top_builddir) \ + --add-include-path=$(top_builddir)/gir TESTS = \ test_parser.py \ test_patterns.py -TESTS_ENVIRONMENT = builddir=$(builddir) top_builddir=$(top_builddir) srcdir=$(srcdir) top_srcdir=$(top_srcdir) \ +TESTS_ENVIRONMENT = env builddir=$(builddir) top_builddir=$(top_builddir) srcdir=$(srcdir) top_srcdir=$(top_srcdir) \ PYTHON=$(PYTHON) UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) LOG_COMPILER = $(top_srcdir)/tests/gi-tester @@ -627,7 +641,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/scanner/annotationparser/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign tests/scanner/annotationparser/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -636,7 +649,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/common.mk: +$(top_srcdir)/common.mk $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -689,7 +702,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -978,6 +991,8 @@ mostlyclean-libtool pdf pdf-am ps ps-am recheck tags-am \ uninstall uninstall-am +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru gobject-introspection-1.45.2/tests/scanner/annotationparser/README gobject-introspection-1.45.3/tests/scanner/annotationparser/README --- gobject-introspection-1.45.2/tests/scanner/annotationparser/README 2014-08-04 14:37:07.000000000 +0000 +++ gobject-introspection-1.45.3/tests/scanner/annotationparser/README 2015-07-03 11:46:48.000000000 +0000 @@ -44,7 +44,6 @@ GTK-Doc tests originally taken at revision: http://git.gnome.org/browse/gtk-doc/tree/tests?id=2a6b01253fe41412172a60f26705114b953d0a95 and should be updated regularly to reflect changes in the GTK-Doc project. - - updated 2013/07/30 to 1846fc7e904f6f56b74c366d205d6bb946eac17e gobject-introspection/*.xml: GTK-Doc comment blocks specifically designed to ensure GtkDocCommentBlockParser does the diff -Nru gobject-introspection-1.45.2/tests/scanner/annotationparser/test_parser.py gobject-introspection-1.45.3/tests/scanner/annotationparser/test_parser.py --- gobject-introspection-1.45.2/tests/scanner/annotationparser/test_parser.py 2014-08-04 14:37:07.000000000 +0000 +++ gobject-introspection-1.45.3/tests/scanner/annotationparser/test_parser.py 2015-07-03 11:46:48.000000000 +0000 @@ -436,26 +436,5 @@ globals().update(_all_tests) -# Hook function for Python test loader. -def load_tests(loader, tests, pattern): - suite = unittest.TestSuite() - # add standard tests from module - suite.addTests(tests) - - # Initialize message logger - namespace = Namespace('Test', '1.0') - logger = MessageLogger.get(namespace=namespace) - logger.enable_warnings((WARNING, ERROR, FATAL)) - - # Load test cases from disc - tests_dir = os.path.dirname(os.path.abspath(__file__)) - - for name, test_case in _all_tests.iteritems(): - tests = loader.loadTestsFromTestCase(test_case) - suite.addTests(tests) - return suite - - if __name__ == '__main__': - # Run test suite unittest.main() diff -Nru gobject-introspection-1.45.2/tests/scanner/annotationparser/test_patterns.py gobject-introspection-1.45.3/tests/scanner/annotationparser/test_patterns.py --- gobject-introspection-1.45.2/tests/scanner/annotationparser/test_patterns.py 2014-08-04 14:37:07.000000000 +0000 +++ gobject-introspection-1.45.3/tests/scanner/annotationparser/test_patterns.py 2015-07-03 11:46:48.000000000 +0000 @@ -889,12 +889,11 @@ def create_test_case(tests_class_name, testcases): test_methods = {} - for (index, testcase) in enumerate(testcases): - test_method_name = 'test_%03d' % index - - test_method = create_test_method(testcase) - test_method.__name__ = test_method_name - test_methods[test_method_name] = test_method + for counter, test in enumerate(testcases): + test_name = 'test_%03d' % (counter + 1) + test_method = create_test_method(test) + test_method.__name__ = test_name + test_methods[test_name] = test_method return type(tests_class_name, (unittest.TestCase,), test_methods) @@ -914,7 +913,8 @@ ('TestTag', tag_tests), ('TestTagValueVersion', tag_value_version_tests), ('TestTagValueStability', tag_value_stability_tests)): - test_cases[name] = create_test_case(name, test_data) + test_case = create_test_case(name, test_data) + test_cases[test_case.__name__] = test_case return test_cases @@ -927,17 +927,5 @@ globals().update(_all_tests) -# Hook function for Python test loader. -def load_tests(loader, tests, pattern): - suite = unittest.TestSuite() - # add standard tests from module - suite.addTests(tests) - - for name, test_case in _all_tests.iteritems(): - tests = loader.loadTestsFromTestCase(test_case) - suite.addTests(tests) - return suite - - if __name__ == '__main__': unittest.main() diff -Nru gobject-introspection-1.45.2/tests/scanner/Makefile.am gobject-introspection-1.45.3/tests/scanner/Makefile.am --- gobject-introspection-1.45.2/tests/scanner/Makefile.am 2015-05-26 06:27:30.000000000 +0000 +++ gobject-introspection-1.45.3/tests/scanner/Makefile.am 2015-07-03 11:46:48.000000000 +0000 @@ -86,7 +86,7 @@ SLetter_1_0_gir_CFLAGS = $(GI_SCANNER_CFLAGS) SLetter_1_0_gir_INCLUDES = Gio-2.0 SLetter_1_0_gir_FILES = $(libsletter_la_SOURCES) -SLetter_1_0_gir_SCANNERFLAGS = --identifier-prefix=S --c-include="sletter.h" --warn-error +SLetter_1_0_gir_SCANNERFLAGS = $(INTROSPECTION_SCANNER_ARGS) --identifier-prefix=S --c-include="sletter.h" --warn-error GIRS += SLetter-1.0.gir Regress-1.0.gir: $(top_builddir)/Gio-2.0.gir Utility-1.0.gir libregress.la @@ -97,7 +97,7 @@ Regress_1_0_gir_INCLUDES += cairo-1.0 endif Regress_1_0_gir_FILES = $(libregress_la_SOURCES) -Regress_1_0_gir_SCANNERFLAGS = --c-include="regress.h" --warn-error +Regress_1_0_gir_SCANNERFLAGS = $(INTROSPECTION_SCANNER_ARGS) --c-include="regress.h" --warn-error GIRS += Regress-1.0.gir WarnLib-1.0.gir: $(top_builddir)/Gio-2.0.gir libwarnlib.la @@ -105,7 +105,7 @@ WarnLib_1_0_gir_CFLAGS = $(GI_SCANNER_CFLAGS) WarnLib_1_0_gir_INCLUDES = Gio-2.0 WarnLib_1_0_gir_FILES = $(libwarnlib_la_SOURCES) -WarnLib_1_0_gir_SCANNERFLAGS = --c-include="warnlib.h" --symbol-prefix=warnlib_ +WarnLib_1_0_gir_SCANNERFLAGS = $(INTROSPECTION_SCANNER_ARGS) --c-include="warnlib.h" --symbol-prefix=warnlib_ GIRS += WarnLib-1.0.gir Utility-1.0.gir: libutility.la @@ -114,7 +114,7 @@ Utility_1_0_gir_CFLAGS = $(GI_SCANNER_CFLAGS) Utility_1_0_gir_INCLUDES = GObject-2.0 Utility_1_0_gir_FILES = $(libutility_la_SOURCES) -Utility_1_0_gir_SCANNERFLAGS = --c-include="utility.h" --warn-error +Utility_1_0_gir_SCANNERFLAGS = $(INTROSPECTION_SCANNER_ARGS) --c-include="utility.h" --warn-error GIRS += Utility-1.0.gir # This one tests different --namespace and --strip-prefix @@ -124,7 +124,7 @@ GtkFrob_1_0_gir_CFLAGS = $(GI_SCANNER_CFLAGS) GtkFrob_1_0_gir_INCLUDES = GObject-2.0 GtkFrob_1_0_gir_FILES = $(libgtkfrob_la_SOURCES) -GtkFrob_1_0_gir_SCANNERFLAGS = --identifier-prefix=Gtk --symbol-prefix=gtk_frob --warn-error +GtkFrob_1_0_gir_SCANNERFLAGS = $(INTROSPECTION_SCANNER_ARGS) --identifier-prefix=Gtk --symbol-prefix=gtk_frob --warn-error GIRS += GtkFrob-1.0.gir # This tests that functions called _get_type are only matched if they have no @@ -135,7 +135,7 @@ GetType_1_0_gir_CFLAGS = $(GI_SCANNER_CFLAGS) GetType_1_0_gir_INCLUDES = GObject-2.0 GetType_1_0_gir_FILES = $(libgettype_la_SOURCES) -GetType_1_0_gir_SCANNERFLAGS = --c-include="gettype.h" --identifier-prefix=GetType --symbol-prefix=gettype +GetType_1_0_gir_SCANNERFLAGS = $(INTROSPECTION_SCANNER_ARGS) --c-include="gettype.h" --identifier-prefix=GetType --symbol-prefix=gettype GIRS += GetType-1.0.gir Typedefs-1.0.gir: libtypedefs.la @@ -144,7 +144,7 @@ Typedefs_1_0_gir_CFLAGS = $(GI_SCANNER_CFLAGS) Typedefs_1_0_gir_INCLUDES = GObject-2.0 Typedefs_1_0_gir_FILES = $(libtypedefs_la_SOURCES) -Typedefs_1_0_gir_SCANNERFLAGS = --c-include="typedefs.h" --identifier-prefix=Typedefs --symbol-prefix=typedefs +Typedefs_1_0_gir_SCANNERFLAGS = $(INTROSPECTION_SCANNER_ARGS) --c-include="typedefs.h" --identifier-prefix=Typedefs --symbol-prefix=typedefs GIRS += Typedefs-1.0.gir if !OS_WIN32 @@ -161,7 +161,7 @@ Bar_1_0_gir_CFLAGS = $(GI_SCANNER_CFLAGS) Bar_1_0_gir_INCLUDES = GObject-2.0 Bar_1_0_gir_FILES = $(barapp_SOURCES) -Bar_1_0_gir_SCANNERFLAGS = --accept-unprefixed +Bar_1_0_gir_SCANNERFLAGS = $(INTROSPECTION_SCANNER_ARGS) --accept-unprefixed GIRS += Bar-1.0.gir endif @@ -183,7 +183,6 @@ Identfilter-1.0.gir: identfilter.h $(AM_V_GEN) $(INTROSPECTION_SCANNER) $(INTROSPECTION_SCANNER_ARGS) \ - --warn-all --reparse-validate \ --namespace=Identfilter --accept-unprefixed --nsversion=1.0 --header-only \ --identifier-filter-cmd="$(PYTHON) $(srcdir)/identfilter.py" \ --output=$@ $< @@ -234,7 +233,7 @@ test_transformer.py TESTS = $(CHECKGIRS) $(CHECKDOCS) $(TYPELIBS) $(PYTESTS) -TESTS_ENVIRONMENT = srcdir=$(srcdir) top_srcdir=$(top_srcdir) builddir=$(builddir) top_builddir=$(top_builddir) \ +TESTS_ENVIRONMENT = env srcdir=$(srcdir) top_srcdir=$(top_srcdir) builddir=$(builddir) top_builddir=$(top_builddir) \ CC="$(CC)" \ PYTHON=$(PYTHON) UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) LOG_COMPILER = $(top_srcdir)/tests/gi-tester diff -Nru gobject-introspection-1.45.2/tests/scanner/Makefile.in gobject-introspection-1.45.3/tests/scanner/Makefile.in --- gobject-introspection-1.45.2/tests/scanner/Makefile.in 2015-05-26 06:40:27.000000000 +0000 +++ gobject-introspection-1.45.3/tests/scanner/Makefile.in 2015-07-03 20:30:33.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -63,7 +63,17 @@ # VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -126,10 +136,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/common.mk \ - $(top_srcdir)/Makefile.introspection $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/build-aux/depcomp \ - $(top_srcdir)/build-aux/test-driver @HAVE_CAIRO_TRUE@am__append_1 = $(CAIRO_LIBS) @HAVE_CAIRO_FALSE@am__append_2 = -D_GI_DISABLE_CAIRO @HAVE_CAIRO_TRUE@am__append_3 = $(CAIRO_CFLAGS) @@ -149,6 +155,7 @@ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -499,6 +506,10 @@ TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ $(TEST_LOG_FLAGS) DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/Makefile.introspection \ + $(top_srcdir)/build-aux/depcomp \ + $(top_srcdir)/build-aux/test-driver $(top_srcdir)/common.mk DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -715,7 +726,8 @@ --add-include-path=$(srcdir) \ --add-include-path=$(top_srcdir)/gir \ --add-include-path=$(builddir) \ - --add-include-path=$(top_builddir) --warn-all \ + --add-include-path=$(top_builddir) \ + --add-include-path=$(top_builddir)/gir --warn-all \ --reparse-validate INTROSPECTION_COMPILER = \ env PATH=".libs:$(PATH)" \ @@ -725,7 +737,8 @@ --includedir=$(srcdir) \ --includedir=$(top_srcdir)/gir \ --includedir=$(builddir) \ - --includedir=$(top_builddir) + --includedir=$(top_builddir) \ + --includedir=$(top_builddir)/gir INTROSPECTION_DOCTOOL = \ env PATH=".libs:$(PATH)" \ @@ -739,7 +752,8 @@ --add-include-path=$(srcdir) \ --add-include-path=$(top_srcdir)/gir \ --add-include-path=$(builddir) \ - --add-include-path=$(top_builddir) + --add-include-path=$(top_builddir) \ + --add-include-path=$(top_builddir)/gir # Private functions @@ -845,41 +859,41 @@ SLetter_1_0_gir_CFLAGS = $(GI_SCANNER_CFLAGS) SLetter_1_0_gir_INCLUDES = Gio-2.0 SLetter_1_0_gir_FILES = $(libsletter_la_SOURCES) -SLetter_1_0_gir_SCANNERFLAGS = --identifier-prefix=S --c-include="sletter.h" --warn-error +SLetter_1_0_gir_SCANNERFLAGS = $(INTROSPECTION_SCANNER_ARGS) --identifier-prefix=S --c-include="sletter.h" --warn-error Regress_1_0_gir_LIBS = libregress.la Regress_1_0_gir_CFLAGS = $(libregress_la_CPPFLAGS) $(libregress_la_CFLAGS) -include "glib.h" Regress_1_0_gir_INCLUDES = Gio-2.0 Utility-1.0 $(am__append_5) Regress_1_0_gir_FILES = $(libregress_la_SOURCES) -Regress_1_0_gir_SCANNERFLAGS = --c-include="regress.h" --warn-error +Regress_1_0_gir_SCANNERFLAGS = $(INTROSPECTION_SCANNER_ARGS) --c-include="regress.h" --warn-error WarnLib_1_0_gir_LIBS = libwarnlib.la WarnLib_1_0_gir_CFLAGS = $(GI_SCANNER_CFLAGS) WarnLib_1_0_gir_INCLUDES = Gio-2.0 WarnLib_1_0_gir_FILES = $(libwarnlib_la_SOURCES) -WarnLib_1_0_gir_SCANNERFLAGS = --c-include="warnlib.h" --symbol-prefix=warnlib_ +WarnLib_1_0_gir_SCANNERFLAGS = $(INTROSPECTION_SCANNER_ARGS) --c-include="warnlib.h" --symbol-prefix=warnlib_ Utility_1_0_gir_PACKAGES = gobject-2.0 Utility_1_0_gir_LIBS = libutility.la Utility_1_0_gir_CFLAGS = $(GI_SCANNER_CFLAGS) Utility_1_0_gir_INCLUDES = GObject-2.0 Utility_1_0_gir_FILES = $(libutility_la_SOURCES) -Utility_1_0_gir_SCANNERFLAGS = --c-include="utility.h" --warn-error +Utility_1_0_gir_SCANNERFLAGS = $(INTROSPECTION_SCANNER_ARGS) --c-include="utility.h" --warn-error GtkFrob_1_0_gir_PACKAGES = gobject-2.0 GtkFrob_1_0_gir_LIBS = libgtkfrob.la GtkFrob_1_0_gir_CFLAGS = $(GI_SCANNER_CFLAGS) GtkFrob_1_0_gir_INCLUDES = GObject-2.0 GtkFrob_1_0_gir_FILES = $(libgtkfrob_la_SOURCES) -GtkFrob_1_0_gir_SCANNERFLAGS = --identifier-prefix=Gtk --symbol-prefix=gtk_frob --warn-error +GtkFrob_1_0_gir_SCANNERFLAGS = $(INTROSPECTION_SCANNER_ARGS) --identifier-prefix=Gtk --symbol-prefix=gtk_frob --warn-error GetType_1_0_gir_PACKAGES = gobject-2.0 GetType_1_0_gir_LIBS = libgettype.la GetType_1_0_gir_CFLAGS = $(GI_SCANNER_CFLAGS) GetType_1_0_gir_INCLUDES = GObject-2.0 GetType_1_0_gir_FILES = $(libgettype_la_SOURCES) -GetType_1_0_gir_SCANNERFLAGS = --c-include="gettype.h" --identifier-prefix=GetType --symbol-prefix=gettype +GetType_1_0_gir_SCANNERFLAGS = $(INTROSPECTION_SCANNER_ARGS) --c-include="gettype.h" --identifier-prefix=GetType --symbol-prefix=gettype Typedefs_1_0_gir_PACKAGES = gobject-2.0 Typedefs_1_0_gir_LIBS = libtypedefs.la Typedefs_1_0_gir_CFLAGS = $(GI_SCANNER_CFLAGS) Typedefs_1_0_gir_INCLUDES = GObject-2.0 Typedefs_1_0_gir_FILES = $(libtypedefs_la_SOURCES) -Typedefs_1_0_gir_SCANNERFLAGS = --c-include="typedefs.h" --identifier-prefix=Typedefs --symbol-prefix=typedefs +Typedefs_1_0_gir_SCANNERFLAGS = $(INTROSPECTION_SCANNER_ARGS) --c-include="typedefs.h" --identifier-prefix=Typedefs --symbol-prefix=typedefs @OS_WIN32_FALSE@barapp_SOURCES = $(srcdir)/barapp.c $(srcdir)/barapp.h @OS_WIN32_FALSE@barapp_LDADD = $(top_builddir)/libgirepository-1.0.la @OS_WIN32_FALSE@barapp_LDFLAGS = -export-dynamic @@ -888,7 +902,7 @@ @OS_WIN32_FALSE@Bar_1_0_gir_CFLAGS = $(GI_SCANNER_CFLAGS) @OS_WIN32_FALSE@Bar_1_0_gir_INCLUDES = GObject-2.0 @OS_WIN32_FALSE@Bar_1_0_gir_FILES = $(barapp_SOURCES) -@OS_WIN32_FALSE@Bar_1_0_gir_SCANNERFLAGS = --accept-unprefixed +@OS_WIN32_FALSE@Bar_1_0_gir_SCANNERFLAGS = $(INTROSPECTION_SCANNER_ARGS) --accept-unprefixed @BUILD_DOCTOOL_TRUE@DOCGIRS = Regress-1.0.gir @BUILD_DOCTOOL_FALSE@CHECKDOCS = @BUILD_DOCTOOL_TRUE@CHECKDOCS = $(DOCGIRS:.gir=-C) $(DOCGIRS:.gir=-Python) $(DOCGIRS:.gir=-Gjs) $(DOCGIRS:.gir=-sections.txt) @@ -899,7 +913,7 @@ test_sourcescanner.py \ test_transformer.py -TESTS_ENVIRONMENT = srcdir=$(srcdir) top_srcdir=$(top_srcdir) builddir=$(builddir) top_builddir=$(top_builddir) \ +TESTS_ENVIRONMENT = env srcdir=$(srcdir) top_srcdir=$(top_srcdir) builddir=$(builddir) top_builddir=$(top_builddir) \ CC="$(CC)" \ PYTHON=$(PYTHON) UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) @@ -920,7 +934,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/scanner/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign tests/scanner/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -929,7 +942,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/common.mk $(top_srcdir)/Makefile.introspection: +$(top_srcdir)/common.mk $(top_srcdir)/Makefile.introspection $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -1244,7 +1257,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1730,6 +1743,8 @@ mostlyclean-libtool pdf pdf-am ps ps-am recheck tags tags-am \ uninstall uninstall-am uninstall-testsDATA +.PRECIOUS: Makefile + NULL ?= # Make sure the required variables are set, these should under normal @@ -1842,7 +1857,6 @@ Identfilter-1.0.gir: identfilter.h $(AM_V_GEN) $(INTROSPECTION_SCANNER) $(INTROSPECTION_SCANNER_ARGS) \ - --warn-all --reparse-validate \ --namespace=Identfilter --accept-unprefixed --nsversion=1.0 --header-only \ --identifier-filter-cmd="$(PYTHON) $(srcdir)/identfilter.py" \ --output=$@ $< diff -Nru gobject-introspection-1.45.2/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_return_full.page gobject-introspection-1.45.3/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_return_full.page --- gobject-introspection-1.45.2/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_return_full.page 1970-01-01 00:00:00.000000000 +0000 +++ gobject-introspection-1.45.3/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_return_full.page 2015-06-22 17:07:46.000000000 +0000 @@ -0,0 +1,38 @@ + + + + + + + void + + regress_test_callback_return_full + + RegressTestCallbackReturnFull + callback + + + + regress_test_callback_return_full + +void regress_test_callback_return_full (RegressTestCallbackReturnFull callback); + + + + + +<code>callback</code> + + + +<code>Returns</code> + + + + + diff -Nru gobject-introspection-1.45.2/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackReturnFull.page gobject-introspection-1.45.3/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackReturnFull.page --- gobject-introspection-1.45.2/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackReturnFull.page 1970-01-01 00:00:00.000000000 +0000 +++ gobject-introspection-1.45.3/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackReturnFull.page 2015-06-22 17:07:46.000000000 +0000 @@ -0,0 +1,24 @@ + + + + + + Regress.TestCallbackReturnFull + +RegressTestObj* TestCallbackReturnFull (void); + + + + + +<code>Returns</code> + + + + + diff -Nru gobject-introspection-1.45.2/tests/scanner/Regress-1.0-expected.gir gobject-introspection-1.45.3/tests/scanner/Regress-1.0-expected.gir --- gobject-introspection-1.45.2/tests/scanner/Regress-1.0-expected.gir 2015-01-20 19:54:57.000000000 +0000 +++ gobject-introspection-1.45.3/tests/scanner/Regress-1.0-expected.gir 2015-06-22 17:07:46.000000000 +0000 @@ -2391,6 +2391,12 @@ + + + + + @@ -5356,6 +5362,18 @@ + + + + + + + + + + diff -Nru gobject-introspection-1.45.2/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_return_full.page gobject-introspection-1.45.3/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_return_full.page --- gobject-introspection-1.45.2/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_return_full.page 1970-01-01 00:00:00.000000000 +0000 +++ gobject-introspection-1.45.3/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_return_full.page 2015-06-22 17:07:46.000000000 +0000 @@ -0,0 +1,36 @@ + + + + + + + void + + regress_test_callback_return_full + + Regress.TestCallbackReturnFull + callback + + + + Regress.test_callback_return_full + +function test_callback_return_full(callback: Regress.TestCallbackReturnFull): void { + // Gjs wrapper for regress_test_callback_return_full() +} + + + + + +<code>callback</code> + + + + + diff -Nru gobject-introspection-1.45.2/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackReturnFull.page gobject-introspection-1.45.3/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackReturnFull.page --- gobject-introspection-1.45.2/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackReturnFull.page 1970-01-01 00:00:00.000000000 +0000 +++ gobject-introspection-1.45.3/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackReturnFull.page 2015-06-22 17:07:46.000000000 +0000 @@ -0,0 +1,25 @@ + + + + + + Regress.TestCallbackReturnFull + +function onTestCallbackReturnFull(): Regress.TestObj { +} + + + + + +<code>Returns</code> + + + + + diff -Nru gobject-introspection-1.45.2/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_return_full.page gobject-introspection-1.45.3/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_return_full.page --- gobject-introspection-1.45.2/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_return_full.page 1970-01-01 00:00:00.000000000 +0000 +++ gobject-introspection-1.45.3/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_return_full.page 2015-06-22 17:07:46.000000000 +0000 @@ -0,0 +1,37 @@ + + + + + + + none + + regress_test_callback_return_full + + Regress.TestCallbackReturnFull + callback + + + + Regress.test_callback_return_full + +@accepts(Regress.TestCallbackReturnFull) +@returns(none) +def test_callback_return_full(callback): + # Python wrapper for regress_test_callback_return_full() + + + + + +<code>callback</code> + + + + + diff -Nru gobject-introspection-1.45.2/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackReturnFull.page gobject-introspection-1.45.3/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackReturnFull.page --- gobject-introspection-1.45.2/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackReturnFull.page 1970-01-01 00:00:00.000000000 +0000 +++ gobject-introspection-1.45.3/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackReturnFull.page 2015-06-22 17:07:46.000000000 +0000 @@ -0,0 +1,25 @@ + + + + + + Regress.TestCallbackReturnFull + +@returns(Regress.TestObj) +def on_TestCallbackReturnFull(): + + + + + +<code>Returns</code> + + + + + diff -Nru gobject-introspection-1.45.2/tests/scanner/Regress-1.0-sections-expected.txt gobject-introspection-1.45.3/tests/scanner/Regress-1.0-sections-expected.txt --- gobject-introspection-1.45.2/tests/scanner/Regress-1.0-sections-expected.txt 2014-08-10 10:18:09.000000000 +0000 +++ gobject-introspection-1.45.3/tests/scanner/Regress-1.0-sections-expected.txt 2015-06-22 17:07:46.000000000 +0000 @@ -87,6 +87,7 @@ regress_test_callback_async regress_test_callback_destroy_notify regress_test_callback_destroy_notify_no_user_data +regress_test_callback_return_full regress_test_callback_thaw_async regress_test_callback_thaw_notifications regress_test_callback_user_data diff -Nru gobject-introspection-1.45.2/tests/scanner/regress.c gobject-introspection-1.45.3/tests/scanner/regress.c --- gobject-introspection-1.45.2/tests/scanner/regress.c 2015-01-20 19:54:57.000000000 +0000 +++ gobject-introspection-1.45.3/tests/scanner/regress.c 2015-06-19 21:06:04.000000000 +0000 @@ -3438,6 +3438,20 @@ return callback(user_data); } +/** + * regress_test_callback_return_full: + * @callback: (scope call): + * + **/ +void +regress_test_callback_return_full (RegressTestCallbackReturnFull callback) +{ + RegressTestObj *obj; + + obj = callback (); + g_object_unref (obj); +} + static GSList *notified_callbacks = NULL; /** @@ -3555,9 +3569,11 @@ void regress_test_async_ready_callback (GAsyncReadyCallback callback) { + G_GNUC_BEGIN_IGNORE_DEPRECATIONS GSimpleAsyncResult *result = g_simple_async_result_new (NULL, callback, NULL, regress_test_async_ready_callback); g_simple_async_result_complete_in_idle (result); + G_GNUC_END_IGNORE_DEPRECATIONS } /** diff -Nru gobject-introspection-1.45.2/tests/scanner/regress.h gobject-introspection-1.45.3/tests/scanner/regress.h --- gobject-introspection-1.45.2/tests/scanner/regress.h 2015-01-20 19:54:57.000000000 +0000 +++ gobject-introspection-1.45.3/tests/scanner/regress.h 2015-06-18 23:38:16.000000000 +0000 @@ -1042,6 +1042,11 @@ */ typedef int (*RegressTestCallbackFull) (int foo, double bar, char *path); /** + * RegressTestCallbackReturnFull: + * Return value: (transfer full): + */ +typedef RegressTestObj *(*RegressTestCallbackReturnFull) (void); +/** * RegressTestCallbackArray: * @one: (array length=one_length): * @one_length: @@ -1076,6 +1081,9 @@ gpointer user_data); _GI_TEST_EXTERN +void regress_test_callback_return_full (RegressTestCallbackReturnFull callback); + +_GI_TEST_EXTERN int regress_test_callback_destroy_notify (RegressTestCallbackUserData callback, gpointer user_data, GDestroyNotify notify); diff -Nru gobject-introspection-1.45.2/tests/warn/Makefile.in gobject-introspection-1.45.3/tests/warn/Makefile.in --- gobject-introspection-1.45.2/tests/warn/Makefile.in 2015-05-26 06:40:27.000000000 +0000 +++ gobject-introspection-1.45.3/tests/warn/Makefile.in 2015-07-03 20:30:33.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -22,7 +22,17 @@ # module itself. # VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -85,8 +95,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/common.mk $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/build-aux/test-driver subdir = tests/warn ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ @@ -96,6 +104,7 @@ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -324,6 +333,8 @@ TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ $(TEST_LOG_FLAGS) +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/build-aux/test-driver $(top_srcdir)/common.mk DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -517,7 +528,8 @@ --add-include-path=$(srcdir) \ --add-include-path=$(top_srcdir)/gir \ --add-include-path=$(builddir) \ - --add-include-path=$(top_builddir) + --add-include-path=$(top_builddir) \ + --add-include-path=$(top_builddir)/gir INTROSPECTION_COMPILER = \ env PATH=".libs:$(PATH)" \ @@ -527,7 +539,8 @@ --includedir=$(srcdir) \ --includedir=$(top_srcdir)/gir \ --includedir=$(builddir) \ - --includedir=$(top_builddir) + --includedir=$(top_builddir) \ + --includedir=$(top_builddir)/gir INTROSPECTION_DOCTOOL = \ env PATH=".libs:$(PATH)" \ @@ -541,7 +554,8 @@ --add-include-path=$(srcdir) \ --add-include-path=$(top_srcdir)/gir \ --add-include-path=$(builddir) \ - --add-include-path=$(top_builddir) + --add-include-path=$(top_builddir) \ + --add-include-path=$(top_builddir)/gir TESTS = \ annotationparser.h \ @@ -580,7 +594,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/warn/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign tests/warn/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -589,7 +602,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/common.mk: +$(top_srcdir)/common.mk $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -642,7 +655,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1022,6 +1035,8 @@ mostlyclean-libtool pdf pdf-am ps ps-am recheck tags-am \ uninstall uninstall-am +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru gobject-introspection-1.45.2/tools/g-ir-annotation-tool.in gobject-introspection-1.45.3/tools/g-ir-annotation-tool.in --- gobject-introspection-1.45.2/tools/g-ir-annotation-tool.in 2014-08-04 14:37:07.000000000 +0000 +++ gobject-introspection-1.45.3/tools/g-ir-annotation-tool.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,55 +0,0 @@ -#!@PYTHON@ -# -*- Mode: Python -*- -# GObject-Introspection - a framework for introspecting GObject libraries -# Copyright (C) 2008 Johan Dahlin -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. -# - -import os -import sys -import __builtin__ - -if os.name == 'nt': - datadir = os.path.join(os.path.dirname(__file__), '..', 'share') -else: - datadir = "@datarootdir@" - -__builtin__.__dict__['DATADIR'] = datadir - -if 'GI_SCANNER_DEBUG' in os.environ: - def on_exception(exctype, value, tb): - print "Caught exception: %r %r" % (exctype, value) - import pdb - pdb.pm() - sys.excepthook = on_exception - -srcdir = os.getenv('UNINSTALLED_INTROSPECTION_SRCDIR', None) -if srcdir is not None: - path = srcdir -else: - # This is a private directory, we don't want to pollute the global - # namespace. - if os.name == 'nt': - # Makes g-ir-annotation-tool 'relocatable' at runtime on Windows. - path = os.path.join(os.path.dirname(__file__), '..', 'lib', 'gobject-introspection') - else: - path = os.path.join('@libdir@', 'gobject-introspection') -sys.path.insert(0, path) - -from giscanner.annotationmain import annotation_main - -sys.exit(annotation_main(sys.argv)) diff -Nru gobject-introspection-1.45.2/tools/g-ir-doc-tool.in gobject-introspection-1.45.3/tools/g-ir-doc-tool.in --- gobject-introspection-1.45.2/tools/g-ir-doc-tool.in 2014-08-04 14:37:07.000000000 +0000 +++ gobject-introspection-1.45.3/tools/g-ir-doc-tool.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,55 +0,0 @@ -#!@PYTHON@ -# -*- Mode: Python -*- -# GObject-Introspection - a framework for introspecting GObject libraries -# Copyright (C) 2008 Johan Dahlin -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. -# - -import os -import sys -import __builtin__ - -if os.name == 'nt': - datadir = os.path.join(os.path.dirname(__file__), '..', 'share') -else: - datadir = "@datarootdir@" - -__builtin__.__dict__['DATADIR'] = datadir - -if 'GI_SCANNER_DEBUG' in os.environ: - def on_exception(exctype, value, tb): - print "Caught exception: %r %r" % (exctype, value) - import pdb - pdb.pm() - sys.excepthook = on_exception - -srcdir = os.getenv('UNINSTALLED_INTROSPECTION_SRCDIR', None) -if srcdir is not None: - path = srcdir -else: - # This is a private directory, we don't want to pollute the global - # namespace. - if os.name == 'nt': - # Makes g-ir-doc-tool 'relocatable' at runtime on Windows. - path = os.path.join(os.path.dirname(__file__), '..', 'lib', 'gobject-introspection') - else: - path = os.path.join('@libdir@', 'gobject-introspection') -sys.path.insert(0, path) - -from giscanner.docmain import doc_main - -sys.exit(doc_main(sys.argv)) diff -Nru gobject-introspection-1.45.2/tools/g-ir-scanner.in gobject-introspection-1.45.3/tools/g-ir-scanner.in --- gobject-introspection-1.45.2/tools/g-ir-scanner.in 2014-08-04 14:37:07.000000000 +0000 +++ gobject-introspection-1.45.3/tools/g-ir-scanner.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,55 +0,0 @@ -#!@PYTHON@ -# -*- Mode: Python -*- -# GObject-Introspection - a framework for introspecting GObject libraries -# Copyright (C) 2008 Johan Dahlin -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. -# - -import os -import sys -import __builtin__ - -if os.name == 'nt': - datadir = os.path.join(os.path.dirname(__file__), '..', 'share') -else: - datadir = "@datarootdir@" - -__builtin__.__dict__['DATADIR'] = datadir - -if 'GI_SCANNER_DEBUG' in os.environ: - def on_exception(exctype, value, tb): - print "Caught exception: %r %r" % (exctype, value) - import pdb - pdb.pm() - sys.excepthook = on_exception - -srcdir = os.getenv('UNINSTALLED_INTROSPECTION_SRCDIR', None) -if srcdir is not None: - path = srcdir -else: - # This is a private directory, we don't want to pollute the global - # namespace. - if os.name == 'nt': - # Makes g-ir-scanner 'relocatable' at runtime on Windows. - path = os.path.join(os.path.dirname(__file__), '..', 'lib', 'gobject-introspection') - else: - path = os.path.join('@libdir@', 'gobject-introspection') -sys.path.insert(0, path) - -from giscanner.scannermain import scanner_main - -sys.exit(scanner_main(sys.argv)) diff -Nru gobject-introspection-1.45.2/tools/g-ir-tool-template.in gobject-introspection-1.45.3/tools/g-ir-tool-template.in --- gobject-introspection-1.45.2/tools/g-ir-tool-template.in 1970-01-01 00:00:00.000000000 +0000 +++ gobject-introspection-1.45.3/tools/g-ir-tool-template.in 2015-07-03 11:46:48.000000000 +0000 @@ -0,0 +1,58 @@ +#!/usr/bin/env @PYTHON@ +# -*- Mode: Python -*- +# GObject-Introspection - a framework for introspecting GObject libraries +# Copyright (C) 2008 Johan Dahlin +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301, USA. +# + +import os +import sys +import __builtin__ + + +debug = os.getenv('GI_SCANNER_DEBUG', '').split(',') +if debug: + if 'pydevd' in debug: + # http://pydev.org/manual_adv_remote_debugger.html + pydevdpath = os.getenv('PYDEVDPATH', None) + if pydevdpath is not None and os.path.isdir(pydevdpath): + sys.path.insert(0, pydevdpath) + import pydevd + pydevd.settrace() + else: + def on_exception(exctype, value, tb): + print "Caught exception: %r %r" % (exctype, value) + import pdb + pdb.pm() + sys.excepthook = on_exception + +if os.name == 'nt': + datadir = os.path.join(os.path.dirname(__file__), '..', 'share') + pylibdir = os.path.join(os.path.dirname(__file__), '..', 'lib', 'gobject-introspection') +else: + datadir = "@datarootdir@" + pylibdir = os.path.join('@libdir@', 'gobject-introspection') + +srcdir = os.getenv('UNINSTALLED_INTROSPECTION_SRCDIR', None) +if srcdir is not None: + pylibdir = srcdir + +__builtin__.__dict__['DATADIR'] = datadir +sys.path.insert(0, pylibdir) + +from giscanner.@TOOL_MODULE@ import @TOOL_FUNCTION@ +sys.exit(@TOOL_FUNCTION@(sys.argv))