diff options
| author | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2011-11-15 12:58:47 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-11-16 17:29:28 +0000 |
| commit | 04e4b3757b7ee6ed0a11e9feaee7c971a46f88ee (patch) | |
| tree | cebedec8a872830d9c2c74a541c383b2f3b8ec3a /meta/recipes-gnome/gnome/gobject-introspection | |
| parent | 5423d2fabade45974f20948a6d90a663eead209a (diff) | |
| download | openembedded-core-04e4b3757b7ee6ed0a11e9feaee7c971a46f88ee.tar.gz openembedded-core-04e4b3757b7ee6ed0a11e9feaee7c971a46f88ee.tar.bz2 openembedded-core-04e4b3757b7ee6ed0a11e9feaee7c971a46f88ee.tar.xz openembedded-core-04e4b3757b7ee6ed0a11e9feaee7c971a46f88ee.zip | |
gobject-introspection: update frome meta-oe
OE-Core uses very old version of gobject-introspection. The recipe says
0.10.8, but in reality it's GOBJECT_INTROSPECTION_0_6_3-41-gefa7266.
That version e.g. doesn't compile with python 2.7 (default in some
versions), etc.
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome/gnome/gobject-introspection')
3 files changed, 20 insertions, 54 deletions
diff --git a/meta/recipes-gnome/gnome/gobject-introspection/configure.patch b/meta/recipes-gnome/gnome/gobject-introspection/configure.patch deleted file mode 100644 index 5dcd9b025..000000000 --- a/meta/recipes-gnome/gnome/gobject-introspection/configure.patch +++ /dev/null @@ -1,27 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -Index: git/common.mk -=================================================================== ---- git.orig/common.mk 2009-08-19 11:11:26.000000000 +0100 -+++ git/common.mk 2009-08-19 11:12:05.000000000 +0100 -@@ -4,7 +4,7 @@ - UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) \ - UNINSTALLED_INTROSPECTION_BUILDDIR=$(top_builddir) - SCANNER_ARGS = -v --add-include-path=$(top_builddir)/gir --add-include-path=. --SCANNER = $(AM_V_GEN) env LPATH=.libs $(CHECK_DEBUG) $(SCANNER_ENV) $(SCANNER_BIN) $(SCANNER_ARGS) -+SCANNER = $(AM_V_GEN) env LPATH=.libs $(CHECK_DEBUG) $(SCANNER_ENV) g-ir-scanner $(SCANNER_ARGS) - SCANNER_LIBS = \ - $(top_srcdir)/giscanner/*.py \ - $(top_builddir)/giscanner/libgiscanner.la \ -Index: git/configure.ac -=================================================================== ---- git.orig/configure.ac 2009-08-19 11:11:26.000000000 +0100 -+++ git/configure.ac 2009-08-19 11:11:28.000000000 +0100 -@@ -201,7 +201,6 @@ - pyexecdir=`echo $pyexecdir | tr '\\\\' '/'` - ;; - esac --AM_CHECK_PYTHON_HEADERS(,AC_MSG_ERROR([Python headers not found])) - - AC_CONFIG_FILES([ - Makefile diff --git a/meta/recipes-gnome/gnome/gobject-introspection/pathfix.patch b/meta/recipes-gnome/gnome/gobject-introspection/pathfix.patch deleted file mode 100644 index a96e4b1a9..000000000 --- a/meta/recipes-gnome/gnome/gobject-introspection/pathfix.patch +++ /dev/null @@ -1,27 +0,0 @@ -Upstream-Status: Pending - -Index: git/giscanner/dumper.py -=================================================================== ---- git.orig/giscanner/dumper.py 2010-11-29 15:14:35.000000000 -0800 -+++ git/giscanner/dumper.py 2010-11-29 15:14:57.115747154 -0800 -@@ -82,7 +82,7 @@ - self._tmpdir = tempfile.mkdtemp('', 'tmp-introspect', dir=os.getcwd()) - - self._compiler_cmd = os.environ.get('CC', 'gcc') -- self._linker_cmd = os.environ.get('LD', self._compiler_cmd) -+ self._linker_cmd = os.environ.get('CCLD', self._compiler_cmd) - self._pkgconfig_cmd = os.environ.get('PKG_CONFIG', 'pkg-config') - - self._uninst_srcdir = os.environ.get( -Index: git/giscanner/scannermain.py -=================================================================== ---- git.orig/giscanner/scannermain.py 2010-11-29 15:14:35.000000000 -0800 -+++ git/giscanner/scannermain.py 2010-11-29 15:14:57.120747321 -0800 -@@ -283,6 +283,7 @@ - shown_include_warning = False - for include in options.includes: - if os.sep in include: -+ continue - raise ValueError("Invalid include path %r" % (include, )) - include_obj = Include.from_string(include) - transformer.register_include(include_obj) diff --git a/meta/recipes-gnome/gnome/gobject-introspection/use-usr-bin-env-for-python.patch b/meta/recipes-gnome/gnome/gobject-introspection/use-usr-bin-env-for-python.patch new file mode 100644 index 000000000..67b85470d --- /dev/null +++ b/meta/recipes-gnome/gnome/gobject-introspection/use-usr-bin-env-for-python.patch @@ -0,0 +1,20 @@ +Index: gobject-introspection-0.9.10/tools/g-ir-annotation-tool.in +=================================================================== +--- gobject-introspection-0.9.10.orig/tools/g-ir-annotation-tool.in ++++ gobject-introspection-0.9.10/tools/g-ir-annotation-tool.in +@@ -1,4 +1,4 @@ +-#!@PYTHON@ ++#!/usr/bin/env python + # -*- Mode: Python -*- + # GObject-Introspection - a framework for introspecting GObject libraries + # Copyright (C) 2008 Johan Dahlin +Index: gobject-introspection-0.9.10/tools/g-ir-scanner.in +=================================================================== +--- gobject-introspection-0.9.10.orig/tools/g-ir-scanner.in ++++ gobject-introspection-0.9.10/tools/g-ir-scanner.in +@@ -1,4 +1,4 @@ +-#!@PYTHON@ ++#!/usr/bin/env python + # -*- Mode: Python -*- + # GObject-Introspection - a framework for introspecting GObject libraries + # Copyright (C) 2008 Johan Dahlin |