Imported Upstream version 3.11.3

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

diff --git a/ChangeLog b/ChangeLog
index f18e7e1..1154eb4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,33 @@
+commit 7fb55f93e207378992cd9f3e0663604a4de2213f
+Author: Simon Feltman <sfeltman@src.gnome.org>
+Date:   Thu Dec 12 01:35:11 2013 -0800
+
+    Replace usage of PyGIBoxed_Type with PyGIStruct_Type
+
+    Remove empty definition of PyGIBoxed_Type and use PyGIStruct_Type
+    in its
+    place for GI_INFO_TYPE_BOXED based infos in repositories. As noted in
+    the docs: "GI_INFO_TYPE_BOXED boxed, see GIStructInfo or GIUnionInfo"
+    we can use the GIStructInfo API for boxed types because we also
+    dispatch
+    base classes on GType checks as seen in:
+    https://git.gnome.org/browse/pygobject/tree/gi/module.py?id=3.11.2#n186
+    This fixes some of the issues noted in bug 581525.
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=581525
+
+ gi/pygi-info.c | 13 +------------
+ 1 file changed, 1 insertion(+), 12 deletions(-)
+
+commit b3c85eec75c62c138c136531ebe49a33351941f0
+Author: Simon Feltman <sfeltman@src.gnome.org>
+Date:   Sun Nov 17 20:12:50 2013 -0800
+
+    configure.ac: post release version bump to 3.11.3
+
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 commit d1314af8f237a634dbfefb0a1c319f910d3d8765
 Author: Simon Feltman <sfeltman@src.gnome.org>
 Date:   Sun Nov 17 20:04:49 2013 -0800

diff --git a/NEWS b/NEWS
index 2d03292..233749a 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+3.11.3  16-Dec-2013
+        - Replace usage of PyGIBoxed_Type with PyGIStruct_Type
+          (Simon Feltman) (#581525)
+
 3.11.2  17-Nov-2013
         - gkt-demo: Change main info/source notebook into a GtkStack (Simon Feltman)
         - Add deprecation warnings and cleanup class initializer overrides (Simon Feltman) (#705810)

diff --git a/PKG-INFO b/PKG-INFO
index 767c7ed..391d9a0 100644 (file)
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: PyGObject
-Version: 3.11.2
+Version: 3.11.3
 Summary: Python bindings for GObject
 Home-page: http://www.pygtk.org/
 Author: James Henstridge
@@ -8,7 +8,7 @@ Author-email: james@daa.com.au
 Maintainer: Johan Dahlin
 Maintainer-email: johan@gnome.org
 License: GNU LGPL
-Download-url: ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/3.11/pygobject-3.11.2.tar.gz
+Download-url: ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/3.11/pygobject-3.11.3.tar.gz
 Description: Python bindings for GLib and GObject
 Platform: POSIX, Windows
 Classifier: Development Status :: 5 - Production/Stable

diff --git a/aclocal.m4 b/aclocal.m4
index 5ed8d6d..4d2e451 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1538,13 +1538,10 @@ int
 main ()
 {
   unsigned int major, minor, micro;
-  char *tmp_version;
 
   fclose (fopen ("conf.glibtest", "w"));
 
-  /* HP/UX 9 (%@#!) writes to sscanf strings */
-  tmp_version = g_strdup("$min_glib_version");
-  if (sscanf(tmp_version, "%u.%u.%u", &major, &minor, &micro) != 3) {
+  if (sscanf("$min_glib_version", "%u.%u.%u", &major, &minor, &micro) != 3) {
      printf("%s, bad version string\n", "$min_glib_version");
      exit(1);
    }

diff --git a/configure b/configure
index f305af9..28ba6a8 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 pygobject 3.11.2.
+# Generated by GNU Autoconf 2.69 for pygobject 3.11.3.
 #
 # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=pygobject>.
 #
@@ -591,8 +591,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='pygobject'
 PACKAGE_TARNAME='pygobject'
-PACKAGE_VERSION='3.11.2'
-PACKAGE_STRING='pygobject 3.11.2'
+PACKAGE_VERSION='3.11.3'
+PACKAGE_STRING='pygobject 3.11.3'
 PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=pygobject'
 PACKAGE_URL='https://live.gnome.org/PyGObject/'
 
@@ -1395,7 +1395,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 pygobject 3.11.2 to adapt to many kinds of systems.
+\`configure' configures pygobject 3.11.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1465,7 +1465,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of pygobject 3.11.2:";;
+     short | recursive ) echo "Configuration of pygobject 3.11.3:";;
    esac
   cat <<\_ACEOF
 
@@ -1600,7 +1600,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-pygobject configure 3.11.2
+pygobject configure 3.11.3
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1878,7 +1878,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 pygobject $as_me 3.11.2, which was
+It was created by pygobject $as_me 3.11.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2242,9 +2242,9 @@ $as_echo "#define PYGOBJECT_MINOR_VERSION 11" >>confdefs.h
 PYGOBJECT_MINOR_VERSION=11
 
 
-$as_echo "#define PYGOBJECT_MICRO_VERSION 2" >>confdefs.h
+$as_echo "#define PYGOBJECT_MICRO_VERSION 3" >>confdefs.h
 
-PYGOBJECT_MICRO_VERSION=2
+PYGOBJECT_MICRO_VERSION=3
 
 
 ac_config_headers="$ac_config_headers config.h"
@@ -2755,7 +2755,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='pygobject'
- VERSION='3.11.2'
+ VERSION='3.11.3'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -13402,13 +13402,10 @@ int
 main ()
 {
   unsigned int major, minor, micro;
-  char *tmp_version;
 
   fclose (fopen ("conf.glibtest", "w"));
 
-  /* HP/UX 9 (%@#!) writes to sscanf strings */
-  tmp_version = g_strdup("$min_glib_version");
-  if (sscanf(tmp_version, "%u.%u.%u", &major, &minor, &micro) != 3) {
+  if (sscanf("$min_glib_version", "%u.%u.%u", &major, &minor, &micro) != 3) {
      printf("%s, bad version string\n", "$min_glib_version");
      exit(1);
    }
@@ -15268,7 +15265,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 pygobject $as_me 3.11.2, which was
+This file was extended by pygobject $as_me 3.11.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -15335,7 +15332,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="\\
-pygobject config.status 3.11.2
+pygobject config.status 3.11.3
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

diff --git a/configure.ac b/configure.ac
index 6272452..bc09a4f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,7 @@ m4_define(python3_min_ver, 3.1)
 dnl the pygobject version number
 m4_define(pygobject_major_version, 3)
 m4_define(pygobject_minor_version, 11)
-m4_define(pygobject_micro_version, 2)
+m4_define(pygobject_micro_version, 3)
 m4_define(pygobject_version, pygobject_major_version.pygobject_minor_version.pygobject_micro_version)
 
 dnl versions of packages we require ...

diff --git a/gi/pygi-info.c b/gi/pygi-info.c
index 0dd67b7..12f756c 100644 (file)
--- a/gi/pygi-info.c
+++ b/gi/pygi-info.c
@@ -437,10 +437,8 @@ _pygi_info_new (GIBaseInfo *info)
             type = &PyGICallbackInfo_Type;
             break;
         case GI_INFO_TYPE_STRUCT:
-            type = &PyGIStructInfo_Type;
-            break;
         case GI_INFO_TYPE_BOXED:
-            type = &PyGIBoxedInfo_Type;
+            type = &PyGIStructInfo_Type;
             break;
         case GI_INFO_TYPE_ENUM:
         case GI_INFO_TYPE_FLAGS:
@@ -770,13 +768,6 @@ static PyMethodDef _PyGICallbackInfo_methods[] = {
     { NULL, NULL, 0 }
 };
 
-/* BoxedInfo */
-PYGLIB_DEFINE_TYPE ("gi.BoxedInfo", PyGIBoxedInfo_Type, PyGIBaseInfo);
-
-static PyMethodDef _PyGIBoxedInfo_methods[] = {
-    { NULL, NULL, 0 }
-};
-
 /* ErrorDomainInfo */
 PYGLIB_DEFINE_TYPE ("gi.ErrorDomainInfo", PyGIErrorDomainInfo_Type, PyGIBaseInfo);
 
@@ -2258,8 +2249,6 @@ _pygi_info_register_types (PyObject *m)
                          PyGIBaseInfo_Type);
     _PyGI_REGISTER_TYPE (m, PyGIUnionInfo_Type, UnionInfo,
                          PyGIRegisteredTypeInfo_Type);
-    _PyGI_REGISTER_TYPE (m, PyGIBoxedInfo_Type, BoxedInfo,
-                         PyGIBaseInfo_Type);
     _PyGI_REGISTER_TYPE (m, PyGIErrorDomainInfo_Type, ErrorDomainInfo,
                          PyGIBaseInfo_Type);
     _PyGI_REGISTER_TYPE (m, PyGIPropertyInfo_Type, PropertyInfo,