summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome
diff options
context:
space:
mode:
authorDmitry Eremin-Solenikov <dbaryshkov@gmail.com>2011-11-15 20:58:47 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-16 17:32:46 (GMT)
commitd4a31b7ce9077ef90665480a1a4a30a2ba68707d (patch)
tree8b01ffdbc378b562a98afd2e97b82eb36f6df1d4 /meta/recipes-gnome
parent0f9c30468a4793589961e59cc07206060cacd832 (diff)
downloadpoky-d4a31b7ce9077ef90665480a1a4a30a2ba68707d.tar.gz
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. (From OE-Core rev: 04e4b3757b7ee6ed0a11e9feaee7c971a46f88ee) Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome')
-rw-r--r--meta/recipes-gnome/gnome/gobject-introspection/configure.patch27
-rw-r--r--meta/recipes-gnome/gnome/gobject-introspection/pathfix.patch27
-rw-r--r--meta/recipes-gnome/gnome/gobject-introspection/use-usr-bin-env-for-python.patch20
-rw-r--r--meta/recipes-gnome/gnome/gobject-introspection_git.bb32
4 files changed, 38 insertions, 68 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 5dcd9b0..0000000
--- a/meta/recipes-gnome/gnome/gobject-introspection/configure.patch
+++ /dev/null
@@ -1,27 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3Index: git/common.mk
4===================================================================
5--- git.orig/common.mk 2009-08-19 11:11:26.000000000 +0100
6+++ git/common.mk 2009-08-19 11:12:05.000000000 +0100
7@@ -4,7 +4,7 @@
8 UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) \
9 UNINSTALLED_INTROSPECTION_BUILDDIR=$(top_builddir)
10 SCANNER_ARGS = -v --add-include-path=$(top_builddir)/gir --add-include-path=.
11-SCANNER = $(AM_V_GEN) env LPATH=.libs $(CHECK_DEBUG) $(SCANNER_ENV) $(SCANNER_BIN) $(SCANNER_ARGS)
12+SCANNER = $(AM_V_GEN) env LPATH=.libs $(CHECK_DEBUG) $(SCANNER_ENV) g-ir-scanner $(SCANNER_ARGS)
13 SCANNER_LIBS = \
14 $(top_srcdir)/giscanner/*.py \
15 $(top_builddir)/giscanner/libgiscanner.la \
16Index: git/configure.ac
17===================================================================
18--- git.orig/configure.ac 2009-08-19 11:11:26.000000000 +0100
19+++ git/configure.ac 2009-08-19 11:11:28.000000000 +0100
20@@ -201,7 +201,6 @@
21 pyexecdir=`echo $pyexecdir | tr '\\\\' '/'`
22 ;;
23 esac
24-AM_CHECK_PYTHON_HEADERS(,AC_MSG_ERROR([Python headers not found]))
25
26 AC_CONFIG_FILES([
27 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 a96e4b1..0000000
--- a/meta/recipes-gnome/gnome/gobject-introspection/pathfix.patch
+++ /dev/null
@@ -1,27 +0,0 @@
1Upstream-Status: Pending
2
3Index: git/giscanner/dumper.py
4===================================================================
5--- git.orig/giscanner/dumper.py 2010-11-29 15:14:35.000000000 -0800
6+++ git/giscanner/dumper.py 2010-11-29 15:14:57.115747154 -0800
7@@ -82,7 +82,7 @@
8 self._tmpdir = tempfile.mkdtemp('', 'tmp-introspect', dir=os.getcwd())
9
10 self._compiler_cmd = os.environ.get('CC', 'gcc')
11- self._linker_cmd = os.environ.get('LD', self._compiler_cmd)
12+ self._linker_cmd = os.environ.get('CCLD', self._compiler_cmd)
13 self._pkgconfig_cmd = os.environ.get('PKG_CONFIG', 'pkg-config')
14
15 self._uninst_srcdir = os.environ.get(
16Index: git/giscanner/scannermain.py
17===================================================================
18--- git.orig/giscanner/scannermain.py 2010-11-29 15:14:35.000000000 -0800
19+++ git/giscanner/scannermain.py 2010-11-29 15:14:57.120747321 -0800
20@@ -283,6 +283,7 @@
21 shown_include_warning = False
22 for include in options.includes:
23 if os.sep in include:
24+ continue
25 raise ValueError("Invalid include path %r" % (include, ))
26 include_obj = Include.from_string(include)
27 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 0000000..67b8547
--- /dev/null
+++ b/meta/recipes-gnome/gnome/gobject-introspection/use-usr-bin-env-for-python.patch
@@ -0,0 +1,20 @@
1Index: gobject-introspection-0.9.10/tools/g-ir-annotation-tool.in
2===================================================================
3--- gobject-introspection-0.9.10.orig/tools/g-ir-annotation-tool.in
4+++ gobject-introspection-0.9.10/tools/g-ir-annotation-tool.in
5@@ -1,4 +1,4 @@
6-#!@PYTHON@
7+#!/usr/bin/env python
8 # -*- Mode: Python -*-
9 # GObject-Introspection - a framework for introspecting GObject libraries
10 # Copyright (C) 2008 Johan Dahlin
11Index: gobject-introspection-0.9.10/tools/g-ir-scanner.in
12===================================================================
13--- gobject-introspection-0.9.10.orig/tools/g-ir-scanner.in
14+++ gobject-introspection-0.9.10/tools/g-ir-scanner.in
15@@ -1,4 +1,4 @@
16-#!@PYTHON@
17+#!/usr/bin/env python
18 # -*- Mode: Python -*-
19 # GObject-Introspection - a framework for introspecting GObject libraries
20 # Copyright (C) 2008 Johan Dahlin
diff --git a/meta/recipes-gnome/gnome/gobject-introspection_git.bb b/meta/recipes-gnome/gnome/gobject-introspection_git.bb
index 5e37255..8352384 100644
--- a/meta/recipes-gnome/gnome/gobject-introspection_git.bb
+++ b/meta/recipes-gnome/gnome/gobject-introspection_git.bb
@@ -1,29 +1,33 @@
1SRC_URI = "git://git.gnome.org/gobject-introspection;protocol=git \ 1# NOTE: WIP! This recipe does not cross-compile atm., only -native
2 file://configure.patch \ 2DEPENDS = "glib-2.0 libffi python-native gobject-introspection-native"
3 file://pathfix.patch" 3DEPENDS_virtclass-native = "glib-2.0-native libffi-native python-native bison-native flex-native"
4BBCLASSEXTEND = "native"
4 5
5SRC_URI_virtclass-native = "git://git.gnome.org/gobject-introspection;protocol=git \ 6SRC_URI = "git://git.gnome.org/gobject-introspection;protocol=git \
6 file://pathfix.patch" 7 file://use-usr-bin-env-for-python.patch \
8"
7 9
8LICENSE = "GPLv2+ & LGPLv2+" 10LICENSE = "GPLv2+ & LGPLv2+"
9LIC_FILES_CHKSUM = "file://COPYING.tools;md5=94d55d512a9ba36caa9b7df079bae19f \ 11LIC_FILES_CHKSUM = "file://COPYING.tools;md5=94d55d512a9ba36caa9b7df079bae19f \
10 file://COPYING.lib;md5=3bf50002aefd002f49e7bb854063f7e7" 12 file://COPYING.lib;md5=3bf50002aefd002f49e7bb854063f7e7"
11 13
12SRCREV = "efa7266bcf78478ce62e8dd778a4f0417bfd4d15" 14SRCREV = "8d64bc23d2b837421ecf9c7b0e4b8d5d95ca0d21"
13PV = "0.10.8+git${SRCPV}" 15PV = "1.29.0+gitr${SRCPV}"
14PR = "r4" 16DEFAULT_PREFERENCE = "-1"
15 17
16S = "${WORKDIR}/git" 18S = "${WORKDIR}/git"
17 19
18DEPENDS = "libffi python-native gobject-introspection-native"
19DEPENDS_virtclass-native = "libffi-native python-native bison-native flex-native"
20
21inherit autotools 20inherit autotools
22 21
23TARGET_CFLAGS += "-I${STAGING_INCDIR_NATIVE}/python2.5" 22BBCLASSEXTEND = "native"
24 23
25do_configure_prepend () { 24do_configure_prepend () {
26 echo "EXTRA_DIST = " > ${S}/gtk-doc.make 25 echo "EXTRA_DIST = " > ${S}/gtk-doc.make
27} 26}
28 27
29BBCLASSEXTEND = "native" 28EXTRA_OECONF = "\
29 --disable-gtk-doc \
30 --disable-gtk-doc-html \
31 --disable-gtk-doc-pdf \
32 --disable-tests \
33"