diff options
| author | Edward Hervey <bilboed@bilboed.com> | 2014-05-22 16:06:12 +0200 |
|---|---|---|
| committer | Edward Hervey <bilboed@bilboed.com> | 2014-05-25 17:53:02 +0200 |
| commit | 41f9b0f27f025cfb538828501549ecf5b1118fbf (patch) | |
| tree | a564fe18e0af93cbd9f8fbd47bb0c443ef3242b6 | |
| parent | d3d2e457391e576687a024f750120cf045b62140 (diff) | |
recipe: More updatesintrospection
| -rw-r--r-- | recipes/gobject-introspection.recipe | 3 | ||||
| -rw-r--r-- | recipes/gobject-introspection/0003-gir-More-updates-to-locate-gir-files-properly.patch | 51 |
2 files changed, 53 insertions, 1 deletions
diff --git a/recipes/gobject-introspection.recipe b/recipes/gobject-introspection.recipe index baddefa2..e05004b1 100644 --- a/recipes/gobject-introspection.recipe +++ b/recipes/gobject-introspection.recipe @@ -13,7 +13,8 @@ class Recipe(recipe.Recipe): deps = ['glib'] patches = [ 'gobject-introspection/0001-config-add-support-to-set-typelib-and-gir-installati.patch', - 'gobject-introspection/0002-pkgconfig-Properly-set-girdir-and-typelibdir.patch' + 'gobject-introspection/0002-pkgconfig-Properly-set-girdir-and-typelibdir.patch', + 'gobject-introspection/0003-gir-More-updates-to-locate-gir-files-properly.patch' ] files_bins = ['g-ir-annotation-tool', 'g-ir-compiler', 'g-ir-doc-tool', 'g-ir-generate', 'g-ir-scanner'] diff --git a/recipes/gobject-introspection/0003-gir-More-updates-to-locate-gir-files-properly.patch b/recipes/gobject-introspection/0003-gir-More-updates-to-locate-gir-files-properly.patch new file mode 100644 index 00000000..202c43cf --- /dev/null +++ b/recipes/gobject-introspection/0003-gir-More-updates-to-locate-gir-files-properly.patch @@ -0,0 +1,51 @@ +From 3afe794142b9b3763e6e999fbaa8f695095182c4 Mon Sep 17 00:00:00 2001 +From: Edward Hervey <bilboed@bilboed.com> +Date: Thu, 22 May 2014 16:04:59 +0200 +Subject: [PATCH 3/3] gir: More updates to locate gir files properly + +--- + Makefile-tools.am | 2 +- + giscanner/transformer.py | 1 + + tools/g-ir-scanner.in | 1 + + 3 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/Makefile-tools.am b/Makefile-tools.am +index 34d2a25..87b4f0f 100644 +--- a/Makefile-tools.am ++++ b/Makefile-tools.am +@@ -10,7 +10,7 @@ EXTRA_DIST += \ + tools/g-ir-annotation-tool.in \ + tools/g-ir-doc-tool.in + +-TOOL_SUBSTITUTIONS = sed -e s,@libdir\@,$(libdir), -e s,@datarootdir\@,$(datarootdir), -e s,@PYTHON\@,$(PYTHON), ++TOOL_SUBSTITUTIONS = sed -e s,@libdir\@,$(libdir), -e s,@girdir\@,$(girdir), -e s,@datarootdir\@,$(datarootdir), -e s,@PYTHON\@,$(PYTHON), + + g-ir-scanner: tools/g-ir-scanner.in _giscanner.la Makefile + $(AM_V_GEN) $(TOOL_SUBSTITUTIONS) $< > $@.tmp && mv $@.tmp $@ +diff --git a/giscanner/transformer.py b/giscanner/transformer.py +index 80265dd..6e4be86 100644 +--- a/giscanner/transformer.py ++++ b/giscanner/transformer.py +@@ -182,6 +182,7 @@ None.""" + searchdirs = self._includepaths[:] + for path in _xdg_data_dirs: + searchdirs.append(os.path.join(path, 'gir-1.0')) ++ searchdirs.append(GIR_DIR) + searchdirs.append(os.path.join(DATADIR, 'gir-1.0')) + + girname = '%s-%s.gir' % (include.name, include.version) +diff --git a/tools/g-ir-scanner.in b/tools/g-ir-scanner.in +index f709683..dfd12bc 100755 +--- a/tools/g-ir-scanner.in ++++ b/tools/g-ir-scanner.in +@@ -24,6 +24,7 @@ import sys + import __builtin__ + + __builtin__.__dict__['DATADIR'] = "@datarootdir@" ++__builtin__.__dict__['GIR_DIR'] = "@girdir@" + + if 'GI_SCANNER_DEBUG' in os.environ: + def on_exception(exctype, value, tb): +-- +1.9.0 + |