[gnumeric] win32: update glib and gtk+ to latest

[Morten Welinder <mortenw src gnome org>]

commit 3d80e6f431bafa258ec213048b97fe747c23048b
Author: Morten Welinder <terra gnome org>
Date:   Wed Dec 25 19:15:13 2013 -0500

    win32: update glib and gtk+ to latest
    
    ...in the hope of fixing the print issues.  No luck.

 tools/win32/ChangeLog                              |    4 ++
 tools/win32/jhbuildrc.py                           |    2 +-
 tools/win32/moduleset.in                           |   10 +++--
 tools/win32/patches/glib-dns.patch                 |    4 +-
 tools/win32/patches/glib-gsubprocesslauncher.patch |   35 +++++++++++++++
 tools/win32/patches/glib-rand.patch                |   47 ++++++++++++++++++++
 6 files changed, 95 insertions(+), 7 deletions(-)
---
diff --git a/tools/win32/ChangeLog b/tools/win32/ChangeLog
index ce8e459..0c2c77f 100644
--- a/tools/win32/ChangeLog
+++ b/tools/win32/ChangeLog
@@ -1,3 +1,7 @@
+2013-12-25  Morten Welinder <terra gnome org>
+
+       * moduleset.in: Update glib and gtk+ to latest.
+
 2013-11-28  Morten Welinder <terra gnome org>
 
        * Release 1.12.9
diff --git a/tools/win32/jhbuildrc.py b/tools/win32/jhbuildrc.py
index 8bd3864..c497b72 100644
--- a/tools/win32/jhbuildrc.py
+++ b/tools/win32/jhbuildrc.py
@@ -155,7 +155,7 @@ autogenargs += """ --disable-scrollkeeper --disable-gtk-doc"""
 
 module_autogenargs['atk']      = autogenargs + """ --disable-glibtest --enable-introspection=no"""
 module_autogenargs['gdk-pixbuf'] = autogenargs + """ --disable-introspection  --without-libtiff"""
-module_autogenargs['gtk+']     = autogenargs + """ --disable-glibtest --enable-gdiplus --without-libjasper  
--without-libtiff --without-libjpeg --enable-cups=no --enable-introspection=no 
--with-included-immodules=yes"""
+module_autogenargs['gtk+']     = autogenargs + """ --disable-glibtest --enable-gdiplus --enable-cups=no 
--enable-introspection=no --with-included-immodules=yes"""
 
 module_autogenargs['libgda']   = autogenargs + """ --without-odbc --without-java --without-libsoup"""
 module_autogenargs['pxlib']    = autogenargs + """ --with-gsf=""" + prefix
diff --git a/tools/win32/moduleset.in b/tools/win32/moduleset.in
index 2dabe77..dec3310 100644
--- a/tools/win32/moduleset.in
+++ b/tools/win32/moduleset.in
@@ -72,13 +72,15 @@
     </autotools>
 
     <autotools id="glib">
-       <branch repo="gnome.org" module="sources/glib/2.37/glib-2.37.4.tar.xz" version="2.37.4">
+       <branch repo="gnome.org" module="sources/glib/2.39/glib-2.39.2.tar.xz" version="2.39.2">
            <patch file="&patch_dir;glib-win32-cachefile.patch.gz"/>
            <patch file="&patch_dir;glib-goption-disable-localization.patch" strip="1"/>
            <patch file="&patch_dir;glib-gspawn-win32.patch" strip="1"/>
            <patch file="&patch_dir;glib-appinfo.patch" strip="1"/>
            <patch file="&patch_dir;glib-gatomic.patch" strip="1"/>
            <patch file="&patch_dir;glib-dns.patch" strip="1"/>
+           <patch file="&patch_dir;glib-rand.patch" strip="1"/>
+           <patch file="&patch_dir;glib-gsubprocesslauncher.patch" strip="1"/>
            <patch file="&patch_dir;glib-no-tests.patch" strip="1"/>
        </branch>
        <dependencies>
@@ -251,12 +253,12 @@
     </autotools>
 
     <autotools id="gtk+">
-       <branch repo="gnome.org" module="sources/gtk+/3.9/gtk+-3.9.12.tar.xz"
-               version="3.9.12">
+       <branch repo="gnome.org" module="sources/gtk+/3.10/gtk+-3.10.6.tar.xz"
+               version="3.10.6">
            <patch file="&patch_dir;gtk-disable-demo.patch"/>
            <patch file="&patch_dir;gtk-use-wine-to-cross-compile.patch"/>
            <patch file="&patch_dir;gtk-release-flux.patch" strip="1"/>
-           <patch file="&patch_dir;gtk-b705980.patch" strip="1"/>
+<!--       <patch file="&patch_dir;gtk-b705980.patch" strip="1"/> -->
        </branch>
        <dependencies>
            <dep package="glib"/>
diff --git a/tools/win32/patches/glib-dns.patch b/tools/win32/patches/glib-dns.patch
index 42e58ae..72f0a6f 100644
--- a/tools/win32/patches/glib-dns.patch
+++ b/tools/win32/patches/glib-dns.patch
@@ -1,5 +1,5 @@
---- glib-2.24.0/gio/gnetworking.h~     2010-03-13 14:22:54.000000000 -0500
-+++ glib-2.24.0/gio/gnetworking.h      2010-10-05 18:53:45.000000000 -0400
+--- glib-2.24.0/gio/gnetworking.h.in~  2010-03-13 14:22:54.000000000 -0500
++++ glib-2.24.0/gio/gnetworking.h.in   2010-10-05 18:53:45.000000000 -0400
 @@ -28,6 +28,7 @@
  #undef interface
  #include <ws2tcpip.h>
diff --git a/tools/win32/patches/glib-gsubprocesslauncher.patch 
b/tools/win32/patches/glib-gsubprocesslauncher.patch
new file mode 100644
index 0000000..4e4e700
--- /dev/null
+++ b/tools/win32/patches/glib-gsubprocesslauncher.patch
@@ -0,0 +1,35 @@
+--- glib-2.39.2/gio/gsubprocesslauncher.h~     2013-11-23 00:21:30.000000000 -0500
++++ glib-2.39.2/gio/gsubprocesslauncher.h      2013-12-25 18:52:51.000000000 -0500
+@@ -56,7 +56,7 @@
+ 
+ GLIB_AVAILABLE_IN_2_40
+ void                    g_subprocess_launcher_set_environ               (GSubprocessLauncher   *self,
+-                                                                         gchar                **environ);
++                                                                         gchar                **env);
+ 
+ GLIB_AVAILABLE_IN_2_40
+ void                    g_subprocess_launcher_setenv                    (GSubprocessLauncher   *self,
+--- glib-2.39.2/gio/gsubprocesslauncher.c~     2013-12-15 21:07:11.000000000 -0500
++++ glib-2.39.2/gio/gsubprocesslauncher.c      2013-12-25 18:53:29.000000000 -0500
+@@ -224,7 +224,7 @@
+ /**
+  * g_subprocess_launcher_set_environ:
+  * @self: a #GSubprocess
+- * @environ: the replacement environment
++ * @env: the replacement environment
+  *
+  * Replace the entire environment of processes launched from this
+  * launcher with the given 'environ' variable.
+@@ -244,10 +244,10 @@
+  **/
+ void
+ g_subprocess_launcher_set_environ (GSubprocessLauncher  *self,
+-                                   gchar               **environ)
++                                   gchar               **env)
+ {
+   g_strfreev (self->envp);
+-  self->envp = g_strdupv (environ);
++  self->envp = g_strdupv (env);
+ }
+ 
+ /**
diff --git a/tools/win32/patches/glib-rand.patch b/tools/win32/patches/glib-rand.patch
new file mode 100644
index 0000000..88481b7
--- /dev/null
+++ b/tools/win32/patches/glib-rand.patch
@@ -0,0 +1,47 @@
+--- glib-2.39.2/glib/grand.c~  2013-11-23 09:58:07.000000000 -0500
++++ glib-2.39.2/glib/grand.c   2013-12-25 17:51:07.000000000 -0500
+@@ -57,6 +57,7 @@
+ #endif
+ 
+ #ifdef G_OS_WIN32
++#include <windows.h>
+ #include <stdlib.h>
+ #endif
+ 
+@@ -264,10 +265,33 @@
+       seed[3] = getppid ();
+     }
+ #else /* G_OS_WIN32 */
+-  gint i;
++  static BOOLEAN (* g_RtlGenRandom) (PVOID RandomBuffer, ULONG RandomBufferLength);
+ 
+-  for (i = 0; i < G_N_ELEMENTS (seed); i++)
+-    rand_s (&seed[i]);
++  if (g_once_init_enter (&g_RtlGenRandom))
++    {
++      /* See
++       * http://msdn.microsoft.com/en-us/library/windows/desktop/aa387694%28v=vs.85%29.aspx
++       *
++       * This is available on Windows XP and later, so we can
++       * hard-depend on it.
++       */
++      BOOLEAN (* func) (PVOID RandomBuffer, ULONG RandomBufferLength);
++      HMODULE h;
++
++      h = LoadLibrary ("advapi32.dll");
++
++      if (!h)
++      g_error ("Unable to load advapi32.dll, required for random number generation");
++
++      func = (gpointer) GetProcAddress (h, "SystemFunction036");
++
++      if (!func)
++      g_error ("Unable to load RtlGenRandom() from advapi32.dll");
++
++      g_once_init_leave (&g_RtlGenRandom, func);
++    }
++
++  (* g_RtlGenRandom) (seed, sizeof seed);
+ #endif
+ 
+   return g_rand_new_with_seed_array (seed, 4);