[gnumeric] win32: update gettext to 0.18

[Morten Welinder <mortenw src gnome org>]

commit ccbc71552d34d71db34327d250419e114aa2bd40
Author: Morten Welinder <terra gnome org>
Date:   Wed Jul 17 21:39:49 2013 -0400

    win32: update gettext to 0.18

 tools/win32/ChangeLog             |    4 +++-
 tools/win32/moduleset.in          |    8 ++++----
 tools/win32/patches/gettext.patch |   22 ++++++++++++++++++++++
 3 files changed, 29 insertions(+), 5 deletions(-)
---
diff --git a/tools/win32/ChangeLog b/tools/win32/ChangeLog
index 851d19e..33be88d 100644
--- a/tools/win32/ChangeLog
+++ b/tools/win32/ChangeLog
@@ -1,9 +1,11 @@
 2013-07-17  Morten Welinder  <terra gnome org>
 
-       * moduleset.in: Update zlib to 1.2.8
+       * moduleset.in: Update zlib to 1.2.8.  Update gettext to 0.18.
 
        * patches/zlib.patch: Update for 1.2.8
 
+       * patches/gettext.patch: New file.
+
        * jhbuildrc.py: Evidently we don't need and can't use --build
        anymore.
 
diff --git a/tools/win32/moduleset.in b/tools/win32/moduleset.in
index cacec9c..714a022 100644
--- a/tools/win32/moduleset.in
+++ b/tools/win32/moduleset.in
@@ -24,11 +24,11 @@
     <repository type="tarball" name="simplesystems.org"
                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";
-           md5sum="58a2bc6d39c0ba57823034d55d65d606"/>
+    <tarball id="gettext" version="0.18">
+       <source href="ftp://ftp.gnu.org/pub/gnu/gettext/gettext-0.18.tar.gz";
+           md5sum="d52a3e061032a1ed13856d42fc86f0fd"/>
        <patches>
-           <patch 
file="http://www.gnome.org/~aruiz/gtk+/patches/gettext_0_17_crossbuild_override_tools_fix.patch"/>
+           <patch file="&patch_dir;gettext.patch" strip="1"/>
        </patches>
        <dependencies>
        </dependencies>
diff --git a/tools/win32/patches/gettext.patch b/tools/win32/patches/gettext.patch
new file mode 100644
index 0000000..895fc11
--- /dev/null
+++ b/tools/win32/patches/gettext.patch
@@ -0,0 +1,22 @@
+--- gettext-0.18/gettext-runtime/intl/Makefile.in.orig 2010-05-09 14:54:29.000000000 -0400
++++ gettext-0.18/gettext-runtime/intl/Makefile.in      2013-07-17 21:30:41.000000000 -0400
+@@ -193,7 +193,7 @@
+   version.$lo \
+   osdep.$lo \
+   intl-compat.$lo
+-OBJECTS_RES_yes = libintl.res.$lo
++OBJECTS_RES_yes =
+ OBJECTS_RES_no =
+ DISTFILES.common = Makefile.in \
+ config.charset locale.alias ref-add.sin ref-del.sin export.h libintl.rc \
+--- gettext-0.18/Makefile.in.orig      2010-05-09 14:59:19.000000000 -0400
++++ gettext-0.18/Makefile.in   2013-07-17 21:32:50.000000000 -0400
+@@ -211,7 +211,7 @@
+ top_srcdir = @top_srcdir@
+ AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies
+ ACLOCAL_AMFLAGS = -I m4
+-SUBDIRS = gnulib-local gettext-runtime gettext-tools
++SUBDIRS = gnulib-local gettext-runtime
+ 
+ # DJGPP port.
+