From ea25e6fa3f481a660c99b7c547a9edf201ccc553 Mon Sep 17 00:00:00 2001 From: DongHun Kwak Date: Wed, 12 Jul 2017 08:47:33 +0900 Subject: [PATCH] Imported Upstream version 3.4.0 Change-Id: I8a854ce739000d922c8523af3e2e8baf3b61e007 Signed-off-by: DongHun Kwak --- ChangeLog | 20 ++++++++++++++++++++ Makefile.in | 4 ++-- NEWS | 3 +++ PKG-INFO | 4 ++-- aclocal.m4 | 6 +++--- configure | 48 +++++++++++++++++++++++------------------------ configure.ac | 6 +++--- examples/Makefile.in | 2 +- gi/Makefile.in | 2 +- gi/_glib/Makefile.in | 2 +- gi/_gobject/Makefile.in | 2 +- gi/overrides/Makefile.in | 2 +- gi/repository/Makefile.in | 2 +- tests/Makefile.in | 2 +- 14 files changed, 64 insertions(+), 41 deletions(-) diff --git a/ChangeLog b/ChangeLog index 31e7256..3abad55 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,23 @@ +commit 645a9d9d4712f8f0d1b63899b309bbc97eb1f216 +Author: Martin Pitt +Date: Mon Sep 24 09:27:47 2012 +0200 + + Bump g-i dependency to 1.33.14 + + To ensure we have all the Regress test APIs that we use. + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b6f4ef327fbeaa10fd74571c3df540311834d6ae +Author: Martin Pitt +Date: Mon Sep 17 22:52:49 2012 +0200 + + post-release bump to 3.3.93 + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + commit 7e154cf01cf0ce7a8b52c45ba4db755f73b45d1d Author: Martin Pitt Date: Mon Sep 17 22:48:13 2012 +0200 diff --git a/Makefile.in b/Makefile.in index 2acf879..626c97f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.5 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -767,7 +767,7 @@ distcheck: dist *.zip*) \ unzip $(distdir).zip ;;\ esac - chmod -R a-w $(distdir); chmod a+w $(distdir) + chmod -R a-w $(distdir); chmod u+w $(distdir) mkdir $(distdir)/_build mkdir $(distdir)/_inst chmod a-w $(distdir) diff --git a/NEWS b/NEWS index 4931c99..31e214c 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,6 @@ +3.4.0 24-Sep-2012 + - Bump g-i dependency to 1.33.14 (Martin Pitt) + 3.3.92 17-Sep-2012 - [API add] Add ObjectInfo.get_abstract method (Simon Feltman) (#675581) - Add deprecation warning when setting gpointers to anything other than diff --git a/PKG-INFO b/PKG-INFO index 81634ce..bf94400 100644 --- a/PKG-INFO +++ b/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 1.0 Name: PyGObject -Version: 3.3.92 +Version: 3.4.0 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.3/pygobject-3.3.92.tar.gz +Download-url: ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/3.4/pygobject-3.4.0.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 1c87fc5..9dafc09 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.11.5 -*- Autoconf -*- +# generated automatically by aclocal 1.11.6 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, # 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, @@ -38,7 +38,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version='1.11' 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.11.5], [], +m4_if([$1], [1.11.6], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -54,7 +54,7 @@ m4_define([_AM_AUTOCONF_VERSION], []) # 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.11.5])dnl +[AM_AUTOMAKE_VERSION([1.11.6])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) diff --git a/configure b/configure index 3ad6a2e..a49d64b 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for pygobject 3.3.92. +# Generated by GNU Autoconf 2.69 for pygobject 3.4.0. # # Report bugs to . # @@ -591,8 +591,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='pygobject' PACKAGE_TARNAME='pygobject' -PACKAGE_VERSION='3.3.92' -PACKAGE_STRING='pygobject 3.3.92' +PACKAGE_VERSION='3.4.0' +PACKAGE_STRING='pygobject 3.4.0' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=pygobject' PACKAGE_URL='' @@ -1385,7 +1385,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.3.92 to adapt to many kinds of systems. +\`configure' configures pygobject 3.4.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1455,7 +1455,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of pygobject 3.3.92:";; + short | recursive ) echo "Configuration of pygobject 3.4.0:";; esac cat <<\_ACEOF @@ -1584,7 +1584,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -pygobject configure 3.3.92 +pygobject configure 3.4.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1862,7 +1862,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.3.92, which was +It was created by pygobject $as_me 3.4.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2221,14 +2221,14 @@ $as_echo "#define PYGOBJECT_MAJOR_VERSION 3" >>confdefs.h PYGOBJECT_MAJOR_VERSION=3 -$as_echo "#define PYGOBJECT_MINOR_VERSION 3" >>confdefs.h +$as_echo "#define PYGOBJECT_MINOR_VERSION 4" >>confdefs.h -PYGOBJECT_MINOR_VERSION=3 +PYGOBJECT_MINOR_VERSION=4 -$as_echo "#define PYGOBJECT_MICRO_VERSION 92" >>confdefs.h +$as_echo "#define PYGOBJECT_MICRO_VERSION 0" >>confdefs.h -PYGOBJECT_MICRO_VERSION=92 +PYGOBJECT_MICRO_VERSION=0 ac_config_headers="$ac_config_headers config.h" @@ -2739,7 +2739,7 @@ fi # Define the identity of the package. PACKAGE='pygobject' - VERSION='3.3.92' + VERSION='3.4.0' cat >>confdefs.h <<_ACEOF @@ -12130,7 +12130,7 @@ Usage: $0 [OPTIONS] Report bugs to ." lt_cl_version="\ -pygobject config.lt 3.3.92 +pygobject config.lt 3.4.0 configured by $0, generated by GNU Autoconf 2.69. Copyright (C) 2011 Free Software Foundation, Inc. @@ -15934,16 +15934,16 @@ if test -n "$GI_CFLAGS"; then 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.31.0 - gobject-introspection-1.0 >= 1.33.10 + gobject-introspection-1.0 >= 1.33.14 \""; } >&5 ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.31.0 - gobject-introspection-1.0 >= 1.33.10 + gobject-introspection-1.0 >= 1.33.14 ") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GI_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.31.0 - gobject-introspection-1.0 >= 1.33.10 + gobject-introspection-1.0 >= 1.33.14 " 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else @@ -15957,16 +15957,16 @@ if test -n "$GI_LIBS"; then 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.31.0 - gobject-introspection-1.0 >= 1.33.10 + gobject-introspection-1.0 >= 1.33.14 \""; } >&5 ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.31.0 - gobject-introspection-1.0 >= 1.33.10 + gobject-introspection-1.0 >= 1.33.14 ") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GI_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.31.0 - gobject-introspection-1.0 >= 1.33.10 + gobject-introspection-1.0 >= 1.33.14 " 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else @@ -15989,18 +15989,18 @@ else fi if test $_pkg_short_errors_supported = yes; then GI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.31.0 - gobject-introspection-1.0 >= 1.33.10 + gobject-introspection-1.0 >= 1.33.14 " 2>&1` else GI_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.31.0 - gobject-introspection-1.0 >= 1.33.10 + gobject-introspection-1.0 >= 1.33.14 " 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GI_PKG_ERRORS" >&5 as_fn_error $? "Package requirements (glib-2.0 >= 2.31.0 - gobject-introspection-1.0 >= 1.33.10 + gobject-introspection-1.0 >= 1.33.14 ) were not met: $GI_PKG_ERRORS @@ -17085,7 +17085,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.3.92, which was +This file was extended by pygobject $as_me 3.4.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17151,7 +17151,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.3.92 +pygobject config.status 3.4.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 037ddd9..879b739 100644 --- a/configure.ac +++ b/configure.ac @@ -11,12 +11,12 @@ m4_define(python3_min_ver, 3.1) dnl the pygobject version number m4_define(pygobject_major_version, 3) -m4_define(pygobject_minor_version, 3) -m4_define(pygobject_micro_version, 92) +m4_define(pygobject_minor_version, 4) +m4_define(pygobject_micro_version, 0) m4_define(pygobject_version, pygobject_major_version.pygobject_minor_version.pygobject_micro_version) dnl versions of packages we require ... -m4_define(introspection_required_version, 1.33.10) +m4_define(introspection_required_version, 1.33.14) m4_define(py2cairo_required_version, 1.2.0) m4_define(py3cairo_required_version, 1.10.0) m4_define(glib_required_version, 2.31.0) diff --git a/examples/Makefile.in b/examples/Makefile.in index 40f3c7e..26e1fd0 100644 --- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.5 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff --git a/gi/Makefile.in b/gi/Makefile.in index c3d7a4f..1bbd583 100644 --- a/gi/Makefile.in +++ b/gi/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.5 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff --git a/gi/_glib/Makefile.in b/gi/_glib/Makefile.in index 15a38b2..e87f9b2 100644 --- a/gi/_glib/Makefile.in +++ b/gi/_glib/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.5 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff --git a/gi/_gobject/Makefile.in b/gi/_gobject/Makefile.in index 4493d15..fec095b 100644 --- a/gi/_gobject/Makefile.in +++ b/gi/_gobject/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.5 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff --git a/gi/overrides/Makefile.in b/gi/overrides/Makefile.in index d00cf3f..2c78fe1 100644 --- a/gi/overrides/Makefile.in +++ b/gi/overrides/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.5 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff --git a/gi/repository/Makefile.in b/gi/repository/Makefile.in index eed39d2..b6f258b 100644 --- a/gi/repository/Makefile.in +++ b/gi/repository/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.5 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff --git a/tests/Makefile.in b/tests/Makefile.in index a80d7fd..a548741 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.5 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -- 2.7.4