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

[dmichelsen at users.sourceforge.net]

Revision: 9062
          http://gar.svn.sourceforge.net/gar/?rev=9062&view=rev
Author:   dmichelsen
Date:     2010-03-09 15:11:03 +0000 (Tue, 09 Mar 2010)

Log Message:
-----------
glib2: Update to 2.23.5

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

Added Paths:
-----------
    csw/mgar/pkg/glib2/trunk/files/0001-Use-G_STRFUNC-instead-of-explicit-gcc-only-__PRETTY_.patch

Modified: csw/mgar/pkg/glib2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/glib2/trunk/Makefile	2010-03-09 14:53:38 UTC (rev 9061)
+++ csw/mgar/pkg/glib2/trunk/Makefile	2010-03-09 15:11:03 UTC (rev 9062)
@@ -1,5 +1,5 @@
 GARNAME = glib
-GARVERSION = 2.23.1
+GARVERSION = 2.23.5
 CATEGORIES = lib
 
 DESCRIPTION = The GLib library of C routines.
@@ -22,8 +22,9 @@
 PATCHFILES  = glib-typedetect.patch
 PATCHFILES += FIXED_STR.patch
 PATCHFILES += gsize.patch
-PATCHFILES += gconverter.patch
+# PATCHFILES += gconverter.patch
 PATCHFILES += CMSG_LEN.patch
+PATCHFILES += 0001-Use-G_STRFUNC-instead-of-explicit-gcc-only-__PRETTY_.patch
 
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --with-libiconv=gnu

Modified: csw/mgar/pkg/glib2/trunk/checksums
===================================================================
--- csw/mgar/pkg/glib2/trunk/checksums	2010-03-09 14:53:38 UTC (rev 9061)
+++ csw/mgar/pkg/glib2/trunk/checksums	2010-03-09 15:11:03 UTC (rev 9062)
@@ -1,6 +1,6 @@
+a87638e0505b6ff29efd8130450003c5  0001-Use-G_STRFUNC-instead-of-explicit-gcc-only-__PRETTY_.patch
 9f66027a275eb34d80a68ec8927bf66e  CMSG_LEN.patch
 f1f3c182f64be06ab57d8b01016af074  FIXED_STR.patch
-ed4a6616a70705b56babe709787431d4  gconverter.patch
-fb637f6122690254097d0b6d470f6ed3  glib-2.23.1.tar.bz2
+f249a94e8da086fd5d6e24dd4c1a1324  glib-2.23.5.tar.bz2
 8f683820d9ecab1abd9dbe81997ab9eb  glib-typedetect.patch
 bb2fb8eef43c995fea6c08563487ace6  gsize.patch

Added: csw/mgar/pkg/glib2/trunk/files/0001-Use-G_STRFUNC-instead-of-explicit-gcc-only-__PRETTY_.patch
===================================================================
--- csw/mgar/pkg/glib2/trunk/files/0001-Use-G_STRFUNC-instead-of-explicit-gcc-only-__PRETTY_.patch	                        (rev 0)
+++ csw/mgar/pkg/glib2/trunk/files/0001-Use-G_STRFUNC-instead-of-explicit-gcc-only-__PRETTY_.patch	2010-03-09 15:11:03 UTC (rev 9062)
@@ -0,0 +1,25 @@
+From 0ec0789eab4126e3deee2b807da92d6a28dbdad6 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Tue, 9 Mar 2010 15:02:57 +0100
+Subject: [PATCH] Use G_STRFUNC instead of explicit gcc-only __PRETTY_FUNC__
+
+---
+ glib/gvariant.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/glib/gvariant.c b/glib/gvariant.c
+index adc9030..d484ee2 100644
+--- a/glib/gvariant.c
++++ b/glib/gvariant.c
+@@ -282,7 +282,7 @@
+  */
+ #define TYPE_CHECK(value, TYPE, val) \
+   if G_UNLIKELY (!g_variant_is_of_type (value, TYPE)) {           \
+-    g_return_if_fail_warning (G_LOG_DOMAIN, __PRETTY_FUNCTION__,  \
++    g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC,            \
+                               "g_variant_is_of_type (" #value     \
+                               ", " #TYPE ")");                    \
+     return val;                                                   \
+-- 
+1.7.0
+


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