--- a/open-src/lib/libX11/om-generic.patch	Mon Aug 01 13:50:13 2011 -0700
+++ b/open-src/lib/libX11/om-generic.patch	Tue Aug 02 13:30:29 2011 -0700
@@ -21,9 +21,10 @@
 # DEALINGS IN THE SOFTWARE.
 #
 
-diff -urp -x '*~' -x '*.orig' modules/om/generic/omGeneric.c modules/om/generic/omGeneric.c
---- modules/om/generic/omGeneric.c	2010-11-21 18:48:04.435666511 -0800
-+++ modules/om/generic/omGeneric.c	2010-11-21 18:48:05.261723978 -0800
+diff --git a/modules/om/generic/omGeneric.c b/modules/om/generic/omGeneric.c
+index c5d9416..d286165 100644
+--- a/modules/om/generic/omGeneric.c
++++ b/modules/om/generic/omGeneric.c
 @@ -175,6 +175,11 @@ init_fontset(
  	if((font_set->substitute = init_fontdata(data->substitute,
  				   data->substitute_num)) == NULL)
@@ -143,7 +144,7 @@
  	    continue;
  
  	font_set->id = count;
-@@ -1177,7 +1202,7 @@ parse_fontname(
+@@ -1163,7 +1188,7 @@ parse_fontname(
  	    * a "missing_charset" will be reported to the client
  	    * for this CharSet.
  	    */
@@ -152,7 +153,7 @@
  	    font_data_return.side       = XlcUnknown;
  
  	    ret = parse_fontdata(oc, font_set, font_set->font_data,
-@@ -1275,7 +1300,7 @@ set_missing_list(
+@@ -1258,7 +1283,7 @@ set_missing_list(
      count = length = 0;
  
      for ( ; font_set_num-- > 0; font_set++) {
@@ -161,7 +162,7 @@
  	    continue;
  	}
  
-@@ -1322,7 +1347,7 @@ set_missing_list(
+@@ -1305,7 +1330,7 @@ set_missing_list(
      font_set_num = gen->font_set_num;
  
      for ( ; font_set_num-- > 0; font_set++) {
@@ -170,7 +171,7 @@
  	    continue;
  	}
  
-@@ -2110,6 +2135,20 @@ init_om(
+@@ -2089,6 +2114,20 @@ init_om(
  	}
          read_vw(lcd,data,num);
  	length += strlen(data->font_data->name) + 1;
@@ -191,9 +192,10 @@
      }
  
      /* required charset list */
-diff -urp -x '*~' -x '*.orig' modules/om/generic/omXChar.c modules/om/generic/omXChar.c
---- modules/om/generic/omXChar.c	2010-09-03 22:52:38.000000000 -0700
-+++ modules/om/generic/omXChar.c	2010-11-21 18:48:05.262027476 -0800
+diff --git a/modules/om/generic/omXChar.c b/modules/om/generic/omXChar.c
+index ff517d5..0120c5b 100644
+--- a/modules/om/generic/omXChar.c
++++ b/modules/om/generic/omXChar.c
 @@ -326,6 +326,12 @@ load_font(
      XOC oc,
      FontSet font_set)
@@ -220,9 +222,10 @@
  
      length = *to_left - cs_left;
  
-diff -urp -x '*~' -x '*.orig' src/XomGeneric.h src/XomGeneric.h
---- src/XomGeneric.h	2010-09-03 22:52:39.000000000 -0700
-+++ src/XomGeneric.h	2010-11-21 18:48:05.262416597 -0800
+diff --git a/src/XomGeneric.h b/src/XomGeneric.h
+index d6f182d..d8eaf89 100644
+--- a/src/XomGeneric.h
++++ b/src/XomGeneric.h
 @@ -81,6 +81,9 @@ typedef struct _OMDataRec {
      XlcCharSet 	*charset_list;
      int 	font_data_count;