diff options
| author | Saul Wold <Saul.Wold@intel.com> | 2010-11-29 17:03:23 -0800 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-12-02 05:24:58 -0800 |
| commit | ce4d631aea08063f7b7060813af437c6fc0b3057 (patch) | |
| tree | dfcdc9ada48d0fdd5ed7cca434ba8d26a8ec172e /meta | |
| parent | 4bcba3fb12bf2ea7ac952f97a44c8881703935dd (diff) | |
| download | poky-ce4d631aea08063f7b7060813af437c6fc0b3057.tar.gz | |
gobject-introspection: Fix pathfix.patch to correct glibconfig.h location
Signed-off-by: Saul Wold <Saul.Wold@intel.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-gnome/gnome/gobject-introspection/pathfix.patch | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/meta/recipes-gnome/gnome/gobject-introspection/pathfix.patch b/meta/recipes-gnome/gnome/gobject-introspection/pathfix.patch index b4582e2eaa..472cb8622f 100644 --- a/meta/recipes-gnome/gnome/gobject-introspection/pathfix.patch +++ b/meta/recipes-gnome/gnome/gobject-introspection/pathfix.patch | |||
| @@ -1,20 +1,7 @@ | |||
| 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 | 1 | Index: git/giscanner/dumper.py |
| 15 | =================================================================== | 2 | =================================================================== |
| 16 | --- git.orig/giscanner/dumper.py 2009-08-19 11:11:26.000000000 +0100 | 3 | --- git.orig/giscanner/dumper.py 2010-11-29 15:14:35.000000000 -0800 |
| 17 | +++ git/giscanner/dumper.py 2009-08-19 11:12:45.000000000 +0100 | 4 | +++ git/giscanner/dumper.py 2010-11-29 15:14:57.115747154 -0800 |
| 18 | @@ -82,7 +82,7 @@ | 5 | @@ -82,7 +82,7 @@ |
| 19 | self._tmpdir = tempfile.mkdtemp('', 'tmp-introspect', dir=os.getcwd()) | 6 | self._tmpdir = tempfile.mkdtemp('', 'tmp-introspect', dir=os.getcwd()) |
| 20 | 7 | ||
| @@ -26,8 +13,8 @@ Index: git/giscanner/dumper.py | |||
| 26 | self._uninst_srcdir = os.environ.get( | 13 | self._uninst_srcdir = os.environ.get( |
| 27 | Index: git/giscanner/scannermain.py | 14 | Index: git/giscanner/scannermain.py |
| 28 | =================================================================== | 15 | =================================================================== |
| 29 | --- git.orig/giscanner/scannermain.py 2009-08-19 11:11:26.000000000 +0100 | 16 | --- git.orig/giscanner/scannermain.py 2010-11-29 15:14:35.000000000 -0800 |
| 30 | +++ git/giscanner/scannermain.py 2009-08-19 11:12:45.000000000 +0100 | 17 | +++ git/giscanner/scannermain.py 2010-11-29 15:14:57.120747321 -0800 |
| 31 | @@ -283,6 +283,7 @@ | 18 | @@ -283,6 +283,7 @@ |
| 32 | shown_include_warning = False | 19 | shown_include_warning = False |
| 33 | for include in options.includes: | 20 | for include in options.includes: |