summaryrefslogtreecommitdiffstats
path: root/patches
diff options
context:
space:
mode:
authorRobert Schwebel <r.schwebel@pengutronix.de>2010-05-25 12:38:57 +0200
committerRobert Schwebel <r.schwebel@pengutronix.de>2010-06-03 11:15:53 +0200
commitb1181b39830d082f693f45bd827c5534d085b960 (patch)
tree08b7207c85833368d33830f29d3b545e05067962 /patches
parent1dd42358fafcaa187a6d312358c6d1c34745f9e9 (diff)
downloadptxdist-b1181b39830d082f693f45bd827c5534d085b960.tar.gz
ptxdist-b1181b39830d082f693f45bd827c5534d085b960.tar.xz
[glib] add experimental glib-2.25.x
Add glib-2.25.x rules to ptxdist. Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
Diffstat (limited to 'patches')
l---------patches/glib-2.25.7/autogen.sh1
-rw-r--r--patches/glib-2.25.7/overwrite-glib-compile-schemas.diff63
-rw-r--r--patches/glib-2.25.7/series1
3 files changed, 65 insertions, 0 deletions
diff --git a/patches/glib-2.25.7/autogen.sh b/patches/glib-2.25.7/autogen.sh
new file mode 120000
index 000000000..9f8a4cb7d
--- /dev/null
+++ b/patches/glib-2.25.7/autogen.sh
@@ -0,0 +1 @@
+../autogen.sh \ No newline at end of file
diff --git a/patches/glib-2.25.7/overwrite-glib-compile-schemas.diff b/patches/glib-2.25.7/overwrite-glib-compile-schemas.diff
new file mode 100644
index 000000000..b5976f2e0
--- /dev/null
+++ b/patches/glib-2.25.7/overwrite-glib-compile-schemas.diff
@@ -0,0 +1,63 @@
+From: Robert Schwebel <r.schwebel@pengutronix.de>
+Subject: [patch] fix cross compilation in glib-2.25.7
+
+When we try to cross compile, the build system compiles
+glib-compile-schemas for the "host" system, but tries to run it later on
+the "build" machine.
+
+We make it possible to overwrite the call to the binary during
+configure, similar to what GLIB_GENMARSHAL does.
+
+Signed-of-by: Robert Schwebel <r.schwebel@pengutronix.de>
+
+---
+# rsc: https://bugzilla.gnome.org/show_bug.cgi?id=620174
+
+ configure.in | 13 ++++++++++---
+ gio/tests/Makefile.am | 2 +-
+ 2 files changed, 11 insertions(+), 4 deletions(-)
+
+Index: glib-2.25.7/configure.in
+===================================================================
+--- glib-2.25.7.orig/configure.in
++++ glib-2.25.7/configure.in
+@@ -2731,9 +2731,10 @@ int error = EILSEQ;
+ ], have_eilseq=yes, have_eilseq=no);
+ AC_MSG_RESULT($have_eilseq)
+
+-dnl ******************************************************************
+-dnl *** Look for glib-genmarshal in PATH if we are cross-compiling ***
+-dnl ******************************************************************
++dnl ****************************************************************
++dnl *** Look for glib-genmarshal and glib-compile-schemas in PATH **
++dnl *** if we are cross-compiling **
++dnl ****************************************************************
+
+ AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes)
+
+@@ -2742,6 +2743,12 @@ if test $cross_compiling = yes; then
+ if test x$GLIB_GENMARSHAL = xno; then
+ AC_MSG_ERROR(Could not find a glib-genmarshal in your PATH)
+ fi
++ AC_PATH_PROG(GLIB_COMPILE_SCHEMAS, glib-compile-schemas, no)
++ if test x$GLIB_COMPILE_SCHEMAS = xno; then
++ AC_MSG_ERROR(Could not find a glib-compile-schemas in your PATH)
++ fi
++else
++ AC_SUBST(GLIB_COMPILE_SCHEMAS,"\$(top_builddir)/gio/glib-compile-schemas")
+ fi
+
+ dnl **************************
+Index: glib-2.25.7/gio/tests/Makefile.am
+===================================================================
+--- glib-2.25.7.orig/gio/tests/Makefile.am
++++ glib-2.25.7/gio/tests/Makefile.am
+@@ -288,7 +288,7 @@ test.mo: de.po
+ cp -f test.mo de/LC_MESSAGES
+
+ gschemas.compiled:
+- $(top_builddir)/gio/glib-compile-schemas --targetdir=$(abs_builddir) $(srcdir)
++ $(GLIB_COMPILE_SCHEMAS) --targetdir=$(abs_builddir) $(srcdir)
+
+ DISTCLEANFILES = \
+ applications/mimeinfo.cache \
diff --git a/patches/glib-2.25.7/series b/patches/glib-2.25.7/series
new file mode 100644
index 000000000..abda33b2e
--- /dev/null
+++ b/patches/glib-2.25.7/series
@@ -0,0 +1 @@
+overwrite-glib-compile-schemas.diff