diff options
author | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-06-02 22:33:01 +0200 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-06-05 11:59:28 +0200 |
commit | 95b28497b139ac1e76419c956c55f98e0e12354b (patch) | |
tree | d7cbfdfc092b64642e9e6e755d33a0d04dae1388 /patches/gobject-introspection-1.56.1 | |
parent | 5bd721be68ca2e348bdbff9be7fcad71204ea0e8 (diff) | |
download | ptxdist-95b28497b139ac1e76419c956c55f98e0e12354b.tar.gz ptxdist-95b28497b139ac1e76419c956c55f98e0e12354b.tar.xz |
gobject-introspection: version bump 1.52.1 -> 1.56.1
Switch to Python 3 while at it.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches/gobject-introspection-1.56.1')
3 files changed, 124 insertions, 0 deletions
diff --git a/patches/gobject-introspection-1.56.1/0001-don-t-build-g-ir-scanner-when-cross-compiling.patch b/patches/gobject-introspection-1.56.1/0001-don-t-build-g-ir-scanner-when-cross-compiling.patch new file mode 100644 index 000000000..a711f7780 --- /dev/null +++ b/patches/gobject-introspection-1.56.1/0001-don-t-build-g-ir-scanner-when-cross-compiling.patch @@ -0,0 +1,119 @@ +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 86ab5bf1eda4..61a540df922e 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 952937354e43..54135bffb84b 100644 +--- a/Makefile-tools.am ++++ b/Makefile-tools.am +@@ -1,15 +1,18 @@ + bin_PROGRAMS += g-ir-compiler g-ir-generate g-ir-inspect ++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 dafea3846a30..0fcea1988378 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 2a685146292a..e57144f9df56 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -273,7 +273,10 @@ case "$host" in + pyexecdir=`echo $pyexecdir | tr '\\\\' '/'` + ;; + esac ++AM_CONDITIONAL([USE_HOST_GI], [test "$cross_compiling" = yes]) ++AS_IF([test "$cross_compiling" != yes], [ + 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 diff --git a/patches/gobject-introspection-1.56.1/autogen.sh b/patches/gobject-introspection-1.56.1/autogen.sh new file mode 120000 index 000000000..9f8a4cb7d --- /dev/null +++ b/patches/gobject-introspection-1.56.1/autogen.sh @@ -0,0 +1 @@ +../autogen.sh
\ No newline at end of file diff --git a/patches/gobject-introspection-1.56.1/series b/patches/gobject-introspection-1.56.1/series new file mode 100644 index 000000000..f02a530de --- /dev/null +++ b/patches/gobject-introspection-1.56.1/series @@ -0,0 +1,4 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-don-t-build-g-ir-scanner-when-cross-compiling.patch +# 1247aeb7632c766a4cc9ba6ea2c1e979 - git-ptx-patches magic |