Author: branden
Date: 2005-05-17 13:06:17 -0500 (Tue, 17 May 2005)
New Revision: 2263
Modified:
trunk/debian/CHANGESETS
trunk/debian/patches/099za_libxpm_spopen_fix.diff
Log:
Delete patch hunks that change only ident lines and/or whitespace.
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2005-05-17 18:01:59 UTC (rev 2262)
+++ trunk/debian/CHANGESETS 2005-05-17 18:06:17 UTC (rev 2263)
@@ -10,6 +10,6 @@
Backport libxpm from X.org stable release (099za_libxpm_spopen_fix.diff).
(Closes: #308783)
- 2259, 2262
+ 2259, 2262, 2263
vim:set ai et sts=4 sw=4 tw=80:
Modified: trunk/debian/patches/099za_libxpm_spopen_fix.diff
===================================================================
--- trunk/debian/patches/099za_libxpm_spopen_fix.diff 2005-05-17 18:01:59 UTC
(rev 2262)
+++ trunk/debian/patches/099za_libxpm_spopen_fix.diff 2005-05-17 18:06:17 UTC
(rev 2263)
@@ -24,42 +24,6 @@
{
ungetc(c, data->stream.file);
if (c == '\n') {
-diff -ruN xc-old/extras/Xpm/lib/Attrib.c xc/extras/Xpm/lib/Attrib.c
---- xc-old/extras/Xpm/lib/Attrib.c 2005-05-14 15:57:06.000000000 -0400
-+++ xc/extras/Xpm/lib/Attrib.c 2005-05-14 16:16:52.000000000 -0400
-@@ -54,7 +54,7 @@
- XpmColor **colorTable, **color;
- unsigned int a;
-
-- if (ncolors >= UINT_MAX / sizeof(XpmColor *))
-+ if (ncolors >= UINT_MAX / sizeof(XpmColor *))
- return XpmNoMemory;
-
- colorTable = (XpmColor **) XpmMalloc(ncolors * sizeof(XpmColor *));
-diff -ruN xc-old/extras/Xpm/lib/CrBufFrI.c xc/extras/Xpm/lib/CrBufFrI.c
---- xc-old/extras/Xpm/lib/CrBufFrI.c 2005-05-14 15:57:06.000000000 -0400
-+++ xc/extras/Xpm/lib/CrBufFrI.c 2005-05-14 16:16:52.000000000 -0400
-@@ -34,7 +34,7 @@
-
- /* October 2004, source code review by Thomas Biege <[EMAIL PROTECTED]> */
-
--/* $XFree86: xc/extras/Xpm/lib/CrBufFrI.c,v 1.2 2001/10/28 03:32:09 tsi Exp $
*/
-+/* $XFree86$ */
-
- #include "XpmI.h"
-
-diff -ruN xc-old/extras/Xpm/lib/CrDatFrI.c xc/extras/Xpm/lib/CrDatFrI.c
---- xc-old/extras/Xpm/lib/CrDatFrI.c 2005-05-14 15:57:06.000000000 -0400
-+++ xc/extras/Xpm/lib/CrDatFrI.c 2005-05-14 16:16:52.000000000 -0400
-@@ -31,7 +31,7 @@
- *
*
- * Developed by Arnaud Le Hors
*
-
\*****************************************************************************/
--/* $XFree86: xc/extras/Xpm/lib/CrDatFrI.c,v 1.2 2001/10/28 03:32:09 tsi Exp $
*/
-+/* $XFree86$ */
-
- /* October 2004, source code review by Thomas Biege <[EMAIL PROTECTED]> */
-
diff -ruN xc-old/extras/Xpm/lib/create.c xc/extras/Xpm/lib/create.c
--- xc-old/extras/Xpm/lib/create.c 2005-05-14 15:57:06.000000000 -0400
+++ xc/extras/Xpm/lib/create.c 2005-05-14 16:16:52.000000000 -0400
@@ -160,39 +124,6 @@
cmts = info && (info->valuemask & XpmReturnComments);
-@@ -2105,7 +2099,7 @@
- xpmGetCmt(data, &colors_cmt);
-
- /* malloc pixels index tables */
-- if (ncolors >= UINT_MAX / sizeof(Pixel))
-+ if (ncolors >= UINT_MAX / sizeof(Pixel))
- RETURN(XpmNoMemory);
-
- image_pixels = (Pixel *) XpmMalloc(sizeof(Pixel) * ncolors);
-diff -ruN xc-old/extras/Xpm/lib/data.c xc/extras/Xpm/lib/data.c
---- xc-old/extras/Xpm/lib/data.c 2005-05-14 15:57:06.000000000 -0400
-+++ xc/extras/Xpm/lib/data.c 2005-05-14 16:16:52.000000000 -0400
-@@ -31,7 +31,7 @@
- *
*
- * Developed by Arnaud Le Hors
*
-
\*****************************************************************************/
--/* $XFree86: xc/extras/Xpm/lib/data.c,v 1.4 2002/01/07 19:40:49 dawes Exp $ */
-+/* $XFree86: xc/extras/Xpm/lib/data.c,v 1.3 2001/10/28 03:32:10 tsi Exp $ */
-
- /* October 2004, source code review by Thomas Biege <[EMAIL PROTECTED]> */
-
-diff -ruN xc-old/extras/Xpm/lib/hashtab.c xc/extras/Xpm/lib/hashtab.c
---- xc-old/extras/Xpm/lib/hashtab.c 2005-05-14 15:57:06.000000000 -0400
-+++ xc/extras/Xpm/lib/hashtab.c 2005-05-14 16:16:52.000000000 -0400
-@@ -144,7 +144,7 @@
- HASH_TABLE_GROWS
- table->size = size;
- table->limit = size / 3;
-- if (size >= UINT_MAX / sizeof(*atomTable))
-+ if (size >= UINT_MAX / sizeof(*atomTable))
- return (XpmNoMemory);
- atomTable = (xpmHashAtom *) XpmMalloc(size * sizeof(*atomTable));
- if (!atomTable)
diff -ruN xc-old/extras/Xpm/lib/Imakefile xc/extras/Xpm/lib/Imakefile
--- xc-old/extras/Xpm/lib/Imakefile 2005-05-14 15:57:06.000000000 -0400
+++ xc/extras/Xpm/lib/Imakefile 2005-05-14 16:16:52.000000000 -0400
@@ -214,42 +145,6 @@
INCLUDES = -I.
LINTLIBS = $(LINTXTOLL) $(LINTXLIB)
-diff -ruN xc-old/extras/Xpm/lib/parse.c xc/extras/Xpm/lib/parse.c
---- xc-old/extras/Xpm/lib/parse.c 2005-05-14 15:57:06.000000000 -0400
-+++ xc/extras/Xpm/lib/parse.c 2005-05-14 16:16:52.000000000 -0400
-@@ -1,4 +1,4 @@
--/* $XdotOrg: pre-CVS proposed fix for CESA-2004-003 alanc 7/25/2004 $ */
-+/* $XdotOrg: xc/extras/Xpm/lib/parse.c,v 1.2.4.2 2004/12/17 01:09:36 gisburn
Exp $ */
- /*
- * Copyright (C) 1989-95 GROUPE BULL
- *
-@@ -23,7 +23,7 @@
- * used in advertising or otherwise to promote the sale, use or other dealings
- * in this Software without prior written authorization from GROUPE BULL.
- */
--/* $XFree86: xc/extras/Xpm/lib/parse.c,v 1.3 2001/10/28 03:32:10 tsi Exp $ */
-+/* $XFree86: xc/extras/Xpm/lib/parse.c,v 1.2 2000/09/26 15:56:43 tsi Exp $ */
-
-
/*****************************************************************************\
- * parse.c:
*
-@@ -34,7 +34,7 @@
- *
*
- * Developed by Arnaud Le Hors
*
-
\*****************************************************************************/
--/* $XFree86: xc/extras/Xpm/lib/parse.c,v 1.3 2001/10/28 03:32:10 tsi Exp $ */
-+/* $XFree86$ */
-
- /*
- * The code related to FOR_MSW has been added by
-@@ -376,7 +376,7 @@
- unsigned int a, x, y;
-
- if ((height > 0 && width >= UINT_MAX / height) ||
-- width * height >= UINT_MAX / sizeof(unsigned int))
-+ width * height >= UINT_MAX / sizeof(unsigned int))
- return XpmNoMemory;
- #ifndef FOR_MSW
- iptr2 = (unsigned int *) XpmMalloc(sizeof(unsigned int) * width * height);
diff -ruN xc-old/extras/Xpm/lib/RdFToI.c xc/extras/Xpm/lib/RdFToI.c
--- xc-old/extras/Xpm/lib/RdFToI.c 2005-05-14 15:57:06.000000000 -0400
+++ xc/extras/Xpm/lib/RdFToI.c 2005-05-14 16:16:52.000000000 -0400
@@ -496,35 +391,6 @@
diff -ruN xc-old/extras/Xpm/lib/scan.c xc/extras/Xpm/lib/scan.c
--- xc-old/extras/Xpm/lib/scan.c 2005-05-14 15:57:06.000000000 -0400
+++ xc/extras/Xpm/lib/scan.c 2005-05-14 16:16:52.000000000 -0400
-@@ -31,7 +31,7 @@
- *
*
- * Developed by Arnaud Le Hors
*
-
\*****************************************************************************/
--/* $XFree86: xc/extras/Xpm/lib/scan.c,v 1.3 2002/01/07 19:40:49 dawes Exp $ */
-+/* $XFree86: xc/extras/Xpm/lib/scan.c,v 1.2 2001/10/28 03:32:11 tsi Exp $ */
-
- /*
- * The code related to FOR_MSW has been added by
-@@ -109,8 +109,8 @@
- LFUNC(ScanTransparentColor, int, (XpmColor *color, unsigned int cpp,
- XpmAttributes *attributes));
-
--LFUNC(ScanOtherColors, int, (Display *display, XpmColor *colors,
-- unsigned int ncolors,
-+LFUNC(ScanOtherColors, int, (Display *display, XpmColor *colors,
-+ unsigned int ncolors,
- Pixel *pixels, unsigned int mask,
- unsigned int cpp, XpmAttributes *attributes));
-
-@@ -243,7 +243,7 @@
- if (!pmap.pixelindex)
- RETURN(XpmNoMemory);
-
-- if (pmap.size >= UINT_MAX / sizeof(Pixel))
-+ if (pmap.size >= UINT_MAX / sizeof(Pixel))
- RETURN(XpmNoMemory);
-
- pmap.pixels = (Pixel *) XpmMalloc(sizeof(Pixel) * pmap.size);
@@ -621,8 +621,8 @@
char *dst;
unsigned int *iptr;
@@ -803,35 +669,3 @@
#ifdef VMS
#include <unixio.h>
-@@ -94,7 +95,7 @@
- #ifndef SIZE_MAX
- # ifdef ULONG_MAX
- # define SIZE_MAX ULONG_MAX
--# else
-+# else
- # define SIZE_MAX UINT_MAX
- # endif
- #endif
-diff -ruN xc-old/extras/Xpm/sxpm/sxpm.c xc/extras/Xpm/sxpm/sxpm.c
---- xc-old/extras/Xpm/sxpm/sxpm.c 2001-10-27 23:32:13.000000000 -0400
-+++ xc/extras/Xpm/sxpm/sxpm.c 2005-05-14 16:16:52.000000000 -0400
-@@ -22,7 +22,7 @@
- * used in advertising or otherwise to promote the sale, use or other dealings
- * in this Software without prior written authorization from GROUPE BULL.
- */
--/* $XFree86: xc/extras/Xpm/sxpm/sxpm.c,v 1.3 2001/10/28 03:32:13 tsi Exp $ */
-+/* $XFree86: xc/extras/Xpm/sxpm/sxpm.c,v 1.2 2001/08/01 00:44:34 tsi Exp $ */
-
-
/*****************************************************************************\
- * sxpm.c:
*
-diff -ruN xc-old/extras/Xpm/sxpm/sxpm.man xc/extras/Xpm/sxpm/sxpm.man
---- xc-old/extras/Xpm/sxpm/sxpm.man 2005-05-14 15:56:50.000000000 -0400
-+++ xc/extras/Xpm/sxpm/sxpm.man 2005-05-14 16:16:52.000000000 -0400
-@@ -21,6 +21,7 @@
- .\"used in advertising or otherwise to promote the sale, use or other dealings
- .\"in this Software without prior written authorization from GROUPE BULL.
- .\"
-+.\" $XFree86$
- .nr )S 12
- .TH SXPM 1
- .PD
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
