X Strike Force X.Org X11 SVN commit: r137 - in trunk/debian: . patches
Author: dnusinow
Date: 2005-06-04 11:14:05 -0500 (Sat, 04 Jun 2005)
New Revision: 137
Modified:
trunk/debian/changelog
trunk/debian/patches/000_stolen_from_HEAD.diff
Log:
Begin re-audit. We'll use the .orig.tar.gz shipped with ubuntu because the one in svn is meant for the new packaging setup, and thus has changes applied that weren't shipped with upstream. Re-add 000_stolen_from_HEAD.diff and edit Xpm's create.c fix so that it applies.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-06-04 14:10:37 UTC (rev 136)
+++ trunk/debian/changelog 2005-06-04 16:14:05 UTC (rev 137)
@@ -77,8 +77,8 @@
- Patch Audit
- Deleted 0000_backport_from_upstream.diff (obsolete)
- - Edited 000_stolen_from_HEAD.diff (Removed Xpm fixes which were added
- upstream)
+ - Edited 000_stolen_from_HEAD.diff
+ - Re-diffed Xpm's create.c fix to get it to apply properly
- Deleted 003_linux.cf_and_xfree86.cf.diff (obsolete)
- Delete first hunk for linux.cf in
099c_support_loadable_external_Xcursor_lib.diff because nothing in
Modified: trunk/debian/patches/000_stolen_from_HEAD.diff
===================================================================
--- trunk/debian/patches/000_stolen_from_HEAD.diff 2005-06-04 14:10:37 UTC (rev 136)
+++ trunk/debian/patches/000_stolen_from_HEAD.diff 2005-06-04 16:14:05 UTC (rev 137)
@@ -66,6 +66,42 @@
# endif
#endif /*AMD64Arcitecture*/
+diff -ur xc.orig/extras/Xpm/lib/create.c xc/extras/Xpm/lib/create.c
+--- xc.orig/extras/Xpm/lib/create.c 2005-06-04 11:27:07.000000000 -0400
++++ xc/extras/Xpm/lib/create.c 2005-06-04 11:29:07.000000000 -0400
+@@ -1218,7 +1218,7 @@
+ register unsigned int x, y, i;
+ register char *data;
+ Pixel pixel, px;
+- int nbytes, depth, ibu, ibpp;
++ int nbytes, depth, ibu, ibpp, i;
+
+ data = image->data;
+ iptr = pixelindex;
+diff -urN xc.orig/extras/Xpm/lib/scan.c xc/extras/Xpm/lib/scan.c
+--- xc.orig/extras/Xpm/lib/scan.c 2005-03-29 00:50:40.396758472 +1000
++++ xc/extras/Xpm/lib/scan.c 2005-03-29 00:52:27.735440512 +1000
+@@ -621,8 +621,8 @@
+ char *dst;
+ unsigned int *iptr;
+ char *data;
+- unsigned int x, y, i;
+- int bits, depth, ibu, ibpp, offset;
++ unsigned int x, y;
++ int bits, depth, ibu, ibpp, offset, i;
+ unsigned long lbt;
+ Pixel pixel, px;
+
+@@ -633,6 +633,9 @@
+ ibpp = image->bits_per_pixel;
+ offset = image->xoffset;
+
++ if (image->bitmap_unit < 0)
++ return (XpmNoMemory);
++
+ if ((image->bits_per_pixel | image->depth) == 1) {
+ ibu = image->bitmap_unit;
+ for (y = 0; y < height; y++)
diff -urN xc.orig/include/extensions/scrnsaver.h xc/include/extensions/scrnsaver.h
--- xc.orig/include/extensions/scrnsaver.h 2005-03-29 00:51:01.048618912 +1000
+++ xc/include/extensions/scrnsaver.h 2005-03-29 00:52:27.741439600 +1000
Reply to: