# HG changeset patch
# User jacotton
# Date 1262811125 28800
# Node ID 3c34236236b318fd9e1f9ae9d6b44c3a32dda7ac
# Parent  217a239177c422f49cd1fffbbf3ddecd2c8a12e5
6913809 X application dumps core on nv_130 and ja_JP.UTF-8 locale

diff -r 217a239177c4 -r 3c34236236b3 open-src/lib/libX11/6913809.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/lib/libX11/6913809.patch	Wed Jan 06 12:52:05 2010 -0800
@@ -0,0 +1,23 @@
+--- modules/om/generic/omGeneric.c.old	Thu Dec 31 23:28:51 2009
++++ modules/om/generic/omGeneric.c	Sat Jan  3 09:10:58 2010
+@@ -437,11 +437,10 @@
+ 		}
+ 	    }
+ 
+-	    if(font_set->vrotate_num > 0) {
++	    if(font_set->vrotate_num > 0 && font_set->vrotate != NULL) {
+ 		font_data = (FontData) font_set->vrotate;
+ 		font_data_count = font_set->vrotate_num;
+ 		for( ; font_data_count-- ; font_data++) {
+-		    if(font_data != NULL)
+ 		    if(font_data->font != NULL) {
+ 			check_fontset_extents(&overall, &logical_ascent,
+ 					      &logical_descent,
+@@ -597,6 +596,7 @@
+ 	if((ptr = strchr(ptr, '-'))) {
+ 	    *ptr = '\0';
+ 	} else {
++	    field_num++;	/* Count last field */
+ 	    break;
+ 	}
+     }
diff -r 217a239177c4 -r 3c34236236b3 open-src/lib/libX11/Makefile
--- a/open-src/lib/libX11/Makefile	Mon Jan 04 13:30:00 2010 -0800
+++ b/open-src/lib/libX11/Makefile	Wed Jan 06 12:52:05 2010 -0800
@@ -30,7 +30,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# ident	"@(#)Makefile	1.26	09/12/05 SMI"
+# ident	"@(#)Makefile	1.27	10/01/05 SMI"
 #
 
 # Package name used in tarballs
@@ -98,7 +98,8 @@
 	locale-zh_HK.UTF-8.patch \
 	locale-zh_TW.UTF-8.patch \
 	locale-zh_TW.patch \
-	locale-ru-RU.UTF-8.patch
+	locale-ru-RU.UTF-8.patch \
+	6913809.patch 
 
 # Library name (used for specfiles/mapfiles)
 LIBNAME=X11