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

[harpchad at users.sourceforge.net]

Revision: 2991
          http://gar.svn.sourceforge.net/gar/?rev=2991&view=rev
Author:   harpchad
Date:     2009-02-04 18:57:48 +0000 (Wed, 04 Feb 2009)

Log Message:
-----------
Add typedetect patch

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

Added Paths:
-----------
    csw/mgar/pkg/glib2/trunk/files/glib-typedetect.patch

Modified: csw/mgar/pkg/glib2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/glib2/trunk/Makefile	2009-02-04 17:09:45 UTC (rev 2990)
+++ csw/mgar/pkg/glib2/trunk/Makefile	2009-02-04 18:57:48 UTC (rev 2991)
@@ -17,6 +17,8 @@
 
 #See gnome bug 569889
 PATCHFILES = gtkdoc-rebase.patch
+#See http://defect.opensolaris.org/bz/show_bug.cgi?id=3366 for discussion on:
+PATCHFILES += glib-typedetect.patch
 
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --with-libiconv=gnu

Added: csw/mgar/pkg/glib2/trunk/files/glib-typedetect.patch
===================================================================
--- csw/mgar/pkg/glib2/trunk/files/glib-typedetect.patch	                        (rev 0)
+++ csw/mgar/pkg/glib2/trunk/files/glib-typedetect.patch	2009-02-04 18:57:48 UTC (rev 2991)
@@ -0,0 +1,11 @@
+--- glib-2.17.6/gobject/gtype.c.origi	2008-08-05 01:21:30.000000000 +0800
++++ glib-2.17.6/gobject/gtype.c	2008-09-12 16:20:23.731146000 +0800
+@@ -589,7 +589,7 @@
+     {
+       TypeNode *node = lookup_type_node_I (type);
+       
+-      return node ? NODE_NAME (node) : "<unknown>";
++      return node ? (NODE_NAME (node) == NULL ? "<unknown>" : NODE_NAME (node)) : "<unknown>";
+     }
+   else
+     return "<invalid>";


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