diff options
Diffstat (limited to 'meta/recipes-gnome/gnome/gobject-introspection')
-rw-r--r-- | meta/recipes-gnome/gnome/gobject-introspection/configure.patch | 25 | ||||
-rw-r--r-- | meta/recipes-gnome/gnome/gobject-introspection/pathfix.patch | 38 |
2 files changed, 63 insertions, 0 deletions
diff --git a/meta/recipes-gnome/gnome/gobject-introspection/configure.patch b/meta/recipes-gnome/gnome/gobject-introspection/configure.patch new file mode 100644 index 0000000000..c441799b23 --- /dev/null +++ b/meta/recipes-gnome/gnome/gobject-introspection/configure.patch | |||
@@ -0,0 +1,25 @@ | |||
1 | Index: 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 \ | ||
14 | Index: 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/recipes-gnome/gnome/gobject-introspection/pathfix.patch b/meta/recipes-gnome/gnome/gobject-introspection/pathfix.patch new file mode 100644 index 0000000000..b4582e2eaa --- /dev/null +++ b/meta/recipes-gnome/gnome/gobject-introspection/pathfix.patch | |||
@@ -0,0 +1,38 @@ | |||
1 | Index: git/gir/Makefile.am | ||
2 | =================================================================== | ||
3 | --- git.orig/gir/Makefile.am 2009-08-19 11:11:26.000000000 +0100 | ||
4 | +++ git/gir/Makefile.am 2009-08-19 11:12:45.000000000 +0100 | ||
5 | @@ -41,7 +41,7 @@ | ||
6 | -I$(GLIB_LIBDIR)/glib-2.0/include \ | ||
7 | -DGETTEXT_PACKAGE=Dummy \ | ||
8 | -D__G_I18N_LIB_H__ \ | ||
9 | - $(GLIB_LIBDIR)/glib-2.0/include/glibconfig.h \ | ||
10 | + $(GLIB_INCLUDEDIR)/glibconfig.h \ | ||
11 | $(srcdir)/glib-2.0.c \ | ||
12 | -DGLIB_COMPILATION \ | ||
13 | $(GLIB_INCLUDEDIR)/glib/*.h | ||
14 | Index: git/giscanner/dumper.py | ||
15 | =================================================================== | ||
16 | --- git.orig/giscanner/dumper.py 2009-08-19 11:11:26.000000000 +0100 | ||
17 | +++ git/giscanner/dumper.py 2009-08-19 11:12:45.000000000 +0100 | ||
18 | @@ -82,7 +82,7 @@ | ||
19 | self._tmpdir = tempfile.mkdtemp('', 'tmp-introspect', dir=os.getcwd()) | ||
20 | |||
21 | self._compiler_cmd = os.environ.get('CC', 'gcc') | ||
22 | - self._linker_cmd = os.environ.get('LD', self._compiler_cmd) | ||
23 | + self._linker_cmd = os.environ.get('CCLD', self._compiler_cmd) | ||
24 | self._pkgconfig_cmd = os.environ.get('PKG_CONFIG', 'pkg-config') | ||
25 | |||
26 | self._uninst_srcdir = os.environ.get( | ||
27 | Index: git/giscanner/scannermain.py | ||
28 | =================================================================== | ||
29 | --- git.orig/giscanner/scannermain.py 2009-08-19 11:11:26.000000000 +0100 | ||
30 | +++ git/giscanner/scannermain.py 2009-08-19 11:12:45.000000000 +0100 | ||
31 | @@ -283,6 +283,7 @@ | ||
32 | shown_include_warning = False | ||
33 | for include in options.includes: | ||
34 | if os.sep in include: | ||
35 | + continue | ||
36 | raise ValueError("Invalid include path %r" % (include, )) | ||
37 | include_obj = Include.from_string(include) | ||
38 | transformer.register_include(include_obj) | ||