Clean up motif-2.2.3 patchset, so that it can be applied with -p1.

13 files changed, 96 insertions, 111 deletions

diff --git a/patchsets/motif/2.2.3/01_all_mwm-configdir.patch b/patchsets/motif/2.2.3/01_all_mwm-configdir.patch
index c83f34a..6ba0288 100644
--- a/patchsets/motif/2.2.3/01_all_mwm-configdir.patch
+++ b/patchsets/motif/2.2.3/01_all_mwm-configdir.patch
@@ -1,6 +1,5 @@
-diff -urN openMotif-2.2.2.orig/clients/mwm/WmResParse.c openMotif-2.2.2/clients/mwm/WmResParse.c
---- openMotif-2.2.2.orig/clients/mwm/WmResParse.c	2002-01-10 21:55:37.000000000 +0100
-+++ openMotif-2.2.2/clients/mwm/WmResParse.c	2003-06-04 22:20:22.000000000 +0200
+--- openMotif-2.2.2.orig/clients/mwm/WmResParse.c
++++ openMotif-2.2.2/clients/mwm/WmResParse.c
 @@ -2411,7 +2411,7 @@
  	if (MwmBehavior)
  	{
diff --git a/patchsets/motif/2.2.3/02_all_CAN-2004-0687-0688.patch b/patchsets/motif/2.2.3/02_all_CAN-2004-0687-0688.patch
index 6c8b0e0..6e8fbca 100644
--- a/patchsets/motif/2.2.3/02_all_CAN-2004-0687-0688.patch
+++ b/patchsets/motif/2.2.3/02_all_CAN-2004-0687-0688.patch
@@ -1,5 +1,5 @@
---- openMotif-2.2.3/lib/Xm/Xpmhashtab.c.CAN-2004-0687-0688	2004-09-30 11:52:40.176933831 +0200
-+++ openMotif-2.2.3/lib/Xm/Xpmhashtab.c	2004-09-30 11:53:47.288717782 +0200
+--- openMotif-2.2.3/lib/Xm/Xpmhashtab.c.CAN-2004-0687-0688
++++ openMotif-2.2.3/lib/Xm/Xpmhashtab.c
 @@ -141,7 +141,7 @@
      xpmHashTable *table;
  {
@@ -27,8 +27,8 @@
      atomTable = (xpmHashAtom *) XpmMalloc(table->size * sizeof(*atomTable));
      if (!atomTable)
  	return (XpmNoMemory);
---- openMotif-2.2.3/lib/Xm/XpmWrFFrI.c.CAN-2004-0687-0688	2004-09-30 11:36:04.545969020 +0200
-+++ openMotif-2.2.3/lib/Xm/XpmWrFFrI.c	2004-09-30 11:37:14.583312219 +0200
+--- openMotif-2.2.3/lib/Xm/XpmWrFFrI.c.CAN-2004-0687-0688
++++ openMotif-2.2.3/lib/Xm/XpmWrFFrI.c
 @@ -244,6 +244,8 @@
      unsigned int x, y, h;
  
@@ -38,8 +38,8 @@
      p = buf = (char *) XpmMalloc(width * cpp + 3);
      if (!buf)
  	return (XpmNoMemory);
---- openMotif-2.2.3/lib/Xm/Xpmdata.c.CAN-2004-0687-0688	2004-09-30 11:51:30.712472999 +0200
-+++ openMotif-2.2.3/lib/Xm/Xpmdata.c	2004-09-30 11:52:26.665789239 +0200
+--- openMotif-2.2.3/lib/Xm/Xpmdata.c.CAN-2004-0687-0688
++++ openMotif-2.2.3/lib/Xm/Xpmdata.c
 @@ -376,7 +376,7 @@
  {
      if (!mdata->type)
@@ -49,8 +49,8 @@
  	*cmt = (char *) XpmMalloc(mdata->CommentLength + 1);
  	strncpy(*cmt, mdata->Comment, mdata->CommentLength);
  	(*cmt)[mdata->CommentLength] = '\0';
---- openMotif-2.2.3/lib/Xm/XpmI.h.CAN-2004-0687-0688	2004-09-30 11:38:09.358760225 +0200
-+++ openMotif-2.2.3/lib/Xm/XpmI.h	2004-09-30 11:39:58.498714150 +0200
+--- openMotif-2.2.3/lib/Xm/XpmI.h.CAN-2004-0687-0688
++++ openMotif-2.2.3/lib/Xm/XpmI.h
 @@ -179,6 +179,18 @@
  		boundCheckingCalloc((long)(nelem),(long) (elsize))
  #endif
@@ -83,8 +83,8 @@
      xpmHashAtom *atomTable;
  }      xpmHashTable;
  
---- openMotif-2.2.3/lib/Xm/XpmCrDatFrI.c.CAN-2004-0687-0688	2004-09-30 11:35:18.058379165 +0200
-+++ openMotif-2.2.3/lib/Xm/XpmCrDatFrI.c	2004-09-30 11:35:43.951808698 +0200
+--- openMotif-2.2.3/lib/Xm/XpmCrDatFrI.c.CAN-2004-0687-0688
++++ openMotif-2.2.3/lib/Xm/XpmCrDatFrI.c
 @@ -134,6 +134,8 @@
       */
      header_nlines = 1 + image->ncolors;
@@ -94,8 +94,8 @@
      header = (char **) XpmCalloc(header_size, sizeof(char *));
      if (!header)
  	return (XpmNoMemory);
---- openMotif-2.2.3/lib/Xm/Xpmscan.c.CAN-2004-0687-0688	2004-09-30 12:05:34.424607695 +0200
-+++ openMotif-2.2.3/lib/Xm/Xpmscan.c	2004-09-30 12:08:16.963282178 +0200
+--- openMotif-2.2.3/lib/Xm/Xpmscan.c.CAN-2004-0687-0688
++++ openMotif-2.2.3/lib/Xm/Xpmscan.c
 @@ -98,7 +98,8 @@
  LFUNC(ScanTransparentColor, int, (XpmColor *color, unsigned int cpp,
  				  XpmAttributes *attributes));
@@ -160,8 +160,8 @@
      xcolors = (XColor *) XpmMalloc(sizeof(XColor) * ncolors);
      if (!xcolors)
  	return (XpmNoMemory);
---- openMotif-2.2.3/lib/Xm/XpmAttrib.c.CAN-2004-0687-0688	2004-09-30 11:33:10.216008908 +0200
-+++ openMotif-2.2.3/lib/Xm/XpmAttrib.c	2004-09-30 11:33:41.187737616 +0200
+--- openMotif-2.2.3/lib/Xm/XpmAttrib.c.CAN-2004-0687-0688
++++ openMotif-2.2.3/lib/Xm/XpmAttrib.c
 @@ -41,8 +41,8 @@
  #include "XpmI.h"
  
@@ -190,8 +190,8 @@
      colorTable = (XpmColor **) XpmMalloc(ncolors * sizeof(XpmColor *));
      if (!colorTable) {
  	*oldct = NULL;
---- openMotif-2.2.3/lib/Xm/Xpmcreate.c.CAN-2004-0687-0688	2004-09-30 11:40:22.122457590 +0200
-+++ openMotif-2.2.3/lib/Xm/Xpmcreate.c	2004-09-30 12:49:44.411019183 +0200
+--- openMotif-2.2.3/lib/Xm/Xpmcreate.c.CAN-2004-0687-0688
++++ openMotif-2.2.3/lib/Xm/Xpmcreate.c
 @@ -804,6 +804,9 @@
  
      ErrorStatus = XpmSuccess;
@@ -241,8 +241,8 @@
  	    buf[cpp] = '\0';
  	    if (USE_HASHTABLE) {
  		xpmHashAtom *slot;
---- openMotif-2.2.3/lib/Xm/Xpmparse.c.CAN-2004-0687-0688	2004-09-30 11:54:01.219804716 +0200
-+++ openMotif-2.2.3/lib/Xm/Xpmparse.c	2004-09-30 12:47:15.676480282 +0200
+--- openMotif-2.2.3/lib/Xm/Xpmparse.c.CAN-2004-0687-0688
++++ openMotif-2.2.3/lib/Xm/Xpmparse.c
 @@ -46,6 +46,25 @@
  
  #include "XpmI.h"
diff --git a/patchsets/motif/2.2.3/03_all_CAN-2004-0914-newer.patch b/patchsets/motif/2.2.3/03_all_CAN-2004-0914-newer.patch
index cedf5d4..e01af24 100644
--- a/patchsets/motif/2.2.3/03_all_CAN-2004-0914-newer.patch
+++ b/patchsets/motif/2.2.3/03_all_CAN-2004-0914-newer.patch
@@ -1,6 +1,5 @@
-diff -Nur lib/Xm/Imakefile lib/Xm/Imakefile
---- lib/Xm/Imakefile	2002-01-15 18:30:40.000000000 +0100
-+++ lib/Xm/Imakefile	2005-02-14 14:24:12.000000000 +0100
+--- openMotif-2.2.3/lib/Xm/Imakefile
++++ openMotif-2.2.3/lib/Xm/Imakefile
 @@ -211,7 +211,8 @@
          XpmCrBufFrP.c  XpmCrPFrBuf.c  XpmRdFToDat.c  XpmWrFFrP.c    Xpmrgb.c \
          XpmCrDatFrI.c  XpmCrPFrDat.c  XpmRdFToI.c    Xpmcreate.c    Xpmscan.c \
@@ -21,8 +20,8 @@ diff -Nur lib/Xm/Imakefile lib/Xm/Imakefile
  
  #if UseLocalRegex
  REGEX_OBJS = regexp.o
---- lib/Xm/Makefile.am	2004-11-17 19:03:26.962797006 +0100
-+++ lib/Xm/Makefile.am	2004-11-17 19:03:49.421724642 +0100
+--- openMotif-2.2.3/lib/Xm/Makefile.am
++++ openMotif-2.2.3/lib/Xm/Makefile.am
 @@ -241,7 +241,8 @@
          XpmCrBufFrP.c  XpmCrPFrBuf.c  XpmRdFToDat.c  XpmWrFFrP.c    Xpmrgb.c \
          XpmCrDatFrI.c  XpmCrPFrDat.c  XpmRdFToI.c    Xpmcreate.c    Xpmscan.c \
@@ -33,8 +32,8 @@ diff -Nur lib/Xm/Imakefile lib/Xm/Imakefile
  
  NEW_WID_SRCS =         IconH.c        Container.c     IconG.c  \
          Notebook.c     ComboBox.c     GrabShell.c     SpinB.c  \
---- /dev/null	1970-01-01 01:00:00.000000000 +0100
-+++ lib/Xm/Xpms_popen.c	2005-02-14 14:24:12.942319466 +0100
+--- /dev/null
++++ openMotif-2.2.3/lib/Xm/Xpms_popen.c
 @@ -0,0 +1,182 @@
 +/*
 + * Copyright (C) 2004 The X.Org fundation
@@ -218,9 +217,8 @@ diff -Nur lib/Xm/Imakefile lib/Xm/Imakefile
 +  }
 +}
 +
-diff -Nur lib/Xm/XpmAttrib.c lib/Xm/XpmAttrib.c
---- lib/Xm/XpmAttrib.c	2005-02-14 15:20:49.346039704 +0100
-+++ lib/Xm/XpmAttrib.c	2005-02-14 14:26:42.742624081 +0100
+--- openMotif-2.2.3/lib/Xm/XpmAttrib.c
++++ openMotif-2.2.3/lib/Xm/XpmAttrib.c
 @@ -44,7 +44,7 @@
  LFUNC(CreateOldColorTable, int, (XpmColor *ct, unsigned int ncolors,
                                   XpmColor ***oldct));
@@ -263,9 +261,8 @@ diff -Nur lib/Xm/XpmAttrib.c lib/Xm/XpmAttrib.c
  	for (i = 0, ext = extensions; i < nextensions; i++, ext++) {
  	    if (ext->name)
  		XpmFree(ext->name);
-diff -Nur lib/Xm/XpmCrBufFrI.c lib/Xm/XpmCrBufFrI.c
---- lib/Xm/XpmCrBufFrI.c	2003-08-15 11:08:59.000000000 +0200
-+++ lib/Xm/XpmCrBufFrI.c	2005-02-14 14:28:44.975393496 +0100
+--- openMotif-2.2.3/lib/Xm/XpmCrBufFrI.c
++++ openMotif-2.2.3/lib/Xm/XpmCrBufFrI.c
 @@ -41,21 +41,26 @@
  #endif
  
@@ -591,9 +588,8 @@ diff -Nur lib/Xm/XpmCrBufFrI.c lib/Xm/XpmCrBufFrI.c
      if (info->hints_cmt)
  	size += 5 + strlen(info->hints_cmt);
  
-diff -Nur lib/Xm/XpmCrDatFrI.c lib/Xm/XpmCrDatFrI.c
---- lib/Xm/XpmCrDatFrI.c	2005-02-14 15:20:49.344040101 +0100
-+++ lib/Xm/XpmCrDatFrI.c	2005-02-14 14:32:22.610251056 +0100
+--- openMotif-2.2.3/lib/Xm/XpmCrDatFrI.c
++++ openMotif-2.2.3/lib/Xm/XpmCrDatFrI.c
 @@ -38,13 +38,16 @@
  #endif
  
@@ -818,9 +814,8 @@ diff -Nur lib/Xm/XpmCrDatFrI.c lib/Xm/XpmCrDatFrI.c
  	for (y = 0, line = ext->lines; y < b; y++, line++) {
  	    strcpy(*dataptr, *line);
  	    a++;
-diff -Nur lib/Xm/Xpmcreate.c lib/Xm/Xpmcreate.c
---- lib/Xm/Xpmcreate.c	2005-02-14 15:20:49.348039308 +0100
-+++ lib/Xm/Xpmcreate.c	2005-02-14 14:36:37.104801803 +0100
+--- openMotif-2.2.3/lib/Xm/Xpmcreate.c
++++ openMotif-2.2.3/lib/Xm/Xpmcreate.c
 @@ -44,6 +44,8 @@
  #endif
  
@@ -1170,9 +1165,8 @@ diff -Nur lib/Xm/Xpmcreate.c lib/Xm/Xpmcreate.c
  #ifndef FOR_MSW
  			    XPutPixel(image, x, y,
  				      image_pixels[cidx[cc1][cc2] - 1]);
-diff -Nur lib/Xm/Xpmdata.c lib/Xm/Xpmdata.c
---- lib/Xm/Xpmdata.c	2005-02-14 15:20:49.343040299 +0100
-+++ lib/Xm/Xpmdata.c	2005-02-14 14:38:22.161975990 +0100
+--- openMotif-2.2.3/lib/Xm/Xpmdata.c
++++ openMotif-2.2.3/lib/Xm/Xpmdata.c
 @@ -33,6 +33,8 @@
  *  Developed by Arnaud Le Hors                                                *
  \*****************************************************************************/
@@ -1212,9 +1206,8 @@ diff -Nur lib/Xm/Xpmdata.c lib/Xm/Xpmdata.c
      int l, n = 0;
  
      if (mdata->type) {
-diff -Nur lib/Xm/Xpmhashtab.c lib/Xm/Xpmhashtab.c
---- lib/Xm/Xpmhashtab.c	2005-02-14 15:20:49.342040497 +0100
-+++ lib/Xm/Xpmhashtab.c	2005-02-14 14:39:44.386676330 +0100
+--- openMotif-2.2.3/lib/Xm/Xpmhashtab.c
++++ openMotif-2.2.3/lib/Xm/Xpmhashtab.c
 @@ -144,13 +144,13 @@
      unsigned int size = table->size;
      xpmHashAtom *t, *p;
@@ -1240,8 +1233,8 @@ diff -Nur lib/Xm/Xpmhashtab.c lib/Xm/Xpmhashtab.c
         return (XpmNoMemory);
      atomTable = (xpmHashAtom *) XpmMalloc(table->size * sizeof(*atomTable));
      if (!atomTable)
---- lib/Xm/XpmI.h	2005-02-14 15:20:49.344040101 +0100
-+++ lib/Xm/XpmI.h	2005-02-14 14:24:12.903327195 +0100
+--- openMotif-2.2.3/lib/Xm/XpmI.h
++++ openMotif-2.2.3/lib/Xm/XpmI.h
 @@ -108,8 +109,10 @@
   * lets try to solve include files
   */
@@ -1253,9 +1246,8 @@ diff -Nur lib/Xm/Xpmhashtab.c lib/Xm/Xpmhashtab.c
  /* stdio.h doesn't declare popen on a Sequent DYNIX OS */
  #ifdef sequent
  extern FILE *popen();
-diff -Nur lib/Xm/Xpmmisc.c lib/Xm/Xpmmisc.c
---- lib/Xm/Xpmmisc.c	2002-01-10 21:57:09.000000000 +0100
-+++ lib/Xm/Xpmmisc.c	2005-02-14 14:24:12.907326402 +0100
+--- openMotif-2.2.3/lib/Xm/Xpmmisc.c
++++ openMotif-2.2.3/lib/Xm/Xpmmisc.c
 @@ -52,7 +52,7 @@
      char *s1;
  {
@@ -1265,9 +1257,8 @@ diff -Nur lib/Xm/Xpmmisc.c lib/Xm/Xpmmisc.c
  
      if (s2 = (char *) XpmMalloc(l))
  	strcpy(s2, s1);
-diff -Nur lib/Xm/Xpmparse.c lib/Xm/Xpmparse.c
---- lib/Xm/Xpmparse.c	2005-02-14 15:20:49.349039110 +0100
-+++ lib/Xm/Xpmparse.c	2005-02-14 14:46:55.361242890 +0100
+--- openMotif-2.2.3/lib/Xm/Xpmparse.c
++++ openMotif-2.2.3/lib/Xm/Xpmparse.c
 @@ -49,21 +49,21 @@
  #include <string.h>
   
@@ -1469,9 +1460,8 @@ diff -Nur lib/Xm/Xpmparse.c lib/Xm/Xpmparse.c
  	    if (!sp) {
  		XpmFree(string);
  		ext->nlines = nlines;
-diff -Nur lib/Xm/XpmRdFToBuf.c lib/Xm/XpmRdFToBuf.c
---- lib/Xm/XpmRdFToBuf.c	2002-01-10 21:57:08.000000000 +0100
-+++ lib/Xm/XpmRdFToBuf.c	2005-02-14 14:24:12.904326997 +0100
+--- openMotif-2.2.3/lib/Xm/XpmRdFToBuf.c
++++ openMotif-2.2.3/lib/Xm/XpmRdFToBuf.c
 @@ -43,6 +43,8 @@
  #endif
  
@@ -1500,9 +1490,8 @@ diff -Nur lib/Xm/XpmRdFToBuf.c lib/Xm/XpmRdFToBuf.c
      ptr = (char *) XpmMalloc(len + 1);
      if (!ptr) {
  	fclose(fp);
-diff -Nur lib/Xm/XpmRdFToI.c lib/Xm/XpmRdFToI.c
---- lib/Xm/XpmRdFToI.c	2002-01-10 21:57:08.000000000 +0100
-+++ lib/Xm/XpmRdFToI.c	2005-02-14 14:24:12.861335519 +0100
+--- openMotif-2.2.3/lib/Xm/XpmRdFToI.c
++++ openMotif-2.2.3/lib/Xm/XpmRdFToI.c
 @@ -38,6 +38,8 @@
  #endif
  
@@ -1587,9 +1576,8 @@ diff -Nur lib/Xm/XpmRdFToI.c lib/Xm/XpmRdFToI.c
  	break;
  #endif
      }
-diff -Nur lib/Xm/Xpmscan.c lib/Xm/Xpmscan.c
---- lib/Xm/Xpmscan.c	2005-02-14 15:20:49.345039902 +0100
-+++ lib/Xm/Xpmscan.c	2005-02-14 14:48:52.388044300 +0100
+--- openMotif-2.2.3/lib/Xm/Xpmscan.c
++++ openMotif-2.2.3/lib/Xm/Xpmscan.c
 @@ -43,12 +43,14 @@
  #endif
  
@@ -1712,9 +1700,8 @@ diff -Nur lib/Xm/Xpmscan.c lib/Xm/Xpmscan.c
      char *data;
      Pixel pixel;
      int xoff, yoff, offset, bpl;
-diff -Nur lib/Xm/XpmWrFFrBuf.c lib/Xm/XpmWrFFrBuf.c
---- lib/Xm/XpmWrFFrBuf.c	2002-01-10 21:57:08.000000000 +0100
-+++ lib/Xm/XpmWrFFrBuf.c	2005-02-14 14:24:12.906326601 +0100
+--- openMotif-2.2.3/lib/Xm/XpmWrFFrBuf.c
++++ openMotif-2.2.3/lib/Xm/XpmWrFFrBuf.c
 @@ -38,6 +38,8 @@
  #endif
  
@@ -1733,9 +1720,8 @@ diff -Nur lib/Xm/XpmWrFFrBuf.c lib/Xm/XpmWrFFrBuf.c
  
      return XpmSuccess;
  }
-diff -Nur lib/Xm/XpmWrFFrI.c lib/Xm/XpmWrFFrI.c
---- lib/Xm/XpmWrFFrI.c	2005-02-14 15:20:49.343040299 +0100
-+++ lib/Xm/XpmWrFFrI.c	2005-02-14 14:50:25.766533589 +0100
+--- openMotif-2.2.3/lib/Xm/XpmWrFFrI.c
++++ openMotif-2.2.3/lib/Xm/XpmWrFFrI.c
 @@ -38,6 +38,8 @@
  #endif
  
diff --git a/patchsets/motif/2.2.3/04_all_CAN-2004-0914_sec8.patch b/patchsets/motif/2.2.3/04_all_CAN-2004-0914_sec8.patch
index 0bf4bcb..8a6b288 100644
--- a/patchsets/motif/2.2.3/04_all_CAN-2004-0914_sec8.patch
+++ b/patchsets/motif/2.2.3/04_all_CAN-2004-0914_sec8.patch
@@ -1,5 +1,5 @@
---- openMotif-2.2.3/lib/Xm/XpmWrFFrI.c.CAN-2004-0914_sec8	2004-11-29 15:04:10.105373839 +0100
-+++ openMotif-2.2.3/lib/Xm/XpmWrFFrI.c	2004-11-29 15:04:10.150367679 +0100
+--- openMotif-2.2.3/lib/Xm/XpmWrFFrI.c.CAN-2004-0914_sec8
++++ openMotif-2.2.3/lib/Xm/XpmWrFFrI.c
 @@ -322,10 +322,7 @@
  #ifndef NO_ZPIPE
  	size_t len = strlen(filename);
diff --git a/patchsets/motif/2.2.3/05_all_char_not_supported.patch b/patchsets/motif/2.2.3/05_all_char_not_supported.patch
index edd841b..c92609f 100644
--- a/patchsets/motif/2.2.3/05_all_char_not_supported.patch
+++ b/patchsets/motif/2.2.3/05_all_char_not_supported.patch
@@ -1,5 +1,5 @@
---- openMotif-2.2.3/lib/Xm/TextF.c.char_not_supported	2004-06-03 12:59:10.241822710 +0200
-+++ openMotif-2.2.3/lib/Xm/TextF.c	2004-06-03 13:02:18.987890852 +0200
+--- openMotif-2.2.3/lib/Xm/TextF.c.char_not_supported
++++ openMotif-2.2.3/lib/Xm/TextF.c
 @@ -3723,20 +3723,17 @@
        cache_ptr = tmp = XmStackAlloc(buf_size, cache);
     
diff --git a/patchsets/motif/2.2.3/06_all_pixel_length.patch b/patchsets/motif/2.2.3/06_all_pixel_length.patch
index 7aba08b..84ccf85 100644
--- a/patchsets/motif/2.2.3/06_all_pixel_length.patch
+++ b/patchsets/motif/2.2.3/06_all_pixel_length.patch
@@ -1,5 +1,5 @@
---- openMotif-2.2.3/lib/Xm/DataF.c.pixel_length	2004-06-03 15:11:52.932820812 +0200
-+++ openMotif-2.2.3/lib/Xm/DataF.c	2004-06-03 15:12:27.323091126 +0200
+--- openMotif-2.2.3/lib/Xm/DataF.c.pixel_length
++++ openMotif-2.2.3/lib/Xm/DataF.c
 @@ -8648,7 +8648,7 @@
  	    curr_str++;
  	    i++;
diff --git a/patchsets/motif/2.2.3/07_all_popup_timeout.patch b/patchsets/motif/2.2.3/07_all_popup_timeout.patch
index f216abe..7cd45b3 100644
--- a/patchsets/motif/2.2.3/07_all_popup_timeout.patch
+++ b/patchsets/motif/2.2.3/07_all_popup_timeout.patch
@@ -1,5 +1,5 @@
---- openMotif-2.2.3/lib/Xm/MenuUtil.c.popup_timeout	2002-01-31 15:49:35.000000000 +0100
-+++ openMotif-2.2.3/lib/Xm/MenuUtil.c	2004-06-08 17:14:46.311285603 +0200
+--- openMotif-2.2.3/lib/Xm/MenuUtil.c.popup_timeout
++++ openMotif-2.2.3/lib/Xm/MenuUtil.c
 @@ -156,6 +156,9 @@
  				  cursor, time)) == GrabSuccess)
  	 break;
diff --git a/patchsets/motif/2.2.3/08_all_XmResizeHashTable.patch b/patchsets/motif/2.2.3/08_all_XmResizeHashTable.patch
index 5982f72..56bdb1f 100644
--- a/patchsets/motif/2.2.3/08_all_XmResizeHashTable.patch
+++ b/patchsets/motif/2.2.3/08_all_XmResizeHashTable.patch
@@ -1,5 +1,5 @@
---- lib/Xm/Hash.c
-+++ lib/Xm/Hash.c
+--- openMotif-2.2.3/lib/Xm/Hash.c
++++ openMotif-2.2.3/lib/Xm/Hash.c
 @@ -198,6 +198,8 @@
  	} else {
  	  table -> buckets[index] = current;
diff --git a/patchsets/motif/2.2.3/09_all_utf8.patch b/patchsets/motif/2.2.3/09_all_utf8.patch
index bb7c7f8..e9040db 100644
--- a/patchsets/motif/2.2.3/09_all_utf8.patch
+++ b/patchsets/motif/2.2.3/09_all_utf8.patch
@@ -1,5 +1,5 @@
---- openMotif-2.2.3/tools/wml/UilSymCSet.h.utf8	2004-03-04 17:41:48.000000000 +0100
-+++ openMotif-2.2.3/tools/wml/UilSymCSet.h	2004-03-17 12:54:23.000000000 +0100
+--- openMotif-2.2.3/tools/wml/UilSymCSet.h.utf8
++++ openMotif-2.2.3/tools/wml/UilSymCSet.h
 @@ -32,6 +32,7 @@
      "JISX0201.1976-0",	/* jis_katakana */
      "KSC5601.1987-0",	/* ksc_hangul */
@@ -53,8 +53,8 @@
   */
 -externaldef(uil_sym_glbl) unsigned short int charset_lang_table_max = 72;
 +externaldef(uil_sym_glbl) unsigned short int charset_lang_table_max = 73;
---- openMotif-2.2.3/tools/wml/UilSymGen.h.utf8	2004-03-04 17:41:48.000000000 +0100
-+++ openMotif-2.2.3/tools/wml/UilSymGen.h	2004-03-17 12:54:23.000000000 +0100
+--- openMotif-2.2.3/tools/wml/UilSymGen.h.utf8
++++ openMotif-2.2.3/tools/wml/UilSymGen.h
 @@ -1417,6 +1417,7 @@
  #define sym_k_jis_katakana_charset	21
  #define sym_k_ksc_hangul_charset	22
@@ -63,8 +63,8 @@
  
  /*  Define literals for automatic children */
  
---- openMotif-2.2.3/tools/wml/motif.wml.utf8	2003-10-08 23:07:47.000000000 +0200
-+++ openMotif-2.2.3/tools/wml/motif.wml	2004-03-17 12:56:09.000000000 +0100
+--- openMotif-2.2.3/tools/wml/motif.wml.utf8
++++ openMotif-2.2.3/tools/wml/motif.wml
 @@ -163,6 +163,9 @@
      ksc_hangul_gr
                  { XmStringCharsetName = "KSC5601.1987-1";
diff --git a/patchsets/motif/2.2.3/10_all_no_demos.patch b/patchsets/motif/2.2.3/10_all_no_demos.patch
index d0a3969..568d297 100644
--- a/patchsets/motif/2.2.3/10_all_no_demos.patch
+++ b/patchsets/motif/2.2.3/10_all_no_demos.patch
@@ -1,5 +1,5 @@
---- openmotif/configure.in.no_demos	2003-09-19 18:40:33.000000000 +0200
-+++ openmotif/configure.in	2003-12-16 12:16:33.000000000 +0100
+--- openmotif/configure.in.no_demos
++++ openmotif/configure.in
 @@ -259,88 +259,4 @@
  doc/man/man5/Makefile \
  tools/Makefile \
@@ -89,8 +89,8 @@
 -demos/doc/programGuide/ch17/simple_drop/Makefile \
 -demos/doc/programGuide/ch17/simple_drag/Makefile \
  ])
---- openmotif/Makefile.am.no_demos	2003-12-16 12:17:02.000000000 +0100
-+++ openmotif/Makefile.am	2003-12-16 12:17:03.000000000 +0100
+--- openmotif/Makefile.am.no_demos
++++ openmotif/Makefile.am
 @@ -28,6 +28,5 @@
               include \
               tools \
diff --git a/patchsets/motif/2.2.3/11_all_CAN-2005-0605.patch b/patchsets/motif/2.2.3/11_all_CAN-2005-0605.patch
index f70a884..b0ff689 100644
--- a/patchsets/motif/2.2.3/11_all_CAN-2005-0605.patch
+++ b/patchsets/motif/2.2.3/11_all_CAN-2005-0605.patch
@@ -1,5 +1,5 @@
---- lib/Xm/Xpmscan.c.orig	2005-03-02 17:00:16.415070960 +0100
-+++ lib/Xm/Xpmscan.c	2005-03-02 17:01:38.949709879 +0100
+--- openMotif-2.2.3/lib/Xm/Xpmscan.c.orig
++++ openMotif-2.2.3/lib/Xm/Xpmscan.c
 @@ -672,8 +672,8 @@
      char *dst;
      unsigned int *iptr;
@@ -21,8 +21,8 @@
      if ((image->bits_per_pixel | image->depth) == 1) {
  	ibu = image->bitmap_unit;
  	for (y = 0; y < height; y++)
---- lib/Xm/Xpmcreate.c.orig	2005-03-02 17:02:00.626412844 +0100
-+++ lib/Xm/Xpmcreate.c	2005-03-02 17:02:35.183562480 +0100
+--- openMotif-2.2.3/lib/Xm/Xpmcreate.c.orig
++++ openMotif-2.2.3/lib/Xm/Xpmcreate.c
 @@ -1265,10 +1265,10 @@
      register char *src;
      register char *dst;
diff --git a/patchsets/motif/2.2.3/12_all_uil.patch b/patchsets/motif/2.2.3/12_all_uil.patch
index 45e0b8e..978cb15 100644
--- a/patchsets/motif/2.2.3/12_all_uil.patch
+++ b/patchsets/motif/2.2.3/12_all_uil.patch
@@ -1,5 +1,5 @@
---- openMotif-2.2.3/lib/Mrm/Mrmhier.c.UIL	2002-01-11 14:56:24.000000000 +0100
-+++ openMotif-2.2.3/lib/Mrm/Mrmhier.c	2005-12-31 07:42:31.485196184 +0100
+--- openMotif-2.2.3/lib/Mrm/Mrmhier.c.UIL
++++ openMotif-2.2.3/lib/Mrm/Mrmhier.c
 @@ -712,7 +712,7 @@
     *  Local variables
     */
@@ -24,8 +24,8 @@
    switch ( result )
      {
      case MrmSUCCESS:
---- openMotif-2.2.3/clients/uil/UilIODef.h.UIL	2002-01-04 22:13:33.000000000 +0100
-+++ openMotif-2.2.3/clients/uil/UilIODef.h	2005-12-31 07:42:15.129682600 +0100
+--- openMotif-2.2.3/clients/uil/UilIODef.h.UIL
++++ openMotif-2.2.3/clients/uil/UilIODef.h
 @@ -69,13 +69,18 @@
  #define NULL 0L
  #endif
@@ -46,8 +46,8 @@
  } uil_fcb_type;
  
  #endif /* UilIODef_h */
---- openMotif-2.2.3/clients/uil/UilLstLst.c.UIL	2002-01-10 21:55:43.000000000 +0100
-+++ openMotif-2.2.3/clients/uil/UilLstLst.c	2005-12-31 07:42:19.447026264 +0100
+--- openMotif-2.2.3/clients/uil/UilLstLst.c.UIL
++++ openMotif-2.2.3/clients/uil/UilLstLst.c
 @@ -164,7 +164,7 @@
      lst_l_page_no = 0;
      lst_v_listing_open = TRUE;
@@ -93,8 +93,8 @@
  		diag_get_message_abbrev( az_msg->l_message_number ),
  		msg_no, 
  		az_msg->c_text);
---- openMotif-2.2.3/clients/uil/UilP2Out.c.UIL	2002-01-10 21:55:44.000000000 +0100
-+++ openMotif-2.2.3/clients/uil/UilP2Out.c	2005-12-31 07:42:23.022482712 +0100
+--- openMotif-2.2.3/clients/uil/UilP2Out.c.UIL
++++ openMotif-2.2.3/clients/uil/UilP2Out.c
 @@ -189,7 +189,7 @@
      int				topmost_index;
      struct
@@ -143,8 +143,8 @@
  	    problem, 
  	    Urm__UT_LatestErrorMessage());
  
---- openMotif-2.2.3/clients/uil/UilSrcSrc.c.UIL	2002-01-10 21:55:47.000000000 +0100
-+++ openMotif-2.2.3/clients/uil/UilSrcSrc.c	2005-12-31 07:42:27.176851152 +0100
+--- openMotif-2.2.3/clients/uil/UilSrcSrc.c.UIL
++++ openMotif-2.2.3/clients/uil/UilSrcSrc.c
 @@ -626,11 +626,15 @@
      static unsigned short	main_dir_len = 0;
      boolean			main_file;
@@ -222,8 +222,8 @@
  
  /*    Open the include file.    */
  	  az_fcb->az_file_ptr = fopen (buffer, "r");
---- openMotif-2.2.3/clients/uil/UilSarMod.c.UIL	2002-01-10 21:55:45.000000000 +0100
-+++ openMotif-2.2.3/clients/uil/UilSarMod.c	2005-12-31 07:42:35.593571616 +0100
+--- openMotif-2.2.3/clients/uil/UilSarMod.c.UIL
++++ openMotif-2.2.3/clients/uil/UilSarMod.c
 @@ -379,7 +379,7 @@
      */
  
@@ -242,8 +242,8 @@
  		"Module: %s \t Version: %s", 
  		sym_az_module_entry->obj_header.az_name->c_text,
  		value_entry->value.c_value );
---- openMotif-2.2.3/clients/uil/UilDiags.c.UIL	2002-01-10 21:55:42.000000000 +0100
-+++ openMotif-2.2.3/clients/uil/UilDiags.c	2005-12-31 07:42:39.273012256 +0100
+--- openMotif-2.2.3/clients/uil/UilDiags.c.UIL
++++ openMotif-2.2.3/clients/uil/UilDiags.c
 @@ -293,12 +293,12 @@
      va_start(ap, l_start_column);
  
@@ -309,8 +309,8 @@
  			 "\t\t line: %d  file: %s",
  			 az_src_rec->w_line_number,
  			 src_get_file_name( az_src_rec ) );
---- openMotif-2.2.3/clients/uil/UilSymDef.h.UIL	2002-01-04 22:13:38.000000000 +0100
-+++ openMotif-2.2.3/clients/uil/UilSymDef.h	2005-12-31 07:42:44.106277488 +0100
+--- openMotif-2.2.3/clients/uil/UilSymDef.h.UIL
++++ openMotif-2.2.3/clients/uil/UilSymDef.h
 @@ -65,6 +65,11 @@
  
  #include <Mrm/MrmPublic.h>
diff --git a/patchsets/motif/2.2.3/13_all_automake.patch b/patchsets/motif/2.2.3/13_all_automake.patch
index ed8fc14..3657056 100644
--- a/patchsets/motif/2.2.3/13_all_automake.patch
+++ b/patchsets/motif/2.2.3/13_all_automake.patch
@@ -1,5 +1,5 @@
---- clients/uil/Makefile.am	Fri Aug 15 04:56:19 2003
-+++ clients/uil/Makefile.am.new	Tue Feb  8 12:06:15 2005
+--- openMotif-2.2.3/clients/uil/Makefile.am
++++ openMotif-2.2.3/clients/uil/Makefile.am.new
 @@ -65,6 +65,7 @@
  lib_LTLIBRARIES = libUil.la