[arch-commits] Commit in lesstif/trunk (6 files)

Eric Bélanger eric at archlinux.org
Fri Jan 1 19:00:14 EST 2010


    Date: Friday, January 1, 2010 @ 19:00:14
  Author: eric
Revision: 62089

upgpkg: lesstif 0.95.2-1
    Upstream update, Added docs

Modified:
  lesstif/trunk/ChangeLog
  lesstif/trunk/PKGBUILD
Deleted:
  lesstif/trunk/64bitcleanups.patch
  lesstif/trunk/CAN-2005-0605.patch
  lesstif/trunk/c++fix.patch
  lesstif/trunk/scroll.patch

---------------------+
 64bitcleanups.patch |   13 -------------
 CAN-2005-0605.patch |   38 --------------------------------------
 ChangeLog           |    6 ++++++
 PKGBUILD            |   45 ++++++++++++---------------------------------
 c++fix.patch        |   17 -----------------
 scroll.patch        |   13 -------------
 6 files changed, 18 insertions(+), 114 deletions(-)

Deleted: 64bitcleanups.patch
===================================================================
--- 64bitcleanups.patch	2010-01-01 23:57:05 UTC (rev 62088)
+++ 64bitcleanups.patch	2010-01-02 00:00:14 UTC (rev 62089)
@@ -1,13 +0,0 @@
---- lesstif-0.95.0/include/Motif-2.1/XmI/XpmI.h.BAD	2006-08-30 10:57:12.000000000 -0500
-+++ lesstif-0.95.0/include/Motif-2.1/XmI/XpmI.h	2006-08-30 10:58:07.000000000 -0500
-@@ -217,8 +217,8 @@
- FUNC(xpmHashSlot, xpmHashAtom *, (xpmHashTable *table, char *s));
- FUNC(xpmHashIntern, int, (xpmHashTable *table, char *tag, void *data));
- 
--#define HashAtomData(i) ((void *)i)
--#define HashColorIndex(slot) ((unsigned int)((*slot)->data))
-+#define HashAtomData(i) ((void *)((unsigned long)i))
-+#define HashColorIndex(slot) ((unsigned long)((*slot)->data))
- #define USE_HASHTABLE (cpp > 2 && ncolors > 4)
- 
- /* I/O utility */

Deleted: CAN-2005-0605.patch
===================================================================
--- CAN-2005-0605.patch	2010-01-01 23:57:05 UTC (rev 62088)
+++ CAN-2005-0605.patch	2010-01-02 00:00:14 UTC (rev 62089)
@@ -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;

Modified: ChangeLog
===================================================================
--- ChangeLog	2010-01-01 23:57:05 UTC (rev 62088)
+++ ChangeLog	2010-01-02 00:00:14 UTC (rev 62089)
@@ -1,3 +1,9 @@
+2009-12-30  Eric Belanger  <eric at archlinux.org>
+
+	* lesstif 0.95.2-1
+	* Upstream update
+	* Added docs
+
 2008-12-08  Eric Belanger  <eric at archlinux.org>
 
 	* lesstif 0.95.0-3

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-01-01 23:57:05 UTC (rev 62088)
+++ PKGBUILD	2010-01-02 00:00:14 UTC (rev 62089)
@@ -3,35 +3,23 @@
 # Contributor: John Proctor <jproctor at prium.net>
 
 pkgname=lesstif
-pkgver=0.95.0
-pkgrel=3
+pkgver=0.95.2
+pkgrel=1
 pkgdesc="LGPL'd re-implementation of Motif"
 arch=('i686' 'x86_64')
 url="http://www.lesstif.org/"
 license=('LGPL' 'MIT')
 depends=('freetype2' 'libxt' 'libxp')
 options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2
-	CAN-2005-0605.patch 64bitcleanups.patch	c++fix.patch scroll.patch LICENSE)
-md5sums=('ab895165c149d7f95843c7584b1c7ad4' '8089c6d6e427f2357fc4e85145e04579'\
-         '1234d1a45e1410c29f54612548e75127' 'b8caafffe583951e8525b145a4f78174'\
-         '38c43641a01ceeebbd5816a088e1ad48' 'b1f320192a9154f72d83e9d3d5a25a2f')
-sha1sums=('2a6f20d3bd525e6066ba2be22d8a47bf4bcd0425'
-          '0531ac69cc4daee9cec724b57efaac74f4379ed1'
-          '0f2af2fc4f8e48f63c30bf91d4ce5332248b449b'
-          '30947900c9ccb3802acc97dc42a58285f92fecb8'
-          'ca2fc0dda0103fdbc2b88d8ce49923cf71cf39a4'
-          '5d7f38555417cb617d7d5b7e41a93af8430dc638')
+source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2 \
+	LICENSE)
+md5sums=('754187dbac09fcf5d18296437e72a32f' 'b1f320192a9154f72d83e9d3d5a25a2f')
+sha1sums=('b894e544d529a235a6a665d48ca94a465f44a4e5' '5d7f38555417cb617d7d5b7e41a93af8430dc638')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  patch -p1 < ../CAN-2005-0605.patch || return 1
-  patch -p1 < ../c++fix.patch || return 1
-  patch -p1 < ../scroll.patch || return 1
-  patch -p1 < ../64bitcleanups.patch || return 1
-
-  ./configure --prefix=/usr --mandir=/usr/share/man --enable-production \
-    --enable-nonstandard-conversions --enable-editres \
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --mandir=/usr/share/man --docdir=/usr/share/doc \
+    --enable-production --enable-nonstandard-conversions --enable-editres \
     --with-xdnd --enable-build-21 --disable-debug --enable-static || return 1
 
 # fix linkage against already installed version
@@ -44,17 +32,8 @@
     perl -pi -e 's/^(relink_command=.*)/# $1/' $f || return 1
   done
 
-  install -d ${pkgdir}/usr/lib
   make -C lib/Mrm-2.1 || return 1
-  make -C lib/Mrm-2.1 DESTDIR=${pkgdir} install || return 1
-  make appdir=/usr/share/X11/app-defaults DESTDIR=${pkgdir} install || return 1
-  install -D -m644 ../LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE || return 1
-
-  # clean-up
-  rm -rf ${pkgdir}/usr/LessTif
-  rm -f ${pkgdir}/usr/lib/X11/mwm/README 
-  # conflicts with Shell from perl
-  rm -f ${pkgdir}/usr/share/man/man3/Shell.3
-  # conflicts with tcl
-  rm -f ${pkgdir}/usr/share/man/man3/Object.3
+  make -C lib/Mrm-2.1 DESTDIR="${pkgdir}" install || return 1
+  make appdir=/usr/share/X11/app-defaults rootdir=/usr/share/LessTif DESTDIR="${pkgdir}" install || return 1
+  install -D -m644 ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" || return 1
 }

Deleted: c++fix.patch
===================================================================
--- c++fix.patch	2010-01-01 23:57:05 UTC (rev 62088)
+++ c++fix.patch	2010-01-02 00:00:14 UTC (rev 62089)
@@ -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,

Deleted: scroll.patch
===================================================================
--- scroll.patch	2010-01-01 23:57:05 UTC (rev 62088)
+++ scroll.patch	2010-01-02 00:00:14 UTC (rev 62089)
@@ -1,13 +0,0 @@
---- lesstif-0.95.0/lib/Xm-2.1/Transltns.old	2006-12-31 18:28:29.000000000 +0200
-+++ lesstif-0.95.0/lib/Xm-2.1/Transltns.c	2006-12-31 18:29:12.000000000 +0200
-@@ -670,8 +670,8 @@
-     /* Scroll wheel */
-     "\nShift<Btn4Down>:		page-left()"
-     "\nShift<Btn5Down>:		page-right()"
--    "\n<Btn5Down>:		scroll-one-line-up()"
--    "\n<Btn4Down>:		scroll-one-line-down()"
-+    "\n<Btn4Down>:		scroll-one-line-up()"
-+    "\n<Btn5Down>:		scroll-one-line-down()"
- #endif
-     ;
- 



More information about the arch-commits mailing list