r15361 - in /desktop/unstable/glib2.0/debian: changelog patches/05_hurd-arg-max.patch

[slomo at users.alioth.debian.org]

Author: slomo
Date: Sat Mar 22 12:46:43 2008
New Revision: 15361

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15361
Log:
* debian/patches/05_hurd-arg-max.patch:
  + Patch by Samuel Thibault to fix FTBFS on hurd-i386 (Closes: #472129).

Added:
    desktop/unstable/glib2.0/debian/patches/05_hurd-arg-max.patch
Modified:
    desktop/unstable/glib2.0/debian/changelog

Modified: desktop/unstable/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/changelog?rev=15361&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/changelog (original)
+++ desktop/unstable/glib2.0/debian/changelog Sat Mar 22 12:46:43 2008
@@ -1,5 +1,6 @@
 glib2.0 (2.16.1-3) UNRELEASED; urgency=low
 
+  [ Loic Minier ]
   * Drop nautilus conflicts as it triggers a bug in the APT resolver on
     dist-upgrade.
   * Update patch 01_gettext-desktopfiles with a newer version taken from the
@@ -7,7 +8,11 @@
   * Update and enable patch 01_gettext-desktopfiles to also look for
     X-Debian-Gettext-Domain if X-Ubuntu-Gettext-Domain isn't present.
 
- -- Loic Minier <lool at dooz.org>  Thu, 20 Mar 2008 16:42:00 +0100
+  [ Sebastian Dröge ]
+  * debian/patches/05_hurd-arg-max.patch:
+    + Patch by Samuel Thibault to fix FTBFS on hurd-i386 (Closes: #472129).
+
+ -- Sebastian Dröge <slomo at debian.org>  Sat, 22 Mar 2008 13:43:37 +0100
 
 glib2.0 (2.16.1-2) unstable; urgency=low
 

Added: desktop/unstable/glib2.0/debian/patches/05_hurd-arg-max.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/patches/05_hurd-arg-max.patch?rev=15361&op=file
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/05_hurd-arg-max.patch (added)
+++ desktop/unstable/glib2.0/debian/patches/05_hurd-arg-max.patch Sat Mar 22 12:46:43 2008
@@ -1,0 +1,60 @@
+Index: glib/gtester.c
+===================================================================
+--- glib/gtester.c	(Revision 6750)
++++ glib/gtester.c	(Arbeitskopie)
+@@ -273,7 +273,8 @@
+   GTestLogBuffer *tlb;
+   GSList *slist, *free_list = NULL;
+   GError *error = NULL;
+-  const gchar *argv[ARG_MAX];
++  int argc = 0;
++  const gchar **argv;
+   GPid pid = 0;
+   gint report_pipe[2] = { -1, -1 };
+   guint child_report_cb_id = 0;
+@@ -289,7 +290,34 @@
+       return FALSE;
+     }
+ 
++  /* setup argc */
++  for (slist = subtest_args; slist; slist = slist->next)
++    argc++;
++  /* argc++; */
++  if (subtest_quiet)
++    argc++;
++  if (subtest_verbose)
++    argc++;
++  if (!subtest_mode_fatal)
++    argc++;
++  if (subtest_mode_quick)
++    argc++;
++  else
++    argc++;
++  if (subtest_mode_perf)
++    argc++;
++  if (gtester_list_tests)
++    argc++;
++  if (subtest_seedstr)
++    argc++;
++  argc++;
++  if (skip_tests)
++    argc++;
++  for (slist = subtest_paths; slist; slist = slist->next)
++    argc++;
++
+   /* setup argv */
++  argv = g_malloc ((argc + 1) * sizeof(gchar *));
+   argv[i++] = binary;
+   for (slist = subtest_args; slist; slist = slist->next)
+     argv[i++] = (gchar*) slist->data;
+@@ -343,8 +371,10 @@
+       else
+         g_warning ("Failed to execute test binary: %s: %s", argv[0], error->message);
+       g_clear_error (&error);
++      g_free (argv);
+       return FALSE;
+     }
++  g_free (argv);
+ 
+   subtest_running = TRUE;
+   subtest_io_pending = TRUE;