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

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Tue Jul 6 14:40:26 CEST 2010


Revision: 10457
          http://gar.svn.sourceforge.net/gar/?rev=10457&view=rev
Author:   dmichelsen
Date:     2010-07-06 12:40:26 +0000 (Tue, 06 Jul 2010)

Log Message:
-----------
glib2: Try updating to 2.25.10, some tests fail

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

Added Paths:
-----------
    csw/mgar/pkg/glib2/trunk/files/0001-Replace-.-not-understood-by-Sun-Studio.patch

Modified: csw/mgar/pkg/glib2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/glib2/trunk/Makefile	2010-07-06 08:53:16 UTC (rev 10456)
+++ csw/mgar/pkg/glib2/trunk/Makefile	2010-07-06 12:40:26 UTC (rev 10457)
@@ -1,5 +1,5 @@
 GARNAME = glib
-GARVERSION = 2.25.7
+GARVERSION = 2.25.10
 CATEGORIES = lib
 
 DESCRIPTION = The GLib library of C routines.
@@ -20,7 +20,7 @@
 DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2
 
 PATCHFILES  = glib-typedetect.patch
-PATCHFILES += FIXED_STR.patch
+# PATCHFILES += FIXED_STR.patch
 PATCHFILES += gsize.patch
 # PATCHFILES += gconverter.patch
 PATCHFILES += CMSG_LEN.patch
@@ -30,6 +30,7 @@
 # PATCHFILES += 0001-Use-G_STRFUNC-instead-of-explicit-gcc-only-__PRETTY_.patch
 
 PATCHFILES += 0001-Make-sure-we-have-the-include-for-major-minor.patch
+PATCHFILES += 0001-Replace-.-not-understood-by-Sun-Studio.patch
 
 # We don't need it and if defined the test breaks
 LD_OPTIONS =
@@ -44,6 +45,8 @@
 BUILD64 = 1
 NOISAEXEC = 1
 
+BUILD_DEP_PKGS = CSWggettext
+
 RUNTIME_DEP_PKGS_CSWglib2 += CSWggettextrt
 RUNTIME_DEP_PKGS_CSWglib2 += CSWiconv
 RUNTIME_DEP_PKGS_CSWglib2 += CSWzlib
@@ -65,3 +68,6 @@
 EXTRA_LDFLAGS = -lsocket
 
 include gar/category.mk
+
+# We need /opt/csw/gnu/gettext, /usr/bin/gettext bails out
+PATH := /opt/csw/gnu:$(PATH)

Modified: csw/mgar/pkg/glib2/trunk/checksums
===================================================================
--- csw/mgar/pkg/glib2/trunk/checksums	2010-07-06 08:53:16 UTC (rev 10456)
+++ csw/mgar/pkg/glib2/trunk/checksums	2010-07-06 12:40:26 UTC (rev 10457)
@@ -1,5 +1,7 @@
+39b575a4c1dd2234a88d755a13332458  0001-Make-sure-we-have-the-include-for-major-minor.patch
+77188ce430577f5db01ba9d73aed5bcd  0001-Replace-.-not-understood-by-Sun-Studio.patch
 9f66027a275eb34d80a68ec8927bf66e  CMSG_LEN.patch
 f1f3c182f64be06ab57d8b01016af074  FIXED_STR.patch
-ac4867b9450f8bf5f1075336a32a1a88  glib-2.25.7.tar.bz2
+cdbe09f15536b526e19f06893e9b64ef  glib-2.25.10.tar.bz2
 8f683820d9ecab1abd9dbe81997ab9eb  glib-typedetect.patch
 bb2fb8eef43c995fea6c08563487ace6  gsize.patch

Added: csw/mgar/pkg/glib2/trunk/files/0001-Replace-.-not-understood-by-Sun-Studio.patch
===================================================================
--- csw/mgar/pkg/glib2/trunk/files/0001-Replace-.-not-understood-by-Sun-Studio.patch	                        (rev 0)
+++ csw/mgar/pkg/glib2/trunk/files/0001-Replace-.-not-understood-by-Sun-Studio.patch	2010-07-06 12:40:26 UTC (rev 10457)
@@ -0,0 +1,42 @@
+From 4df7207a66d0160dd99ea8cd9940194bc84ed6e0 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Tue, 6 Jul 2010 11:09:13 +0200
+Subject: [PATCH] Replace ... not understood by Sun Studio
+
+---
+ glib/tests/checksum.c |   18 ++++++++++++++++--
+ 1 files changed, 16 insertions(+), 2 deletions(-)
+
+diff --git a/glib/tests/checksum.c b/glib/tests/checksum.c
+index 0e51736..26469a5 100644
+--- a/glib/tests/checksum.c
++++ b/glib/tests/checksum.c
+@@ -615,9 +615,23 @@ hexval (const gchar c)
+ {
+   switch (c)
+     {
+-     case '0' ... '9':
++     case '0':
++     case '1':
++     case '2':
++     case '3':
++     case '4':
++     case '5':
++     case '6':
++     case '7':
++     case '8':
++     case '9':
+        return c - '0';
+-     case 'a' ... 'f':
++     case 'a':
++     case 'b':
++     case 'c':
++     case 'd':
++     case 'e':
++     case 'f':
+        return 10 + c - 'a';
+      default:
+        return 0;
+-- 
+1.7.1
+


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


More information about the devel mailing list