Author: sip Date: 2006-06-11 17:33:15 +0200 (Sun, 11 Jun 2006) New Revision: 1513 Added: crux-2.2/ports/opt/lesstif/lesstif-0.95.0-xpm.patch Removed: crux-2.2/ports/opt/lesstif/lesstif-0.94.4-xpm.patch Modified: crux-2.2/ports/opt/lesstif/.md5sum crux-2.2/ports/opt/lesstif/Pkgfile Log: lesstif: updated to 0.95.0 Modified: crux-2.2/ports/opt/lesstif/.md5sum =================================================================== --- crux-2.2/ports/opt/lesstif/.md5sum 2006-06-11 15:04:52 UTC (rev 1512) +++ crux-2.2/ports/opt/lesstif/.md5sum 2006-06-11 15:33:15 UTC (rev 1513) @@ -1,2 +1,2 @@ -10373c1e87b0208cd26888011a4d92de lesstif-0.94.4-xpm.patch -3096ca456c0bc299d895974d307c82d8 lesstif-0.94.4.tar.bz2 +10373c1e87b0208cd26888011a4d92de lesstif-0.95.0-xpm.patch +ab895165c149d7f95843c7584b1c7ad4 lesstif-0.95.0.tar.bz2 Modified: crux-2.2/ports/opt/lesstif/Pkgfile =================================================================== --- crux-2.2/ports/opt/lesstif/Pkgfile 2006-06-11 15:04:52 UTC (rev 1512) +++ crux-2.2/ports/opt/lesstif/Pkgfile 2006-06-11 15:33:15 UTC (rev 1513) @@ -5,8 +5,8 @@ # Depends on: x11 name=lesstif -version=0.94.4 -release=2 +version=0.95.0 +release=1 source=(http://dl.sourceforge.net/sourceforge/$name/$name-$version.tar.bz2 \ $name-$version-xpm.patch) Deleted: crux-2.2/ports/opt/lesstif/lesstif-0.94.4-xpm.patch =================================================================== --- crux-2.2/ports/opt/lesstif/lesstif-0.94.4-xpm.patch 2006-06-11 15:04:52 UTC (rev 1512) +++ crux-2.2/ports/opt/lesstif/lesstif-0.94.4-xpm.patch 2006-06-11 15:33:15 UTC (rev 1513) @@ -1,38 +0,0 @@ ---- lesstif-0.94.0/lib/Xm-2.1/Xpmscan.c.orig 2005-03-02 17:00:16.415070960 +0100 -+++ lesstif-0.94.0/lib/Xm-2.1/Xpmscan.c 2005-03-02 17:01:38.949709879 +0100 -@@ -672,8 +672,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; - -@@ -684,6 +684,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++) ---- lesstif-0.94.0/lib/Xm-2.1/Xpmcreate.c.orig 2005-03-02 17:02:00.626412844 +0100 -+++ lesstif-0.94.0/lib/Xm-2.1/Xpmcreate.c 2005-03-02 17:02:35.183562480 +0100 -@@ -1265,10 +1265,10 @@ - register char *src; - register char *dst; - register unsigned int *iptr; -- register unsigned int x, y, i; -+ register unsigned int x, y; - register char *data; - Pixel pixel, px; -- int nbytes, depth, ibu, ibpp; -+ int nbytes, depth, ibu, ibpp, i; - - data = image->data; - iptr = pixelindex; Added: crux-2.2/ports/opt/lesstif/lesstif-0.95.0-xpm.patch =================================================================== --- crux-2.2/ports/opt/lesstif/lesstif-0.95.0-xpm.patch (rev 0) +++ crux-2.2/ports/opt/lesstif/lesstif-0.95.0-xpm.patch 2006-06-11 15:33:15 UTC (rev 1513) @@ -0,0 +1,38 @@ +--- lesstif-0.94.0/lib/Xm-2.1/Xpmscan.c.orig 2005-03-02 17:00:16.415070960 +0100 ++++ lesstif-0.94.0/lib/Xm-2.1/Xpmscan.c 2005-03-02 17:01:38.949709879 +0100 +@@ -672,8 +672,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; + +@@ -684,6 +684,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++) +--- lesstif-0.94.0/lib/Xm-2.1/Xpmcreate.c.orig 2005-03-02 17:02:00.626412844 +0100 ++++ lesstif-0.94.0/lib/Xm-2.1/Xpmcreate.c 2005-03-02 17:02:35.183562480 +0100 +@@ -1265,10 +1265,10 @@ + register char *src; + register char *dst; + register unsigned int *iptr; +- register unsigned int x, y, i; ++ register unsigned int x, y; + register char *data; + Pixel pixel, px; +- int nbytes, depth, ibu, ibpp; ++ int nbytes, depth, ibu, ibpp, i; + + data = image->data; + iptr = pixelindex;