[mingw-gtk3] Workaround upstream breakage

[Erik van Pienbroek]

commit 444c3d82d9711a3a72ac2eb2938b6bac737dc514
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Fri May 30 17:31:07 2014 +0200

    Workaround upstream breakage

 gtk-workaround-extract-strings-breakage.patch |   65 +++++++++++++++++++++++++
 mingw-gtk3.spec                               |    8 +++
 2 files changed, 73 insertions(+), 0 deletions(-)
---
diff --git a/gtk-workaround-extract-strings-breakage.patch b/gtk-workaround-extract-strings-breakage.patch
new file mode 100644
index 0000000..e7f75e4
--- /dev/null
+++ b/gtk-workaround-extract-strings-breakage.patch
@@ -0,0 +1,65 @@
+--- util/Makefile.am.orig	2014-05-30 00:24:06.853095421 +0200
++++ util/Makefile.am	2014-05-30 00:24:13.575204172 +0200
+@@ -7,5 +7,3 @@
+ extract-strings: $(extract_strings_sources)
+ 	@rm -f extract-strings
+ 	$(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 $@
+-
+-noinst_PROGRAMS = extract-strings
+--- gtk/Makefile.am.orig	2014-05-30 17:14:19.419401875 +0200
++++ gtk/Makefile.am	2014-05-30 17:16:21.771362187 +0200
+@@ -1311,9 +1311,9 @@
+ 
+ template_headers = $(COMPOSITE_TEMPLATES:.ui=.ui.h)
+ 
+-%.ui.h: %.ui
++%.ui.h: %.ui extract-strings$(BUILD_EXEEXT)
+ 	$(AM_V_GEN) mkdir -p $(dir $@) \
+-	&& $(top_builddir)/util/extract-strings$(BUILD_EXEEXT) $< > $@
++	&& ./extract-strings$(BUILD_EXEEXT) $< > $@
+ 
+ #
+ # rules to generate built sources
+@@ -1606,6 +1606,17 @@
+ gtk_launch_LDADD = $(LDADDS)
+ gtk_launch_SOURCES = gtk-launch.c
+ 
++# The extract_strings tool is a build utility that runs on the build system.
++extract_strings_sources = $(top_srcdir)/util/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
++
+ .PHONY: files test test-debug
+ 
+ files:
+--- gtk/inspector/Makefile.am.orig	2014-05-30 17:16:43.237706126 +0200
++++ gtk/inspector/Makefile.am	2014-05-30 17:18:34.093482314 +0200
+@@ -99,10 +99,19 @@
+ 
+ template_headers = $(templates:.ui=.ui.h)
+ 
+-extract_strings = $(top_builddir)/util/extract-strings
++%.ui.h : %.ui extract-strings$(BUILD_EXEEXT) 
++	$(AM_V_GEN) ./extract-strings$(BUILD_EXEEXT) $< > $@
+ 
+-%.ui.h : %.ui 
+-	$(AM_V_GEN) $(extract_strings) $< > $@
++# The extract_strings tool is a build utility that runs on the build system.
++extract_strings_sources = $(top_srcdir)/util/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
+ 
+ EXTRA_DIST += 				\
+ 	inspector.gresource.xml 	\
diff --git a/mingw-gtk3.spec b/mingw-gtk3.spec
index 39c0e20..72a3ff9 100644
--- a/mingw-gtk3.spec
+++ b/mingw-gtk3.spec
@@ -19,6 +19,11 @@ Source1:        gtk.immodules
 # https://bugzilla.gnome.org/show_bug.cgi?id=700445
 Patch1:         0004-BURN-THE-.DEF.patch
 
+# Upstream broke cross-compilation on purpose in
+# https://git.gnome.org/browse/gtk+/commit/util?id=a28d2cb9233eff0983b7b3517a9dbb00b62fd357
+# Workaround this breakage by doing partial reverts
+Patch2:         gtk-workaround-extract-strings-breakage.patch
+
 BuildArch:      noarch
 
 BuildRequires:  mingw32-filesystem >= 98
@@ -112,6 +117,7 @@ This package contains the MinGW Windows cross compiled GTK+ 3 library.
 %prep
 %setup -q -n gtk+-%{version}
 %patch1 -p1 -b .def
+%patch2 -p0 -b .extract_strings
 autoreconf -i --force
 
 
@@ -218,6 +224,7 @@ fi
 %{mingw32_datadir}/aclocal/gtk-3.0.m4
 %{mingw32_datadir}/glib-2.0/schemas/org.gtk.exampleapp.gschema.xml
 %{mingw32_datadir}/glib-2.0/schemas/org.gtk.Demo.gschema.xml
+%{mingw32_datadir}/glib-2.0/schemas/org.gtk.Settings.Debug.gschema.xml
 %{mingw32_datadir}/glib-2.0/schemas/org.gtk.Settings.ColorChooser.gschema.xml
 %{mingw32_datadir}/glib-2.0/schemas/org.gtk.Settings.FileChooser.gschema.xml
 %{mingw32_datadir}/gtk-3.0/
@@ -261,6 +268,7 @@ fi
 %{mingw64_datadir}/aclocal/gtk-3.0.m4
 %{mingw64_datadir}/glib-2.0/schemas/org.gtk.exampleapp.gschema.xml
 %{mingw64_datadir}/glib-2.0/schemas/org.gtk.Demo.gschema.xml
+%{mingw64_datadir}/glib-2.0/schemas/org.gtk.Settings.Debug.gschema.xml
 %{mingw64_datadir}/glib-2.0/schemas/org.gtk.Settings.ColorChooser.gschema.xml
 %{mingw64_datadir}/glib-2.0/schemas/org.gtk.Settings.FileChooser.gschema.xml
 %{mingw64_datadir}/gtk-3.0/