diff options
Diffstat (limited to 'patchsets/motif/2.2.3/03_all_CAN-2004-0914-newer.patch')
| -rw-r--r-- | patchsets/motif/2.2.3/03_all_CAN-2004-0914-newer.patch | 82 |
1 files changed, 34 insertions, 48 deletions
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 |