[csw-devel] SF.net SVN: gar:[16948] csw/mgar/pkg/glib2/trunk

[guengel at users.sourceforge.net]

Revision: 16948
          http://gar.svn.sourceforge.net/gar/?rev=16948&view=rev
Author:   guengel
Date:     2012-01-31 19:02:21 +0000 (Tue, 31 Jan 2012)
Log Message:
-----------
glib2/trunk: Added two more patches.

Modified Paths:
--------------
    csw/mgar/pkg/glib2/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/glib2/trunk/files/0002-Replace-sh-by-svcs-in-utils-find-program.patch

Modified: csw/mgar/pkg/glib2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/glib2/trunk/Makefile	2012-01-31 18:35:51 UTC (rev 16947)
+++ csw/mgar/pkg/glib2/trunk/Makefile	2012-01-31 19:02:21 UTC (rev 16948)
@@ -23,11 +23,16 @@
 
 DISTFILES = $(NAME)-$(VERSION).tar.bz2
 
-# Reported: https://bugzilla.gnome.org/show_bug.cgi?id=668973
+# Reported: https://bugzilla.gnome.org/show_bug.cgi?id=668973. New in glib-2.30.2
 PATCHFILES += 0001-Disable-inf-nan-mini-test.patch
+# The test looks for sh and expects it to be in /bin, but it is found
+# in /opt/csw/bin. So the patch makes it look for svcs. New in glib-2.30.2
+PATCHFILES += 0002-Replace-sh-by-svcs-in-utils-find-program.patch
+# Patch from glib-2.28.8
+PATCHFILES += 0002-Make-glib-work-with-zoneinfo-version-1.patch
 
 # PATCHFILES = 0001-Use-proper-locale-for-collate-tests.patch
-# PATCHFILES += 0002-Make-glib-work-with-zoneinfo-version-1.patch
+
 # PATCHFILES += 0003-Ad-hoc-macro-for-comparing-double.patch
 # PATCHFILES += 0004-Use-smtp-instead-of-http-in-network-address-test.patch
 # PATCHFILES += 0005-Fix-hard-coded-paths.patch

Added: csw/mgar/pkg/glib2/trunk/files/0002-Replace-sh-by-svcs-in-utils-find-program.patch
===================================================================
--- csw/mgar/pkg/glib2/trunk/files/0002-Replace-sh-by-svcs-in-utils-find-program.patch	                        (rev 0)
+++ csw/mgar/pkg/glib2/trunk/files/0002-Replace-sh-by-svcs-in-utils-find-program.patch	2012-01-31 19:02:21 UTC (rev 16948)
@@ -0,0 +1,34 @@
+From 903ddf339228d00341b397ec4c172ca64d3b6887 Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <raos at opencsw.org>
+Date: Mon, 30 Jan 2012 08:00:40 +0100
+Subject: [PATCH] Replace sh by svcs in utils/find-program
+
+---
+ glib/tests/utils.c |    9 +++++----
+ 1 files changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/glib/tests/utils.c b/glib/tests/utils.c
+index 81f2706..c8344c7 100644
+--- a/glib/tests/utils.c
++++ b/glib/tests/utils.c
+@@ -210,12 +210,13 @@ test_find_program (void)
+ {
+   gchar *res;
+ 
+-  res = g_find_program_in_path ("sh");
+-  g_assert_cmpstr (res, ==, "/bin/sh");
++  /* sh may be ambigous on Solaris */
++  res = g_find_program_in_path ("svcs");
++  g_assert_cmpstr (res, ==, "/usr/bin/svcs");
+   g_free (res);
+ 
+-  res = g_find_program_in_path ("/bin/sh");
+-  g_assert_cmpstr (res, ==, "/bin/sh");
++  res = g_find_program_in_path ("/usr/bin/svcs");
++  g_assert_cmpstr (res, ==, "/usr/bin/svcs");
+   g_free (res);
+ 
+   res = g_find_program_in_path ("this_program_does_not_exit");
+-- 
+1.7.8.3
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.