summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/conf/distro/include/poky-fixed-revisions.inc5
-rw-r--r--meta/packages/gnome/gobject-introspection/configure.patch25
-rw-r--r--meta/packages/gnome/gobject-introspection/pathfix.patch37
-rw-r--r--meta/packages/gnome/gobject-introspection_git.bb6
4 files changed, 44 insertions, 29 deletions
diff --git a/meta/conf/distro/include/poky-fixed-revisions.inc b/meta/conf/distro/include/poky-fixed-revisions.inc
index 46017b94cc..1302727228 100644
--- a/meta/conf/distro/include/poky-fixed-revisions.inc
+++ b/meta/conf/distro/include/poky-fixed-revisions.inc
@@ -191,8 +191,9 @@ SRCREV_pn-gnet = "495"
191SRCREV_pn-tasks ?= "430" 191SRCREV_pn-tasks ?= "430"
192SRCREV_pn-librsvg ?= "1193" 192SRCREV_pn-librsvg ?= "1193"
193SRCREV_pn-qemugl = "d888bbc723c00d197d34a39b5b7448660ec1b1c0" 193SRCREV_pn-qemugl = "d888bbc723c00d197d34a39b5b7448660ec1b1c0"
194SRCREV_pn-gobject-introspection = "c54f10f4caef35b42229c48951ee647ef05ab557" 194SRCREV_pn-gobject-introspection = "efa7266bcf78478ce62e8dd778a4f0417bfd4d15"
195SRCREV_pn-gobject-introspection-native = "c54f10f4caef35b42229c48951ee647ef05ab557" 195#c54f10f4caef35b42229c48951ee647ef05ab557"
196SRCREV_pn-gobject-introspection-native = "efa7266bcf78478ce62e8dd778a4f0417bfd4d15"
196 197
197SRCREVMOZILLAHEADLESS ?= "f4348fd85697" 198SRCREVMOZILLAHEADLESS ?= "f4348fd85697"
198 199
diff --git a/meta/packages/gnome/gobject-introspection/configure.patch b/meta/packages/gnome/gobject-introspection/configure.patch
new file mode 100644
index 0000000000..c441799b23
--- /dev/null
+++ b/meta/packages/gnome/gobject-introspection/configure.patch
@@ -0,0 +1,25 @@
1Index: git/common.mk
2===================================================================
3--- git.orig/common.mk 2009-08-19 11:11:26.000000000 +0100
4+++ git/common.mk 2009-08-19 11:12:05.000000000 +0100
5@@ -4,7 +4,7 @@
6 UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) \
7 UNINSTALLED_INTROSPECTION_BUILDDIR=$(top_builddir)
8 SCANNER_ARGS = -v --add-include-path=$(top_builddir)/gir --add-include-path=.
9-SCANNER = $(AM_V_GEN) env LPATH=.libs $(CHECK_DEBUG) $(SCANNER_ENV) $(SCANNER_BIN) $(SCANNER_ARGS)
10+SCANNER = $(AM_V_GEN) env LPATH=.libs $(CHECK_DEBUG) $(SCANNER_ENV) g-ir-scanner $(SCANNER_ARGS)
11 SCANNER_LIBS = \
12 $(top_srcdir)/giscanner/*.py \
13 $(top_builddir)/giscanner/libgiscanner.la \
14Index: git/configure.ac
15===================================================================
16--- git.orig/configure.ac 2009-08-19 11:11:26.000000000 +0100
17+++ git/configure.ac 2009-08-19 11:11:28.000000000 +0100
18@@ -201,7 +201,6 @@
19 pyexecdir=`echo $pyexecdir | tr '\\\\' '/'`
20 ;;
21 esac
22-AM_CHECK_PYTHON_HEADERS(,AC_MSG_ERROR([Python headers not found]))
23
24 AC_CONFIG_FILES([
25 Makefile
diff --git a/meta/packages/gnome/gobject-introspection/pathfix.patch b/meta/packages/gnome/gobject-introspection/pathfix.patch
index d640ddba17..b4582e2eaa 100644
--- a/meta/packages/gnome/gobject-introspection/pathfix.patch
+++ b/meta/packages/gnome/gobject-introspection/pathfix.patch
@@ -1,22 +1,22 @@
1Index: git/gir/Makefile.am 1Index: git/gir/Makefile.am
2=================================================================== 2===================================================================
3--- git.orig/gir/Makefile.am 2009-05-12 14:37:40.000000000 +0100 3--- git.orig/gir/Makefile.am 2009-08-19 11:11:26.000000000 +0100
4+++ git/gir/Makefile.am 2009-05-12 14:37:40.000000000 +0100 4+++ git/gir/Makefile.am 2009-08-19 11:12:45.000000000 +0100
5@@ -40,7 +40,7 @@ 5@@ -41,7 +41,7 @@
6 -I$(GLIB_LIBDIR)/glib-2.0/include \ 6 -I$(GLIB_LIBDIR)/glib-2.0/include \
7 -DGETTEXT_PACKAGE=Dummy \ 7 -DGETTEXT_PACKAGE=Dummy \
8 -D__G_I18N_LIB_H__ \ 8 -D__G_I18N_LIB_H__ \
9- $(GLIB_LIBDIR)/glib-2.0/include/glibconfig.h \ 9- $(GLIB_LIBDIR)/glib-2.0/include/glibconfig.h \
10+ $(GLIB_INCLUDEDIR)/glibconfig.h \ 10+ $(GLIB_INCLUDEDIR)/glibconfig.h \
11 $(srcdir)/glib-2.0.c \ 11 $(srcdir)/glib-2.0.c \
12 -DGLIB_COMPILATION \
12 $(GLIB_INCLUDEDIR)/glib/*.h 13 $(GLIB_INCLUDEDIR)/glib/*.h
13 $(SCANNER) $(SCANNER_ARGS) \
14Index: git/giscanner/dumper.py 14Index: git/giscanner/dumper.py
15=================================================================== 15===================================================================
16--- git.orig/giscanner/dumper.py 2009-05-12 14:37:40.000000000 +0100 16--- git.orig/giscanner/dumper.py 2009-08-19 11:11:26.000000000 +0100
17+++ git/giscanner/dumper.py 2009-05-12 14:37:40.000000000 +0100 17+++ git/giscanner/dumper.py 2009-08-19 11:12:45.000000000 +0100
18@@ -79,7 +79,7 @@ 18@@ -82,7 +82,7 @@
19 self._tmpdir = tempfile.mkdtemp('', 'tmp-introspect') 19 self._tmpdir = tempfile.mkdtemp('', 'tmp-introspect', dir=os.getcwd())
20 20
21 self._compiler_cmd = os.environ.get('CC', 'gcc') 21 self._compiler_cmd = os.environ.get('CC', 'gcc')
22- self._linker_cmd = os.environ.get('LD', self._compiler_cmd) 22- self._linker_cmd = os.environ.get('LD', self._compiler_cmd)
@@ -26,9 +26,9 @@ Index: git/giscanner/dumper.py
26 self._uninst_srcdir = os.environ.get( 26 self._uninst_srcdir = os.environ.get(
27Index: git/giscanner/scannermain.py 27Index: git/giscanner/scannermain.py
28=================================================================== 28===================================================================
29--- git.orig/giscanner/scannermain.py 2009-05-12 14:37:40.000000000 +0100 29--- git.orig/giscanner/scannermain.py 2009-08-19 11:11:26.000000000 +0100
30+++ git/giscanner/scannermain.py 2009-05-12 14:37:40.000000000 +0100 30+++ git/giscanner/scannermain.py 2009-08-19 11:12:45.000000000 +0100
31@@ -282,6 +282,7 @@ 31@@ -283,6 +283,7 @@
32 shown_include_warning = False 32 shown_include_warning = False
33 for include in options.includes: 33 for include in options.includes:
34 if os.sep in include: 34 if os.sep in include:
@@ -36,18 +36,3 @@ Index: git/giscanner/scannermain.py
36 raise ValueError("Invalid include path %r" % (include, )) 36 raise ValueError("Invalid include path %r" % (include, ))
37 include_obj = Include.from_string(include) 37 include_obj = Include.from_string(include)
38 transformer.register_include(include_obj) 38 transformer.register_include(include_obj)
39Index: git/configure.ac
40===================================================================
41--- git.orig/configure.ac 2009-05-12 14:37:40.000000000 +0100
42+++ git/configure.ac 2009-05-12 14:38:01.000000000 +0100
43@@ -191,7 +191,9 @@
44 esac
45 AM_CHECK_PYTHON_HEADERS(,AC_MSG_ERROR([Python headers not found]))
46
47-SHAVE_INIT([scripts])
48+SHAVE_SAVED_LIBTOOL=$LIBTOOL
49+AC_SUBST(SHAVE_SAVED_LIBTOOL)
50+
51 AC_CONFIG_FILES([
52 Makefile
53 gir/Makefile
diff --git a/meta/packages/gnome/gobject-introspection_git.bb b/meta/packages/gnome/gobject-introspection_git.bb
index e098044ec4..9c3201cbd5 100644
--- a/meta/packages/gnome/gobject-introspection_git.bb
+++ b/meta/packages/gnome/gobject-introspection_git.bb
@@ -1,8 +1,12 @@
1SRC_URI = "git://git.gnome.org/gobject-introspection;protocol=git \ 1SRC_URI = "git://git.gnome.org/gobject-introspection;protocol=git \
2 file://configure.patch;patch=1 \
2 file://pathfix.patch;patch=1" 3 file://pathfix.patch;patch=1"
3 4
5SRC_URI_virtclass-native = "git://git.gnome.org/gobject-introspection;protocol=git \
6 file://pathfix.patch;patch=1"
7
4PV = "0.0+git${SRCREV}" 8PV = "0.0+git${SRCREV}"
5PR = "r1" 9PR = "r3"
6 10
7S = "${WORKDIR}/git" 11S = "${WORKDIR}/git"
8 12