Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=982cb7c25bad3846bfcba851b453d186219667ce
commit 982cb7c25bad3846bfcba851b453d186219667ce
Author: Miklos Vajna <vmik...@frugalware.org>
Date: Sat May 30 11:48:00 2009 +0200
lesstif-0.95.2-1-i686
- version bump
diff --git a/source/xlib-extra/lesstif/CAN-2005-0605.patch
b/source/xlib-extra/lesstif/CAN-2005-0605.patch
deleted file mode 100644
index f706a4d..0000000
--- a/source/xlib-extra/lesstif/CAN-2005-0605.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- lesstif-0.95.0/lib/Xm-2.1/Xpmscan.c.BAD 2006-08-29 14:34:31.000000000
-0500
-+++ lesstif-0.95.0/lib/Xm-2.1/Xpmscan.c 2006-08-29 14:36:05.000000000
-0500
-@@ -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.95.0/lib/Xm-2.1/Xpmcreate.c.BAD 2006-08-29 14:36:13.000000000
-0500
-+++ lesstif-0.95.0/lib/Xm-2.1/Xpmcreate.c 2006-08-29 14:36:36.000000000
-0500
-@@ -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;
diff --git a/source/xlib-extra/lesstif/FrugalBuild
b/source/xlib-extra/lesstif/FrugalBuild
index a310453..02fee67 100644
--- a/source/xlib-extra/lesstif/FrugalBuild
+++ b/source/xlib-extra/lesstif/FrugalBuild
@@ -2,8 +2,8 @@
# Maintainer: Miklos Vajna <vmik...@frugalware.org>
pkgname=lesstif
-pkgver=0.95.0
-pkgrel=3
+pkgver=0.95.2
+pkgrel=1
pkgdesc="A free replacement for OSF/Motif(R)"
depends=('libxp' 'libxt' 'libxft' 'libxrender' 'fontconfig' 'freetype2'
'renderproto')
groups=('xlib-extra')
@@ -11,10 +11,8 @@ archs=('i686' 'x86_64')
_F_sourceforge_ext=".tar.bz2"
Finclude sourceforge
url="http://www.lesstif.org/";
-source=($source c++fix.patch CAN-2005-0605.patch lesstif.sh)
-sha1sums=('2a6f20d3bd525e6066ba2be22d8a47bf4bcd0425'\
- '30947900c9ccb3802acc97dc42a58285f92fecb8'\
- '0531ac69cc4daee9cec724b57efaac74f4379ed1'\
+source=($source lesstif.sh)
+sha1sums=('b894e544d529a235a6a665d48ca94a465f44a4e5' \
'd5f384b2e1503679f736483f81974a9462c17f82')
build()
@@ -22,7 +20,7 @@ build()
Fbuild --enable-utf8 --enable-production --enable-verbose=no \
--with-x
Fmkdir /usr/lib/lesstif/lib
- for i in bin man include share LessTif
+ for i in bin include share LessTif
do
Fmv /usr/$i /usr/lib/lesstif
done
diff --git a/source/xlib-extra/lesstif/c++fix.patch
b/source/xlib-extra/lesstif/c++fix.patch
deleted file mode 100644
index 3861c09..0000000
--- a/source/xlib-extra/lesstif/c++fix.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- lesstif-0.95.0/include/Motif-2.1/Xm/VendorSP.h.BAD 2006-08-30
11:00:30.000000000 -0500
-+++ lesstif-0.95.0/include/Motif-2.1/Xm/VendorSP.h 2006-08-30
11:00:47.000000000 -0500
-@@ -28,12 +28,13 @@
-
- #include <Xm/XmP.h>
- #include <Xm/VendorS.h>
--#include <X11/ShellP.h>
-
- #ifdef __cplusplus
- extern "C" {
- #endif
-
-+#include <X11/ShellP.h>
-+
- XMLIBEXPORT extern Cardinal _XmFilterResources(XtResource *resources,
- Cardinal numResources,
- WidgetClass filterClass,
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
