[mingw-gtk3] Update to 3.5.12

[Erik van Pienbroek]

commit 34f84008d4f4cf16af5cbabe4d1c0c43aa7893fc
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Mon Aug 27 22:40:24 2012 +0200

    Update to 3.5.12

 ...configure.ac-isnan-and-isinf-are-macros-n.patch |   52 --------------------
 ...-t-build-gtk-launch-on-Win32-environments.patch |   40 +++++++++++++++
 ...e-gtkdbusgenerated.c-on-non-UNIX-environm.patch |   27 ++++++++++
 mingw-gtk3.spec                                    |   22 ++++++--
 sources                                            |    2 +-
 5 files changed, 85 insertions(+), 58 deletions(-)
---
diff --git a/0001-Don-t-build-gtk-launch-on-Win32-environments.patch b/0001-Don-t-build-gtk-launch-on-Win32-environments.patch
new file mode 100644
index 0000000..9f888ce
--- /dev/null
+++ b/0001-Don-t-build-gtk-launch-on-Win32-environments.patch
@@ -0,0 +1,40 @@
+From 9adf8e1e192f0516fe131b338fa8f546a80ca445 Mon Sep 17 00:00:00 2001
+From: Erik van Pienbroek <epienbro at fedoraproject.org>
+Date: Mon, 27 Aug 2012 22:13:49 +0200
+Subject: [PATCH] Don't build gtk-launch on Win32 environments
+
+The gtk-launch tool depends on gio-unix which isn't available on Win32
+---
+ gtk/Makefile.am | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/gtk/Makefile.am b/gtk/Makefile.am
+index 4981db0..24289e9 100644
+--- a/gtk/Makefile.am
++++ b/gtk/Makefile.am
+@@ -1285,9 +1285,7 @@ endif
+ #
+ # Installed tools
+ #
+-bin_PROGRAMS = \
+-	gtk-query-immodules-3.0	\
+-	gtk-launch
++bin_PROGRAMS = gtk-query-immodules-3.0
+ 
+ if BUILD_ICON_CACHE
+ bin_PROGRAMS += gtk-update-icon-cache
+@@ -1334,8 +1332,11 @@ gtk_update_icon_cache_LDADD = $(GDK_PIXBUF_LIBS)
+ gtk_update_icon_cache_SOURCES = updateiconcache.c
+ endif
+ 
++if !OS_WIN32
++bin_PROGRAMS += gtk-launch
+ gtk_launch_LDADD = $(LDADDS)
+ gtk_launch_SOURCES = gtk-launch.c
++endif
+ 
+ .PHONY: files test test-debug
+ 
+-- 
+1.7.11.4
+
diff --git a/0002-Also-compile-gtkdbusgenerated.c-on-non-UNIX-environm.patch b/0002-Also-compile-gtkdbusgenerated.c-on-non-UNIX-environm.patch
new file mode 100644
index 0000000..81eea0e
--- /dev/null
+++ b/0002-Also-compile-gtkdbusgenerated.c-on-non-UNIX-environm.patch
@@ -0,0 +1,27 @@
+From 24f0b180986701aeac77c86c9b2041367fca359a Mon Sep 17 00:00:00 2001
+From: Erik van Pienbroek <epienbro at fedoraproject.org>
+Date: Mon, 27 Aug 2012 22:18:29 +0200
+Subject: [PATCH] Also compile gtkdbusgenerated.c on non-UNIX environments
+
+When compiling gtk on Win32 then the file gtkdbusgenerated.c also needs to be
+compiled and linked into the gtk library as it's needed for GtkMountOperation
+---
+ gtk/Makefile.am | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/gtk/Makefile.am b/gtk/Makefile.am
+index 24289e9..dd6bc14 100644
+--- a/gtk/Makefile.am
++++ b/gtk/Makefile.am
+@@ -900,6 +900,8 @@ gtk_private_h_sources += \
+ 	gtkprinteroptionwidget.h	\
+ 	gtksearchenginetracker.h
+ gtk_c_sources += $(gtk_os_unix_c_sources)
++else
++gtk_c_sources += $(gtk_dbus_built_sources)
+ endif
+ 
+ gtk_os_win32_c_sources = \
+-- 
+1.7.11.4
+
diff --git a/mingw-gtk3.spec b/mingw-gtk3.spec
index 41b0dfb..43f1393 100644
--- a/mingw-gtk3.spec
+++ b/mingw-gtk3.spec
@@ -5,8 +5,8 @@
 %define release_version %(echo %{version} | awk -F. '{print $1"."$2}')
 
 Name:           mingw-gtk3
-Version:        3.4.4
-Release:        2%{?dist}
+Version:        3.5.12
+Release:        1%{?dist}
 Summary:        MinGW Windows GTK+ library
 
 License:        LGPLv2+
@@ -15,8 +15,14 @@ URL:            http://www.gtk.org
 Source0:        http://download.gnome.org/sources/gtk+/%{release_version}/gtk+-%{version}.tar.xz
 # wine gtk-query-immodules-3.0.exe > gtk.immodules
 Source1:        gtk.immodules
-# Build fix backported from git master
-Patch0:         0001-Bug-676087-configure.ac-isnan-and-isinf-are-macros-n.patch
+
+# The tool gtk-launch requires pieces from gio-unix which isn't available on Win32
+# https://bugzilla.gnome.org/show_bug.cgi?id=682824
+Patch0:         0001-Don-t-build-gtk-launch-on-Win32-environments.patch
+
+# Fix the build by linking against gtkdbusgenerated.c
+# https://bugzilla.gnome.org/show_bug.cgi?id=682825
+Patch1:         0002-Also-compile-gtkdbusgenerated.c-on-non-UNIX-environm.patch
 
 BuildArch:      noarch
 
@@ -103,7 +109,10 @@ This package contains the MinGW Windows cross compiled GTK+ 3 library.
 
 %prep
 %setup -q -n gtk+-%{version}
-%patch0 -p1 -b .isnan
+%patch0 -p1
+%patch1 -p1
+
+autoreconf -i --force
 
 
 %build
@@ -249,6 +258,9 @@ fi
 
 
 %changelog
+* Mon Aug 27 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 3.5.12-1
+- Update to 3.5.12
+
 * Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.4.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index 9541027..05115fb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1b2cf29502a6394e8d4b30f7f5bb9131  gtk+-3.4.4.tar.xz
+597817133e41e841b932a10b3a433156  gtk+-3.5.12.tar.xz