[gnumeric] win32: patch to avoid redeclaring a win32 structure.

[Morten Welinder <mortenw src gnome org>]

commit c333d3527cd652cac0068ddc6331bdac3ea0406d
Author: Morten Welinder <terra gnome org>
Date:   Mon Apr 12 20:46:50 2010 -0400

    win32: patch to avoid redeclaring a win32 structure.

 tools/win32/moduleset.in                           |    3 +-
 .../patches/gtk-gtkprintoperation-win32.patch      |   23 ++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletions(-)
---
diff --git a/tools/win32/moduleset.in b/tools/win32/moduleset.in
index 3af9597..cf7284b 100644
--- a/tools/win32/moduleset.in
+++ b/tools/win32/moduleset.in
@@ -193,12 +193,13 @@
 	</dependencies>
     </autotools>
 
-    <autotools id="gtk+">
+    <autotools id="gtk+" autogen-sh="autoreconf" skip-autogen="never">
 	<branch repo="gnome.org" module="sources/gtk+/2.20/gtk+-2.20.0.tar.bz2"
 		version="2.18.5">
 	    <patch file="&patch_dir;gtk-disable-demo.patch"/>
 	    <patch file="&patch_dir;gtk-use-wine-to-cross-compile.patch"/>
 	    <patch file="&patch_dir;gtk-gdk-expose-order.patch" strip="1"/>
+	    <patch file="&patch_dir;gtk-gtkprintoperation-win32.patch" strip="1"/>
 	</branch>
 	<dependencies>
 	    <dep package="glib"/>
diff --git a/tools/win32/patches/gtk-gtkprintoperation-win32.patch b/tools/win32/patches/gtk-gtkprintoperation-win32.patch
new file mode 100644
index 0000000..55b9048
--- /dev/null
+++ b/tools/win32/patches/gtk-gtkprintoperation-win32.patch
@@ -0,0 +1,23 @@
+--- gtk+-2.20.0.save/configure.in	2010-03-22 23:29:31.000000000 -0400
++++ gtk+-2.20.0/configure.in	2010-04-12 20:10:38.000000000 -0400
+@@ -1954,6 +1954,9 @@
+               [enable_test_print_backend=no])
+ AM_CONDITIONAL(TEST_PRINT_BACKEND, test "x$enable_test_print_backend" != "xno")
+ 
++if test "$os_win32" = "yes"; then
++  AC_CHECK_TYPES([IPrintDialogCallback],[],[],[[#include <windows.h>]])
++fi
+ 
+ ################################################################
+ # Strip -export-dynamic from the link lines of various libraries
+--- gtk+-2.20.0.save/gtk/gtkprintoperation-win32.c	2010-04-12 20:15:51.000000000 -0400
++++ gtk+-2.20.0/gtk/gtkprintoperation-win32.c	2010-04-12 20:15:28.000000000 -0400
+@@ -72,7 +72,7 @@
+ 
+ static const GUID myIID_IPrintDialogCallback  = {0x5852a2c3,0x6530,0x11d1,{0xb6,0xa3,0x0,0x0,0xf8,0x75,0x7b,0xf9}};
+ 
+-#if !defined (_MSC_VER) && !defined (MINGW64) && !defined (__MINGW64__)
++#ifndef HAVE_IPRINTDIALOGCALLBACK
+ #undef INTERFACE
+ #define INTERFACE IPrintDialogCallback
+ DECLARE_INTERFACE_ (IPrintDialogCallback, IUnknown)