gobject-introspection: version bump 1.46.0 -> 1.48.0

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

4 files changed, 150 insertions, 0 deletions

diff --git a/patches/gobject-introspection-1.48.0/0001-don-t-build-g-ir-scanner-when-cross-compiling.patch b/patches/gobject-introspection-1.48.0/0001-don-t-build-g-ir-scanner-when-cross-compiling.patch
new file mode 100644
index 000000000..3dc227b4a
--- /dev/null
+++ b/patches/gobject-introspection-1.48.0/0001-don-t-build-g-ir-scanner-when-cross-compiling.patch
@@ -0,0 +1,125 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Mon, 28 Dec 2015 11:42:16 +0100
+Subject: [PATCH] don't build g-ir-scanner when cross-compiling
+
+Note: Not for upstream. It depends on host-gobject-introspection.
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ Makefile-gir.am   |  5 ++++-
+ Makefile-tools.am |  4 ++++
+ Makefile.am       |  2 ++
+ common.mk         | 10 ++++++++++
+ configure.ac      |  3 +++
+ 5 files changed, 23 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile-gir.am b/Makefile-gir.am
+index a09260a9767c..591ab61e0104 100644
+--- a/Makefile-gir.am
++++ b/Makefile-gir.am
+@@ -87,7 +87,10 @@ endif
+ 
+ BUILT_GIRSOURCES += GLib-2.0.gir
+ 
+-GLib-2.0.gir: g-ir-scanner g-ir-compiler$(EXEEXT)
++if !USE_HOST_GI
++GLib-2.0.gir: g-ir-scanner
++endif
++GLib-2.0.gir: g-ir-compiler$(EXEEXT)
+ 
+ gir/DBusGLib-1.0.typelib: GObject-2.0.gir
+ 
+diff --git a/Makefile-tools.am b/Makefile-tools.am
+index dbd264c31df4..840530ee8db1 100644
+--- a/Makefile-tools.am
++++ b/Makefile-tools.am
+@@ -1,15 +1,18 @@
+ bin_PROGRAMS += g-ir-compiler g-ir-generate
++if !USE_HOST_GI
+ bin_SCRIPTS += g-ir-scanner g-ir-annotation-tool
+ 
+ if BUILD_DOCTOOL
+ bin_SCRIPTS += g-ir-doc-tool
+ endif
++endif
+ 
+ EXTRA_DIST += 				\
+ 	tools/g-ir-tool-template.in
+ 
+ TOOL_SUBSTITUTIONS = -e s,@libdir\@,$(libdir), -e s,@datarootdir\@,$(datarootdir), -e s,@PYTHON\@,$(PYTHON),
+ 
++if !USE_HOST_GI
+ g-ir-scanner: tools/g-ir-tool-template.in _giscanner.la Makefile
+ 	$(AM_V_GEN) sed $(TOOL_SUBSTITUTIONS) -e s,@TOOL_MODULE\@,scannermain, -e s,@TOOL_FUNCTION\@,scanner_main, $< > $@.tmp && mv $@.tmp $@
+ 	@chmod a+x $@
+@@ -21,6 +24,7 @@ g-ir-annotation-tool: tools/g-ir-tool-template.in _giscanner.la Makefile
+ g-ir-doc-tool: tools/g-ir-tool-template.in _giscanner.la Makefile
+ 	$(AM_V_GEN) sed $(TOOL_SUBSTITUTIONS) -e s,@TOOL_MODULE\@,docmain, -e s,@TOOL_FUNCTION\@,doc_main, $< > $@.tmp && mv $@.tmp $@
+ 	@chmod a+x $@
++endif
+ 
+ g_ir_compiler_SOURCES = tools/compiler.c
+ g_ir_compiler_CPPFLAGS = -DGIREPO_DEFAULT_SEARCH_PATH="\"$(libdir)\"" \
+diff --git a/Makefile.am b/Makefile.am
+index b080a891bc5c..3d08b7f2bdd5 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -19,7 +19,9 @@ include Makefile.introspection
+ 
+ include Makefile-cmph.am
+ include Makefile-girepository.am
++if !USE_HOST_GI
+ include Makefile-giscanner.am
++endif
+ include Makefile-examples.am
+ include Makefile-gir.am
+ include Makefile-tools.am
+diff --git a/common.mk b/common.mk
+index b778f7aaf955..70872cd3d53d 100644
+--- a/common.mk
++++ b/common.mk
+@@ -6,6 +6,15 @@
+ # module itself.
+ #
+ 
++if USE_HOST_GI
++INTROSPECTION_SCANNER = \
++    env PATH="$(PATH)" \
++        LPATH=.libs \
++        CC="$(CC)" \
++        PYTHONPATH=$(top_builddir):$(top_srcdir) \
++        UNINSTALLED_INTROSPECTION_BUILDDIR=$(top_builddir) \
++        g-ir-scanner
++else
+ INTROSPECTION_SCANNER = \
+     env PATH=".libs:$(PATH)" \
+         LPATH=.libs \
+@@ -14,6 +23,7 @@ INTROSPECTION_SCANNER = \
+         UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) \
+         UNINSTALLED_INTROSPECTION_BUILDDIR=$(top_builddir) \
+         $(top_builddir)/g-ir-scanner
++endif
+ 
+ INTROSPECTION_SCANNER_ARGS = \
+     --verbose \
+diff --git a/configure.ac b/configure.ac
+index 6c91fa555b5e..8a9215023148 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -250,6 +250,8 @@ AC_FUNC_STRTOD
+ AC_CHECK_FUNCS([memchr strchr strspn strstr strtol strtoull])
+ AC_CHECK_FUNCS([backtrace backtrace_symbols])
+ 
++AM_CONDITIONAL([USE_HOST_GI], [test "$cross_compiling" = yes])
++AS_IF([test "$cross_compiling" != yes], [
+ # Python
+ # option to specify python interpreter to use; this just sets $PYTHON, so that
+ # we will fallback to reading $PYTHON if --with-python is not given, and
+@@ -276,6 +278,7 @@ AM_CHECK_PYTHON_HEADERS(, AC_MSG_ERROR([Python headers not found]))
+ if test "x$os_win32" = "xyes"; then
+   AM_CHECK_PYTHON_LIBS(, AC_MSG_ERROR([Python libs not found. Windows requires Python modules to be explicitly linked to libpython.]))
+ fi
++])
+ 
+ dnl Not enabled by default until 3.6 cycle when we can propose mako as
+ dnl an external dependency
diff --git a/patches/gobject-introspection-1.48.0/0002-fix-env-shebang.patch b/patches/gobject-introspection-1.48.0/0002-fix-env-shebang.patch
new file mode 100644
index 000000000..db4b8d1e0
--- /dev/null
+++ b/patches/gobject-introspection-1.48.0/0002-fix-env-shebang.patch
@@ -0,0 +1,19 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Sun, 27 Dec 2015 18:14:25 +0100
+Subject: [PATCH] fix env shebang
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ tests/offsets/gen-gitestoffsets | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/offsets/gen-gitestoffsets b/tests/offsets/gen-gitestoffsets
+index 94a2062d3d2c..9a8d19f47426 100755
+--- a/tests/offsets/gen-gitestoffsets
++++ b/tests/offsets/gen-gitestoffsets
+@@ -1,4 +1,4 @@
+-#!/bin/env python
++#!/usr/bin/env python
+ # -*- Mode: Python -*-
+ # GObject-Introspection - a framework for introspecting GObject libraries
+ # Copyright (C) 2008  Red Hat, Inc.
diff --git a/patches/gobject-introspection-1.48.0/autogen.sh b/patches/gobject-introspection-1.48.0/autogen.sh
new file mode 120000
index 000000000..9f8a4cb7d
--- /dev/null
+++ b/patches/gobject-introspection-1.48.0/autogen.sh
@@ -0,0 +1 @@
+../autogen.sh
\ No newline at end of file
diff --git a/patches/gobject-introspection-1.48.0/series b/patches/gobject-introspection-1.48.0/series
new file mode 100644
index 000000000..f74bb2a25
--- /dev/null
+++ b/patches/gobject-introspection-1.48.0/series
@@ -0,0 +1,5 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-don-t-build-g-ir-scanner-when-cross-compiling.patch
+0002-fix-env-shebang.patch
+# 2159825798ed7af701a7d35c66caa0c2  - git-ptx-patches magic