[gnumeric] fixed png tarball path and make pygobject fail a bit later in win32 build

[Jean Bréfort <jbrefort src gnome org>]

commit 795ca2c78fb8ada04ebca28aa305d275fc5f480e
Author: Jean Brefort <jean brefort normalesup org>
Date:   Sat Feb 13 10:55:21 2010 +0100

    fixed png tarball path and make pygobject fail a bit later in win32 build

 tools/win32/moduleset.in               |    3 ++-
 tools/win32/patches/pygiochannel.patch |   10 ++++++++++
 2 files changed, 12 insertions(+), 1 deletions(-)
---
diff --git a/tools/win32/moduleset.in b/tools/win32/moduleset.in
index 87e41f2..9d7f034 100644
--- a/tools/win32/moduleset.in
+++ b/tools/win32/moduleset.in
@@ -22,7 +22,7 @@
     <repository type="tarball" name="sourceforge"
 		href="http://downloads.sourceforge.net/project/"/>
     <repository type="tarball" name="simplesystems.org"
-		href="ftp://ftp.simplesystems.org/pub/libpng/png/src"/>
+		href="ftp://ftp.simplesystems.org/pub/libpng/png/src/"/>
 
     <tarball id="gettext" version="0.17">
 	<source href="ftp://ftp.gnu.org/pub/gnu/gettext/gettext-0.17.tar.gz";
@@ -231,6 +231,7 @@
 	<branch repo="gnome.org" module="sources/pygobject/2.20/pygobject-2.20.0.tar.bz2"
 		version="2.20.0">
 	    <patch file="&patch_dir;pygobject.patch"/>
+	    <patch file="&patch_dir;pygiochannel.patch"/>
 	</branch>
 
 	<dependencies>
diff --git a/tools/win32/patches/pygiochannel.patch b/tools/win32/patches/pygiochannel.patch
new file mode 100644
index 0000000..fd63104
--- /dev/null
+++ b/tools/win32/patches/pygiochannel.patch
@@ -0,0 +1,10 @@
+--- glib/pygiochannel.c.orig	2010-02-12 20:33:20.738519659 +0100
++++ glib/pygiochannel.c	2010-02-12 20:34:03.178515213 +0100
+@@ -10,6 +10,7 @@
+ 
+ #include "pyglib.h"
+ #include "pyglib-private.h"
++#include "pygsource.h"
+ 
+ typedef struct {
+     PyObject_HEAD