diff options
| author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2016-03-09 17:02:04 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-12 22:11:18 +0000 |
| commit | 12d61ac95b6bfae60dd4a7c7239bc8b8b0bcafbb (patch) | |
| tree | edcf58ef457a7b0b2bfe90c495abd286998206d8 /meta/recipes-devtools/python/python-pygobject | |
| parent | 37b2c27b18115b5a7b0e7d46da246852d2f045ee (diff) | |
| download | openembedded-core-12d61ac95b6bfae60dd4a7c7239bc8b8b0bcafbb.tar.gz openembedded-core-12d61ac95b6bfae60dd4a7c7239bc8b8b0bcafbb.tar.bz2 openembedded-core-12d61ac95b6bfae60dd4a7c7239bc8b8b0bcafbb.zip | |
python-pygobject: update to 3.18.2
The new version of pygobject relies in gobject introspection;
this has prevented the update previously.
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/python/python-pygobject')
2 files changed, 41 insertions, 23 deletions
diff --git a/meta/recipes-devtools/python/python-pygobject/0001-configure.ac-add-sysroot-path-to-GI_DATADIR-don-t-se.patch b/meta/recipes-devtools/python/python-pygobject/0001-configure.ac-add-sysroot-path-to-GI_DATADIR-don-t-se.patch new file mode 100644 index 0000000000..a391f7e74e --- /dev/null +++ b/meta/recipes-devtools/python/python-pygobject/0001-configure.ac-add-sysroot-path-to-GI_DATADIR-don-t-se.patch @@ -0,0 +1,41 @@ +From 5e5350d730f85957a42c6d846d347d080e7dd996 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Fri, 23 Oct 2015 12:40:34 +0300 +Subject: [PATCH] configure.ac: add sysroot path to GI_DATADIR; don't set + introspection scanner and compiler paths + +Upstream-Status: Pending [review on oe-core maillist] +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + configure.ac | 8 +------- + 1 file changed, 1 insertion(+), 7 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 2c0cfbd..cfcb3bf 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -194,7 +194,7 @@ PKG_CHECK_MODULES(GI, + gobject-introspection-1.0 >= introspection_required_version + ) + +-GI_DATADIR=$($PKG_CONFIG --variable=gidatadir gobject-introspection-1.0) ++GI_DATADIR=$PKG_CONFIG_SYSROOT_DIR$($PKG_CONFIG --variable=gidatadir gobject-introspection-1.0) + AC_SUBST(GI_DATADIR) + + if test "$enable_cairo" != no; then +@@ -219,12 +219,6 @@ AC_ARG_WITH(common, + with_common=yes) + AM_CONDITIONAL(WITH_COMMON, test "$with_common" = "yes") + +-INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` +-INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` +- +-AC_SUBST(INTROSPECTION_SCANNER) +-AC_SUBST(INTROSPECTION_COMPILER) +- + # compiler warnings, errors, required cflags, and code coverage support + GNOME_COMPILE_WARNINGS([maximum]) + AC_MSG_CHECKING(for Gnome code coverage support) +-- +2.1.4 + diff --git a/meta/recipes-devtools/python/python-pygobject/obsolete_automake_macros.patch b/meta/recipes-devtools/python/python-pygobject/obsolete_automake_macros.patch deleted file mode 100644 index c2591123b3..0000000000 --- a/meta/recipes-devtools/python/python-pygobject/obsolete_automake_macros.patch +++ /dev/null @@ -1,23 +0,0 @@ -Upstream-Status: Accepted [https://bugzilla.gnome.org/show_bug.cgi?id=691101] - -Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> -diff -Nurd pygobject-2.27.91/configure.ac pygobject-2.27.91/configure.ac ---- pygobject-2.27.91/configure.ac 2011-02-23 22:14:37.000000000 +0200 -+++ pygobject-2.27.91/configure.ac 2013-01-03 05:13:44.034949954 +0200 -@@ -35,7 +35,7 @@ - AC_DEFINE(PYGOBJECT_MICRO_VERSION, pygobject_micro_version, [pygobject micro version]) - AC_SUBST(PYGOBJECT_MICRO_VERSION, pygobject_micro_version) - --AM_CONFIG_HEADER(config.h) -+AC_CONFIG_HEADERS(config.h) - m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES(yes)]) - AM_INIT_AUTOMAKE(foreign) - AM_MAINTAINER_MODE -@@ -82,7 +82,6 @@ - m4_ifdef([LT_OUTPUT], [LT_OUTPUT]) - AC_ISC_POSIX - AC_PROG_CC --AM_PROG_CC_STDC - AM_PROG_CC_C_O - - # check that we have the minimum version of python necisary to build |