Imported Upstream version 1.44.0

Change-Id: I5e36e8cab09be8505fbd3ce762e62f027a3fb8da
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>

diff --git a/Makefile-gir.am b/Makefile-gir.am
index 52f7ee3..9aca664 100644 (file)
--- a/Makefile-gir.am
+++ b/Makefile-gir.am
@@ -55,8 +55,8 @@ else
 endif
 
 # glib
-GLIB_INCLUDEDIR=$(shell pkg-config --variable=includedir glib-2.0)/glib-2.0
-GLIB_LIBDIR=$(shell pkg-config --variable=libdir glib-2.0)
+GLIB_INCLUDEDIR=$(shell "${PKG_CONFIG}" --variable=includedir glib-2.0)/glib-2.0
+GLIB_LIBDIR=$(shell "${PKG_CONFIG}" --variable=libdir glib-2.0)
 
 GLIB_LIBRARY=glib-2.0
 
@@ -92,8 +92,8 @@ GLib-2.0.gir: g-ir-scanner g-ir-compiler$(EXEEXT)
 gir/DBusGLib-1.0.typelib: GObject-2.0.gir
 
 # gobject
-GOBJECT_INCLUDEDIR=$(shell pkg-config --variable=includedir gobject-2.0)/glib-2.0
-GOBJECT_LIBDIR=$(shell pkg-config --variable=libdir gobject-2.0)
+GOBJECT_INCLUDEDIR=$(shell "${PKG_CONFIG}" --variable=includedir gobject-2.0)/glib-2.0
+GOBJECT_LIBDIR=$(shell "${PKG_CONFIG}" --variable=libdir gobject-2.0)
 
 GOBJECT_LIBRARY=gobject-2.0
 
@@ -120,8 +120,8 @@ GObject_2_0_gir_FILES = \
 BUILT_GIRSOURCES += GObject-2.0.gir
 
 # gmodule
-GMODULE_INCLUDEDIR=$(shell pkg-config --variable=includedir gmodule-2.0)/glib-2.0
-GMODULE_LIBDIR=$(shell pkg-config --variable=libdir gmodule-2.0)
+GMODULE_INCLUDEDIR=$(shell "${PKG_CONFIG}" --variable=includedir gmodule-2.0)/glib-2.0
+GMODULE_LIBDIR=$(shell "${PKG_CONFIG}" --variable=libdir gmodule-2.0)
 
 GMODULE_LIBRARY=gmodule-2.0
 
@@ -146,13 +146,13 @@ GModule_2_0_gir_FILES = $(GLIB_INCLUDEDIR)/gmodule.h \
 BUILT_GIRSOURCES += GModule-2.0.gir
 
 # gio
-GIO_INCLUDEDIR=$(shell pkg-config --variable=includedir gio-2.0)/glib-2.0
-GIO_LIBDIR=$(shell pkg-config --variable=libdir gio-2.0)
+GIO_INCLUDEDIR=$(shell "${PKG_CONFIG}" --variable=includedir gio-2.0)/glib-2.0
+GIO_LIBDIR=$(shell "${PKG_CONFIG}" --variable=libdir gio-2.0)
 
 GIO_LIBRARY=gio-2.0
 
 if HAVE_GIO_UNIX
-GIO_UNIX_HDRS=$(shell pkg-config --variable=includedir gio-unix-2.0)/gio-unix-2.0/gio/*.h
+GIO_UNIX_HDRS=$(shell "${PKG_CONFIG}" --variable=includedir gio-unix-2.0)/gio-unix-2.0/gio/*.h
 GIO_UNIX_PACKAGES = gio-unix-2.0
 else
 GIO_UNIX_HDRS=

diff --git a/Makefile.in b/Makefile.in
index 4104d42..f436f37 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1279,8 +1279,8 @@ STATIC_GIRSOURCES = \
 @WITH_GLIBSRC_TRUE@Gio_2_0_gir_DOCSRC = $(GLIBSRC)/gio/*.c
 
 # glib
-GLIB_INCLUDEDIR = $(shell pkg-config --variable=includedir glib-2.0)/glib-2.0
-GLIB_LIBDIR = $(shell pkg-config --variable=libdir glib-2.0)
+GLIB_INCLUDEDIR = $(shell "${PKG_CONFIG}" --variable=includedir glib-2.0)/glib-2.0
+GLIB_LIBDIR = $(shell "${PKG_CONFIG}" --variable=libdir glib-2.0)
 GLIB_LIBRARY = glib-2.0
 GLib_2_0_gir_LIBS = $(GLIB_LIBRARY) $(GOBJECT_LIBRARY)
 GLib_2_0_gir_SCANNERFLAGS = \
@@ -1306,8 +1306,8 @@ GLib_2_0_gir_FILES = $(GLIB_LIBDIR)/glib-2.0/include/glibconfig.h \
        $(am__append_4)
 
 # gobject
-GOBJECT_INCLUDEDIR = $(shell pkg-config --variable=includedir gobject-2.0)/glib-2.0
-GOBJECT_LIBDIR = $(shell pkg-config --variable=libdir gobject-2.0)
+GOBJECT_INCLUDEDIR = $(shell "${PKG_CONFIG}" --variable=includedir gobject-2.0)/glib-2.0
+GOBJECT_LIBDIR = $(shell "${PKG_CONFIG}" --variable=libdir gobject-2.0)
 GOBJECT_LIBRARY = gobject-2.0
 GObject_2_0_gir_LIBS = $(GOBJECT_LIBRARY)
 GObject_2_0_gir_SCANNERFLAGS = \
@@ -1331,8 +1331,8 @@ GObject_2_0_gir_FILES = \
 
 
 # gmodule
-GMODULE_INCLUDEDIR = $(shell pkg-config --variable=includedir gmodule-2.0)/glib-2.0
-GMODULE_LIBDIR = $(shell pkg-config --variable=libdir gmodule-2.0)
+GMODULE_INCLUDEDIR = $(shell "${PKG_CONFIG}" --variable=includedir gmodule-2.0)/glib-2.0
+GMODULE_LIBDIR = $(shell "${PKG_CONFIG}" --variable=libdir gmodule-2.0)
 GMODULE_LIBRARY = gmodule-2.0
 GModule_2_0_gir_LIBS = $(GMODULE_LIBRARY)
 GModule_2_0_gir_SCANNERFLAGS = \
@@ -1353,11 +1353,11 @@ GModule_2_0_gir_FILES = $(GLIB_INCLUDEDIR)/gmodule.h \
 
 
 # gio
-GIO_INCLUDEDIR = $(shell pkg-config --variable=includedir gio-2.0)/glib-2.0
-GIO_LIBDIR = $(shell pkg-config --variable=libdir gio-2.0)
+GIO_INCLUDEDIR = $(shell "${PKG_CONFIG}" --variable=includedir gio-2.0)/glib-2.0
+GIO_LIBDIR = $(shell "${PKG_CONFIG}" --variable=libdir gio-2.0)
 GIO_LIBRARY = gio-2.0
 @HAVE_GIO_UNIX_FALSE@GIO_UNIX_HDRS = 
-@HAVE_GIO_UNIX_TRUE@GIO_UNIX_HDRS = $(shell pkg-config --variable=includedir gio-unix-2.0)/gio-unix-2.0/gio/*.h
+@HAVE_GIO_UNIX_TRUE@GIO_UNIX_HDRS = $(shell "${PKG_CONFIG}" --variable=includedir gio-unix-2.0)/gio-unix-2.0/gio/*.h
 @HAVE_GIO_UNIX_FALSE@GIO_UNIX_PACKAGES = 
 @HAVE_GIO_UNIX_TRUE@GIO_UNIX_PACKAGES = gio-unix-2.0
 GIO_CINCLUDES = $(patsubst %,--c-include='%',$(shell echo $(GIO_UNIX_HDRS)))

diff --git a/config.h.win32 b/config.h.win32
index e615dfd..80dba81 100644 (file)
--- a/config.h.win32
+++ b/config.h.win32
@@ -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.43.92"
+#define PACKAGE_STRING "gojbect-introspection 1.44.0"
 
 /* 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.43.92"
+#define PACKAGE_VERSION "1.44.0"
 
 /* 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.43.92"
+#define VERSION "1.44.0"
 
 /* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a
    `char[]'. */

diff --git a/configure b/configure
index f44f6f6..7779222 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for gobject-introspection 1.43.92.
+# Generated by GNU Autoconf 2.69 for gobject-introspection 1.44.0.
 #
 # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gobject-introspection>.
 #
@@ -591,8 +591,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='gobject-introspection'
 PACKAGE_TARNAME='gobject-introspection'
-PACKAGE_VERSION='1.43.92'
-PACKAGE_STRING='gobject-introspection 1.43.92'
+PACKAGE_VERSION='1.44.0'
+PACKAGE_STRING='gobject-introspection 1.44.0'
 PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gobject-introspection'
 PACKAGE_URL=''
 
@@ -1430,7 +1430,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures gobject-introspection 1.43.92 to adapt to many kinds of systems.
+\`configure' configures gobject-introspection 1.44.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1501,7 +1501,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of gobject-introspection 1.43.92:";;
+     short | recursive ) echo "Configuration of gobject-introspection 1.44.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1655,7 +1655,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-gobject-introspection configure 1.43.92
+gobject-introspection configure 1.44.0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2207,7 +2207,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by gobject-introspection $as_me 1.43.92, which was
+It was created by gobject-introspection $as_me 1.44.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3075,7 +3075,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='gobject-introspection'
- VERSION='1.43.92'
+ VERSION='1.44.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3349,7 +3349,7 @@ AM_BACKSLASH='\'
 
 
 # Used in docs/reference/version.xml
-GI_VERSION=1.43.92
+GI_VERSION=1.44.0
 
 
 # Check for Win32
@@ -12644,12 +12644,12 @@ if test -n "$GLIB_CFLAGS"; then
     pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.43.92\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.43.92") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.44.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.44.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.43.92" 2>/dev/null`
+  pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.44.0" 2>/dev/null`
                      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -12661,12 +12661,12 @@ if test -n "$GLIB_LIBS"; then
     pkg_cv_GLIB_LIBS="$GLIB_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.43.92\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.43.92") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.44.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.44.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.43.92" 2>/dev/null`
+  pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.44.0" 2>/dev/null`
                      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -12687,14 +12687,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-               GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.43.92" 2>&1`
+               GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.44.0" 2>&1`
         else
-               GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.43.92" 2>&1`
+               GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.44.0" 2>&1`
         fi
        # Put the nasty error message in config.log where it belongs
        echo "$GLIB_PKG_ERRORS" >&5
 
-       as_fn_error $? "Package requirements (glib-2.0 >= 2.43.92) were not met:
+       as_fn_error $? "Package requirements (glib-2.0 >= 2.44.0) were not met:
 
 $GLIB_PKG_ERRORS
 
@@ -15518,7 +15518,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by gobject-introspection $as_me 1.43.92, which was
+This file was extended by gobject-introspection $as_me 1.44.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -15584,7 +15584,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-gobject-introspection config.status 1.43.92
+gobject-introspection config.status 1.44.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

diff --git a/configure.ac b/configure.ac
index 87f7db7..de3edcc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3,8 +3,8 @@
 
 dnl the gi version number
 m4_define(gi_major_version, 1)
-m4_define(gi_minor_version, 43)
-m4_define(gi_micro_version, 92)
+m4_define(gi_minor_version, 44)
+m4_define(gi_micro_version, 0)
 m4_define(gi_version, gi_major_version.gi_minor_version.gi_micro_version)
 
 AC_PREREQ([2.63])
@@ -128,7 +128,7 @@ GIR_DIR="$EXPANDED_DATADIR/$GIR_SUFFIX"
 AC_SUBST(GIR_DIR)
 AC_DEFINE_UNQUOTED(GIR_DIR, "$GIR_DIR", [Director prefix for gir installation])
 
-PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.43.92])
+PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.44.0])
 PKG_CHECK_MODULES(GOBJECT, [gobject-2.0])
 PKG_CHECK_MODULES(GMODULE, [gmodule-2.0])
 PKG_CHECK_MODULES(GIO, [gio-2.0])

diff --git a/docs/g-ir-generate.1 b/docs/g-ir-generate.1
index 9b51698..b42bc7e 100644 (file)
--- a/docs/g-ir-generate.1
+++ b/docs/g-ir-generate.1
@@ -5,7 +5,7 @@ g-ir-generate \- typelib generator
 .B g-ir-generate
 [OPTION...] FILES...
 .SH DESCRIPTION
-g-idl-generate is an GIR generator, using the repository API. It generates
+g-ir-generate is an GIR generator, using the repository API. It generates
 GIR files from a raw typelib or in a shared library (--shlib).
 The output will be written to standard output unless the --output 
 is specified.

diff --git a/docs/reference/html/index.html b/docs/reference/html/index.html
index 9061906..c983a13 100644 (file)
--- a/docs/reference/html/index.html
+++ b/docs/reference/html/index.html
@@ -15,7 +15,7 @@
 <div>
 <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">GObject Introspection Reference Manual</p></th></tr></table></div>
 <div><p class="releaseinfo">
-      This document is for GObject Introspection version 1.43.92
+      This document is for GObject Introspection version 1.44.0
 .
       The latest version of this documentation can be found on-line at
       <a class="ulink" href="http://developer.gnome.org/gi/unstable/" target="_top">http://developer.gnome.org/gi/unstable/</a>.

diff --git a/docs/reference/version.xml b/docs/reference/version.xml
index bfa526c..372cf40 100644 (file)
--- a/docs/reference/version.xml
+++ b/docs/reference/version.xml
@@ -1 +1 @@
-1.43.92
+1.44.0

diff --git a/gir/gio-2.0.c b/gir/gio-2.0.c
index 93e376b..4ebfb7b 100644 (file)
--- a/gir/gio-2.0.c
+++ b/gir/gio-2.0.c
@@ -34412,6 +34412,9 @@
  * will be set to non-blocking mode, independent on the blocking
  * mode of the #GSocket.
  *
+ * On success, the returned #GSocket takes ownership of @fd. On failure, the
+ * caller must close @fd themselves.
+ *
  * Returns: a #GSocket or %NULL on error.
  *     Free the returned object with g_object_unref().
  * Since: 2.22

diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py
index bca4a88..b36284d 100755 (executable)
--- a/giscanner/scannermain.py
+++ b/giscanner/scannermain.py
@@ -280,7 +280,7 @@ def process_options(output, allowed_flags):
 
 
 def process_packages(options, packages):
-    args = ['pkg-config', '--cflags']
+    args = [os.environ.get('PKG_CONFIG', 'pkg-config'), '--cflags']
     args.extend(packages)
     output = subprocess.Popen(args,
                               stdout=subprocess.PIPE).communicate()[0]

diff --git a/gobject-introspection-1.0.pc b/gobject-introspection-1.0.pc
index 502fa80..0f118de 100644 (file)
--- a/gobject-introspection-1.0.pc
+++ b/gobject-introspection-1.0.pc
@@ -21,4 +21,4 @@ Libs.private:
 
 Name: gobject-introspection
 Description: GObject Introspection
-Version: 1.43.92
+Version: 1.44.0

diff --git a/gobject-introspection-no-export-1.0.pc b/gobject-introspection-no-export-1.0.pc
index aa7d77f..91756f8 100644 (file)
--- a/gobject-introspection-no-export-1.0.pc
+++ b/gobject-introspection-no-export-1.0.pc
@@ -20,4 +20,4 @@ Libs.private:
 
 Name: gobject-introspection
 Description: GObject Introspection
-Version: 1.43.92
+Version: 1.44.0