[gtk-builder-win] glib: fix mistake in the patch



commit 52b4a7ca44a89309a0c0e50a80bf19b790612464
Author: Ignacio Casal Quinteiro <icq gnome org>
Date:   Mon Jul 14 09:47:57 2014 +0200

    glib: fix mistake in the patch

 ...2-do-not-rely-on-__argc-and-__argv-global.patch |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/win32/libs/12_glib/0001-gspawn-win32-do-not-rely-on-__argc-and-__argv-global.patch 
b/win32/libs/12_glib/0001-gspawn-win32-do-not-rely-on-__argc-and-__argv-global.patch
index c04946d..f3804de 100644
--- a/win32/libs/12_glib/0001-gspawn-win32-do-not-rely-on-__argc-and-__argv-global.patch
+++ b/win32/libs/12_glib/0001-gspawn-win32-do-not-rely-on-__argc-and-__argv-global.patch
@@ -1,4 +1,4 @@
-From 1e6c6b3c190778b94ce8b445d199477fc02c6e57 Mon Sep 17 00:00:00 2001
+From 1814764a1f82f7641eca16eea3821a6b75f49057 Mon Sep 17 00:00:00 2001
 From: Ignacio Casal Quinteiro <icq gnome org>
 Date: Mon, 14 Jul 2014 08:54:45 +0200
 Subject: [PATCH] gspawn-win32: do not rely on __argc and __argv global vars.
@@ -11,7 +11,7 @@ and convert them to utf8 to use them.
  1 file changed, 34 insertions(+), 33 deletions(-)
 
 diff --git a/glib/gspawn-win32-helper.c b/glib/gspawn-win32-helper.c
-index 136eb4a..75c8e02 100644
+index 136eb4a..76191f9 100644
 --- a/glib/gspawn-win32-helper.c
 +++ b/glib/gspawn-win32-helper.c
 @@ -64,8 +64,7 @@ write_err_and_exit (gint    fd,
@@ -50,7 +50,7 @@ index 136eb4a..75c8e02 100644
 +  g_assert (argc >= ARG_COUNT);
 +
 +  /* Convert unicode wargs to utf8 */
-+  argv = g_new(char *, argc);
++  argv = g_new(char *, argc + 1);
 +  for (i = 0; i < argc; i++)
 +    argv[i] = g_utf16_to_utf8(wargv[i], -1, NULL, NULL, NULL);
 +  argv[i] = NULL;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]