summaryrefslogtreecommitdiffstats
path: root/mingw-w64-gtk3/gtk3-bug-731013-fix-cross-compilation.patch
diff options
context:
space:
mode:
Diffstat (limited to 'mingw-w64-gtk3/gtk3-bug-731013-fix-cross-compilation.patch')
-rw-r--r--mingw-w64-gtk3/gtk3-bug-731013-fix-cross-compilation.patch64
1 files changed, 64 insertions, 0 deletions
diff --git a/mingw-w64-gtk3/gtk3-bug-731013-fix-cross-compilation.patch b/mingw-w64-gtk3/gtk3-bug-731013-fix-cross-compilation.patch
new file mode 100644
index 0000000..c0eccf0
--- /dev/null
+++ b/mingw-w64-gtk3/gtk3-bug-731013-fix-cross-compilation.patch
@@ -0,0 +1,64 @@
+From f62df4c82839453135097914fa28200253acbb05 Mon Sep 17 00:00:00 2001
+From: Hib Eris <hib@hiberis.nl>
+Date: Wed, 24 Sep 2014 23:08:02 +0200
+Subject: [PATCH] Fix cross compilation
+
+https://bugzilla.gnome.org/show_bug.cgi?id=731013
+---
+ gtk/Makefile.am | 2 +-
+ gtk/inspector/Makefile.am | 2 +-
+ util/Makefile.am | 14 ++++++++++----
+ 3 files changed, 12 insertions(+), 6 deletions(-)
+
+diff --git a/gtk/Makefile.am b/gtk/Makefile.am
+index 17ca614..7a71cde 100644
+--- a/gtk/Makefile.am
++++ b/gtk/Makefile.am
+@@ -1330,7 +1330,7 @@ template_headers = $(COMPOSITE_TEMPLATES:.ui=.ui.h)
+
+ %.ui.h: %.ui
+ $(AM_V_GEN) mkdir -p $(dir $@) \
+- && $(top_builddir)/util/extract-strings$(EXEEXT) $< > $@
++ && $(top_builddir)/util/extract-strings$(BUILD_EXEEXT) $< > $@
+
+ #
+ # rules to generate built sources
+diff --git a/gtk/inspector/Makefile.am b/gtk/inspector/Makefile.am
+index dfd54e0..fec2672 100644
+--- a/gtk/inspector/Makefile.am
++++ b/gtk/inspector/Makefile.am
+@@ -114,7 +114,7 @@ templates = \
+ template_headers = $(templates:.ui=.ui.h)
+
+ %.ui.h : %.ui
+- $(AM_V_GEN) $(top_builddir)/util/extract-strings$(EXEEXT) $< > $@
++ $(AM_V_GEN) $(top_builddir)/util/extract-strings$(BUILD_EXEEXT) $< > $@
+
+ EXTRA_DIST += \
+ inspector.gresource.xml \
+diff --git a/util/Makefile.am b/util/Makefile.am
+index 414dc68..3d82b7e 100644
+--- a/util/Makefile.am
++++ b/util/Makefile.am
+@@ -1,9 +1,15 @@
+ # The extract_strings tool is a build utility that runs on the build system.
+
+-noinst_PROGRAMS = extract-strings
++extract_strings_sources = extract-strings.c
++extract_strings_cppflags =
++extract_strings_cflags = $(GLIB_CFLAGS_FOR_BUILD)
++extract_strings_ldadd = $(GLIB_LIBS_FOR_BUILD)
++extract-strings$(BUILD_EXEEXT): $(extract_strings_sources)
++ @rm -f extract-strings$(BUILD_EXEEXT)
++ $(AM_V_CCLD)$(CC_FOR_BUILD) $(extract_strings_cppflags) $(CPPFLAGS_FOR_BUILD) $(extract_strings_cflags) $(CFLAGS_FOR_BUILD) $^ $(LDFLAGS_FOR_BUILD) $(extract_strings_ldadd) $(LIBS_FOR_BUILD) -o $@
++EXTRA_DIST = $(extract_strings_sources)
++DISTCLEANFILES = extract-strings
+
+-extract_strings_SOURCES = extract-strings.c
+-extract_strings_CFLAGS = $(GLIB_CFLAGS_FOR_BUILD)
+-extract_strings_LDADD = $(GLIB_LIBS_FOR_BUILD)
++all: extract-strings$(BUILD_EXEEXT)
+
+ -include $(top_srcdir)/git.mk
+--
+1.9.1 \ No newline at end of file