From 3596a7f9b310a6fccf60103dc629e2b72a46ccce Mon Sep 17 00:00:00 2001 From: DongHun Kwak Date: Wed, 12 Jul 2017 08:43:29 +0900 Subject: [PATCH] Imported Upstream version 3.16.2 Change-Id: I7c7e2546c00a06c8b07d951dee395439df270ee8 Signed-off-by: DongHun Kwak --- ChangeLog | 40 ++++++++++++++++++++++++++++++++++++++++ NEWS | 4 ++++ PKG-INFO | 4 ++-- configure | 24 ++++++++++++------------ configure.ac | 2 +- gi/overrides/__init__.py | 7 +++++++ 6 files changed, 66 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index baa36bc..89506bb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,43 @@ +commit ecb2e6c64cbc420ed8f0d8dc8d1c3f6c516d6f63 +Author: Christoph Reiter +Date: Thu Apr 23 22:03:54 2015 +0200 + + overrides: Provide _overrides_module attribute to make gst-python + overrides work again. + + gi_gst_fraction_from_value () in gst-python's gstmodule.c tries + to access + the Gst.Fraction class through + gi.repository.Gst._overrides_module.Fraction + and failed since _overrides_module was removed in revision + 149c31beced944c. + + This adds it back pointing to the proxy itself which also contains + Gst.Fraction. + + https://bugzilla.gnome.org/show_bug.cgi?id=736678#c6 + + gi/overrides/__init__.py | 7 +++++++ + 1 file changed, 7 insertions(+) + +commit eddc46202fc813f03137fcaba80090d19cc8f200 +Author: Simon Feltman +Date: Mon Apr 13 19:48:24 2015 -0700 + + configure.ac: post release version bump to 3.16.2 + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 763510d091bcb9833a3de7f9646d9a06282135da +Author: Simon Feltman +Date: Mon Apr 13 19:46:48 2015 -0700 + + release 3.16.1 + + NEWS | 4 ++++ + 1 file changed, 4 insertions(+) + commit 7291cb1f841c384f1a18cc744c8d9c6be20c48e2 Author: Simon Feltman Date: Mon Apr 13 19:33:40 2015 -0700 diff --git a/NEWS b/NEWS index 8b575ac..bb9c3a9 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,7 @@ +3.16.2 15-Jun-2015 + - overrides: Provide _overrides_module attribute + (Christoph Reiter) (#736678) + 3.16.1 13-Apr-2015 - overrides: Conditionalize touch override support in Gdk (Simon Feltman) (#747717) diff --git a/PKG-INFO b/PKG-INFO index 6f9d415..15f49bd 100644 --- a/PKG-INFO +++ b/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 1.0 Name: PyGObject -Version: 3.16.1 +Version: 3.16.2 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: Simon Feltman Maintainer-email: sfeltman@src.gnome.org License: GNU LGPL -Download-url: ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/3.16/pygobject-3.16.1.tar.gz +Download-url: ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/3.16/pygobject-3.16.2.tar.gz Description: Python bindings for GLib and GObject Platform: POSIX, Windows Classifier: Development Status :: 5 - Production/Stable diff --git a/configure b/configure index 10f4f93..f4b3c79 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.16.1. +# Generated by GNU Autoconf 2.69 for pygobject 3.16.2. # # Report bugs to . # @@ -591,8 +591,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='pygobject' PACKAGE_TARNAME='pygobject' -PACKAGE_VERSION='3.16.1' -PACKAGE_STRING='pygobject 3.16.1' +PACKAGE_VERSION='3.16.2' +PACKAGE_STRING='pygobject 3.16.2' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=pygobject' PACKAGE_URL='https://wiki.gnome.org/Projects/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.16.1 to adapt to many kinds of systems. +\`configure' configures pygobject 3.16.2 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.16.1:";; + short | recursive ) echo "Configuration of pygobject 3.16.2:";; esac cat <<\_ACEOF @@ -1603,7 +1603,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -pygobject configure 3.16.1 +pygobject configure 3.16.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1881,7 +1881,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.16.1, which was +It was created by pygobject $as_me 3.16.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2245,9 +2245,9 @@ $as_echo "#define PYGOBJECT_MINOR_VERSION 16" >>confdefs.h PYGOBJECT_MINOR_VERSION=16 -$as_echo "#define PYGOBJECT_MICRO_VERSION 1" >>confdefs.h +$as_echo "#define PYGOBJECT_MICRO_VERSION 2" >>confdefs.h -PYGOBJECT_MICRO_VERSION=1 +PYGOBJECT_MICRO_VERSION=2 ac_config_headers="$ac_config_headers config.h" @@ -2767,7 +2767,7 @@ fi # Define the identity of the package. PACKAGE='pygobject' - VERSION='3.16.1' + VERSION='3.16.2' cat >>confdefs.h <<_ACEOF @@ -15377,7 +15377,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.16.1, which was +This file was extended by pygobject $as_me 3.16.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15444,7 +15444,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.16.1 +pygobject config.status 3.16.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index b7697cf..63fd7eb 100644 --- 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, 16) -m4_define(pygobject_micro_version, 1) +m4_define(pygobject_micro_version, 2) m4_define(pygobject_version, pygobject_major_version.pygobject_minor_version.pygobject_micro_version) dnl versions of packages we require ... diff --git a/gi/overrides/__init__.py b/gi/overrides/__init__.py index 62cfd30..bc915b2 100644 --- a/gi/overrides/__init__.py +++ b/gi/overrides/__init__.py @@ -117,6 +117,13 @@ def load_overrides(introspection_module): if has_old: sys.modules[module_key] = old_module + # backwards compat: for gst-python/gstmodule.c, + # which tries to access Gst.Fraction through + # Gst._overrides_module.Fraction. We assign the proxy instead as that + # contains all overridden classes like Fraction during import anyway and + # there is no need to keep the real override module alive. + proxy._overrides_module = proxy + override_all = [] if hasattr(override_mod, "__all__"): override_all = override_mod.__all__ -- 2.7.4