[gnumeric] win32: bump glib to 2.41.3

[Morten Welinder <mortenw src gnome org>]

commit b5eb43f9cf2ed0deb92fdfc4e9cb4449504b2919
Author: Morten Welinder <terra gnome org>
Date:   Tue Aug 26 20:27:10 2014 -0400

    win32: bump glib to 2.41.3
    
    The goption patch will no longer be needed once gnumeric requires glib
    2.40 or some such.

 tools/win32/ChangeLog                              |    4 +
 tools/win32/moduleset.in                           |    3 +-
 .../glib-goption-disable-localization.patch        |  242 +++++++++++---------
 tools/win32/patches/glib-gsubprocesslauncher.patch |   35 ---
 4 files changed, 142 insertions(+), 142 deletions(-)
---
diff --git a/tools/win32/ChangeLog b/tools/win32/ChangeLog
index d00f89e..c59a76b 100644
--- a/tools/win32/ChangeLog
+++ b/tools/win32/ChangeLog
@@ -1,3 +1,7 @@
+2014-08-26  Morten Welinder  <terra gnome org>
+
+       * moduleset.in: Bump glib to 2.41.3.
+
 2014-06-09  Morten Welinder <terra gnome org>
 
        * Release 1.12.17
diff --git a/tools/win32/moduleset.in b/tools/win32/moduleset.in
index d59ffa1..efcd47e 100644
--- a/tools/win32/moduleset.in
+++ b/tools/win32/moduleset.in
@@ -68,7 +68,7 @@
     </autotools>
 
     <autotools id="glib">
-       <branch repo="gnome.org" module="sources/glib/2.39/glib-2.39.2.tar.xz" version="2.39.2">
+       <branch repo="gnome.org" module="sources/glib/2.41/glib-2.41.3.tar.xz" version="2.41.3">
            <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"/>
@@ -76,7 +76,6 @@
            <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>
diff --git a/tools/win32/patches/glib-goption-disable-localization.patch 
b/tools/win32/patches/glib-goption-disable-localization.patch
index 6508e05..5685a12 100644
--- a/tools/win32/patches/glib-goption-disable-localization.patch
+++ b/tools/win32/patches/glib-goption-disable-localization.patch
@@ -1,109 +1,141 @@
-diff -ur glib-2.26.0/glib/goption.c glib-2.26.0-new//glib/goption.c
---- glib-2.26.0/glib/goption.c 2010-09-17 13:14:23.000000000 -0400
-+++ glib-2.26.0-new//glib/goption.c    2010-10-05 19:04:41.000000000 -0400
-@@ -197,6 +197,7 @@
- 
-   guint            help_enabled   : 1;
-   guint            ignore_unknown : 1;
-+  guint            delocalize : 1;
- 
-   GOptionGroup    *main_group;
- 
-@@ -336,6 +337,7 @@
-   context->parameter_string = g_strdup (parameter_string);
-   context->help_enabled = TRUE;
-   context->ignore_unknown = FALSE;
-+  context->delocalize = TRUE;
- 
-   return context;
- }
-@@ -462,6 +464,23 @@
-   return context->ignore_unknown;
- }
- 
-+void
-+g_option_context_set_delocalize (GOptionContext *context,
-+                               gboolean        delocalize)
-+{
-+  g_return_if_fail (context != NULL);
-+
-+  context->delocalize = delocalize;
-+}
-+
-+gboolean
-+g_option_context_get_delocalize (GOptionContext *context)
-+{
-+  g_return_val_if_fail (context != NULL, FALSE);
-+
-+  return context->delocalize;
-+}
-+
- /**
-  * g_option_context_add_group:
-  * @context: a #GOptionContext
-@@ -1151,7 +1170,10 @@
-       {
-         gchar *data;
- 
--        data = g_locale_to_utf8 (value, -1, NULL, NULL, error);
-+      if (context->delocalize)
-+          data = g_locale_to_utf8 (value, -1, NULL, NULL, error);
-+      else
-+          data = g_strdup (value);
- 
-         if (!data)
-           return FALSE;
-@@ -1170,7 +1192,10 @@
-       {
-         gchar *data;
- 
--        data = g_locale_to_utf8 (value, -1, NULL, NULL, error);
-+      if (context->delocalize)
-+          data = g_locale_to_utf8 (value, -1, NULL, NULL, error);
-+      else
-+          data = g_strdup (value);
- 
-         if (!data)
-           return FALSE;
-@@ -1203,7 +1228,10 @@
-         gchar *data;
- 
- #ifdef G_OS_WIN32
--        data = g_locale_to_utf8 (value, -1, NULL, NULL, error);
-+      if (context->delocalize)
-+          data = g_locale_to_utf8 (value, -1, NULL, NULL, error);
-+      else
-+          data = g_strdup (value);
- 
-         if (!data)
-           return FALSE;
-@@ -1226,7 +1254,10 @@
-         gchar *data;
- 
- #ifdef G_OS_WIN32
--        data = g_locale_to_utf8 (value, -1, NULL, NULL, error);
-+      if (context->delocalize)
-+          data = g_locale_to_utf8 (value, -1, NULL, NULL, error);
-+      else
-+          data = g_strdup (value);
- 
-         if (!data)
-           return FALSE;
-@@ -1283,7 +1314,10 @@
-         else if (entry->flags & G_OPTION_FLAG_FILENAME)
-           {
- #ifdef G_OS_WIN32
--            data = g_locale_to_utf8 (value, -1, NULL, NULL, error);
-+          if (context->delocalize)
-+            data = g_locale_to_utf8 (value, -1, NULL, NULL, error);
-+          else
-+            data = g_strdup (value);
- #else
-             data = g_strdup (value);
- #endif
-diff -ur glib-2.26.0/glib/goption.h glib-2.26.0-new//glib/goption.h
+diff -ur glib-2.26.0/glib/goption.c glib-2.26.0-new/glib/goption.c
+--- glib-2.26.0/glib/goption.c 2010-07-07 16:57:11.000000000 -0400
++++ glib-2.26.0-new/glib/goption.c     2010-10-05 18:59:03.000000000 -0400
+***************
+*** 248,253 ****
+--- 248,254 ----
+    guint            help_enabled   : 1;
+    guint            ignore_unknown : 1;
+    guint            strv_mode      : 1;
++   guint            delocalize     : 1;
+  
+    GOptionGroup    *main_group;
+  
+***************
+*** 360,365 ****
+--- 361,367 ----
+    context->parameter_string = g_strdup (parameter_string);
+    context->help_enabled = TRUE;
+    context->ignore_unknown = FALSE;
++   context->delocalize = TRUE;
+  
+    return context;
+  }
+***************
+*** 483,488 ****
+--- 485,507 ----
+    return context->ignore_unknown;
+  }
+  
++ void
++ g_option_context_set_delocalize (GOptionContext *context,
++                               gboolean        delocalize)
++ {
++   g_return_if_fail (context != NULL);
++ 
++   context->delocalize = delocalize;
++ }
++ 
++ gboolean
++ g_option_context_get_delocalize (GOptionContext *context)
++ {
++   g_return_val_if_fail (context != NULL, FALSE);
++ 
++   return context->delocalize;
++ }
++ 
+  /**
+   * g_option_context_add_group:
+   * @context: a #GOptionContext
+***************
+*** 1199,1205 ****
+          gchar *data;
+  
+  #ifdef G_OS_WIN32
+!         if (!context->strv_mode)
+            data = g_locale_to_utf8 (value, -1, NULL, NULL, error);
+          else
+            data = g_strdup (value);
+--- 1218,1224 ----
+          gchar *data;
+  
+  #ifdef G_OS_WIN32
+!         if (!context->strv_mode && context->delocalize)
+            data = g_locale_to_utf8 (value, -1, NULL, NULL, error);
+          else
+            data = g_strdup (value);
+***************
+*** 1225,1231 ****
+          gchar *data;
+  
+  #ifdef G_OS_WIN32
+!         if (!context->strv_mode)
+            data = g_locale_to_utf8 (value, -1, NULL, NULL, error);
+          else
+            data = g_strdup (value);
+--- 1244,1250 ----
+          gchar *data;
+  
+  #ifdef G_OS_WIN32
+!         if (!context->strv_mode && context->delocalize)
+            data = g_locale_to_utf8 (value, -1, NULL, NULL, error);
+          else
+            data = g_strdup (value);
+***************
+*** 1264,1270 ****
+          gchar *data;
+  
+  #ifdef G_OS_WIN32
+!         if (!context->strv_mode)
+            data = g_locale_to_utf8 (value, -1, NULL, NULL, error);
+          else
+            data = g_strdup (value);
+--- 1283,1289 ----
+          gchar *data;
+  
+  #ifdef G_OS_WIN32
+!         if (!context->strv_mode && context->delocalize)
+            data = g_locale_to_utf8 (value, -1, NULL, NULL, error);
+          else
+            data = g_strdup (value);
+***************
+*** 1290,1296 ****
+          gchar *data;
+  
+  #ifdef G_OS_WIN32
+!         if (!context->strv_mode)
+            data = g_locale_to_utf8 (value, -1, NULL, NULL, error);
+          else
+            data = g_strdup (value);
+--- 1309,1315 ----
+          gchar *data;
+  
+  #ifdef G_OS_WIN32
+!         if (!context->strv_mode && context->delocalize)
+            data = g_locale_to_utf8 (value, -1, NULL, NULL, error);
+          else
+            data = g_strdup (value);
+***************
+*** 1350,1356 ****
+          else if (entry->flags & G_OPTION_FLAG_FILENAME)
+            {
+  #ifdef G_OS_WIN32
+!             if (!context->strv_mode)
+                data = g_locale_to_utf8 (value, -1, NULL, NULL, error);
+              else
+                data = g_strdup (value);
+--- 1369,1375 ----
+          else if (entry->flags & G_OPTION_FLAG_FILENAME)
+            {
+  #ifdef G_OS_WIN32
+!             if (!context->strv_mode && context->delocalize)
+                data = g_locale_to_utf8 (value, -1, NULL, NULL, error);
+              else
+                data = g_strdup (value);
+
+diff -ur glib-2.26.0/glib/goption.h glib-2.26.0-new/glib/goption.h
 --- glib-2.26.0/glib/goption.h 2010-07-07 16:57:11.000000000 -0400
-+++ glib-2.26.0-new//glib/goption.h    2010-10-05 18:59:03.000000000 -0400
++++ glib-2.26.0-new/glib/goption.h     2010-10-05 18:59:03.000000000 -0400
 @@ -321,6 +321,9 @@
  void          g_option_context_set_ignore_unknown_options (GOptionContext *context,
                                                             gboolean        ignore_unknown);