mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-30 21:32:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

gobject-introspection: update frome meta-oe

Browse Source 
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>
This commit is contained in:
Dmitry Eremin-Solenikov
2011-11-15 12:58:47 -08:00
committed by Richard Purdie
parent 0f9c30468a
commit d4a31b7ce9
4 changed files with 38 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
meta/recipes-gnome/gnome/gobject-introspection/configure.patch
View File

@@ -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

27
meta/recipes-gnome/gnome/gobject-introspection/pathfix.patch
View File

@@ -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)

20
meta/recipes-gnome/gnome/gobject-introspection/use-usr-bin-env-for-python.patch Normal file
View File

@@ -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

32
meta/recipes-gnome/gnome/gobject-introspection_git.bb
View File

@@ -1,29 +1,33 @@
SRC_URI = "git://git.gnome.org/gobject-introspection;protocol=git \
file://configure.patch \
file://pathfix.patch"
# NOTE: WIP! This recipe does not cross-compile atm., only -native
DEPENDS = "glib-2.0 libffi python-native gobject-introspection-native"
DEPENDS_virtclass-native = "glib-2.0-native libffi-native python-native bison-native flex-native"
BBCLASSEXTEND = "native"
SRC_URI_virtclass-native = "git://git.gnome.org/gobject-introspection;protocol=git \
file://pathfix.patch"
SRC_URI = "git://git.gnome.org/gobject-introspection;protocol=git \
file://use-usr-bin-env-for-python.patch \
"
LICENSE = "GPLv2+ & LGPLv2+"
LIC_FILES_CHKSUM = "file://COPYING.tools;md5=94d55d512a9ba36caa9b7df079bae19f \
file://COPYING.lib;md5=3bf50002aefd002f49e7bb854063f7e7"
SRCREV = "efa7266bcf78478ce62e8dd778a4f0417bfd4d15"
PV = "0.10.8+git${SRCPV}"
PR = "r4"
SRCREV = "8d64bc23d2b837421ecf9c7b0e4b8d5d95ca0d21"
PV = "1.29.0+gitr${SRCPV}"
DEFAULT_PREFERENCE = "-1"
S = "${WORKDIR}/git"
DEPENDS = "libffi python-native gobject-introspection-native"
DEPENDS_virtclass-native = "libffi-native python-native bison-native flex-native"
inherit autotools
TARGET_CFLAGS += "-I${STAGING_INCDIR_NATIVE}/python2.5"
BBCLASSEXTEND = "native"
do_configure_prepend () {
echo "EXTRA_DIST = " > ${S}/gtk-doc.make
echo "EXTRA_DIST = " > ${S}/gtk-doc.make
}
BBCLASSEXTEND = "native"
EXTRA_OECONF = "\
--disable-gtk-doc \
--disable-gtk-doc-html \
--disable-gtk-doc-pdf \
--disable-tests \
"