[arch-commits] Commit in nedit/trunk (PKGBUILD nedit_xorg_composite_fix.patch)

[Eric Bélanger]

    Date: Friday, March 20, 2015 @ 04:31:40
  Author: eric
Revision: 234190

upgpkg: nedit 5.6-1

Upstream update, Update url, Remove libxpm depends, Disable SMP build, Remove old patch

Modified:
  nedit/trunk/PKGBUILD
Deleted:
  nedit/trunk/nedit_xorg_composite_fix.patch

--------------------------------+
 PKGBUILD                       |   20 ++++++++------------
 nedit_xorg_composite_fix.patch |   18 ------------------
 2 files changed, 8 insertions(+), 30 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-03-20 02:51:40 UTC (rev 234189)
+++ PKGBUILD	2015-03-20 03:31:40 UTC (rev 234190)
@@ -2,30 +2,26 @@
 # Maintainer: Eric Bélanger <eric at archlinux.org>
 
 pkgname=nedit
-pkgver=5.5
-pkgrel=7
+pkgver=5.6
+pkgrel=1
 pkgdesc="A Unix text editor for programmers and general users"
 arch=('i686' 'x86_64')
-url="http://www.nedit.org/"
+url="http://sourceforge.net/projects/nedit/"
 license=('GPL')
-depends=('lesstif' 'libxpm')
-source=(http://www.nedit.org/${pkgname}-${pkgver}-src.tar.bz2 
-	nedit_xorg_composite_fix.patch)
-sha1sums=('7d3c87a793a5047cf857af1ac82e39f3b33e8a87'
-          '1f6c75075a6bdc7b0dd8ca89d8117d68af8fc54e')
+depends=('lesstif')
+options=('!makeflags')
+source=(http://sourceforge.net/projects/nedit/files/nedit-source/${pkgname}-${pkgver}-src.tar.gz)
+sha1sums=('133641224b0969e31e3404b874c71c35341f028b')
 
 prepare() {
   cd ${pkgname}-${pkgver}
-  patch -p1 -i "${srcdir}/nedit_xorg_composite_fix.patch"
-  sed -i 's/-Wl,-Bstatic//' makefiles/Makefile.linux
   sed -i 's|fgets|//fgets|' util/check_lin_tif.c
-  sed -i "s/CFLAGS=-O/CFLAGS=${CFLAGS} -DBUILD_UNTESTED_NEDIT/" makefiles/Makefile.linux
   sed -i 's|"/bin/csh"|"/bin/sh"|' source/preferences.c
 }
 
 build() {
   cd ${pkgname}-${pkgver}
-  make linux docs
+  make CFLAGS+="${CFLAGS} -DBUILD_UNTESTED_NEDIT" linux docs
 }
 
 package() {

Deleted: nedit_xorg_composite_fix.patch
===================================================================
--- nedit_xorg_composite_fix.patch	2015-03-20 02:51:40 UTC (rev 234189)
+++ nedit_xorg_composite_fix.patch	2015-03-20 03:31:40 UTC (rev 234190)
@@ -1,18 +0,0 @@
---- nedit-5.5/util/misc.c.orig	2007-12-03 21:57:15.000000000 +0000
-+++ nedit-5.5/util/misc.c	2007-12-03 21:59:30.000000000 +0000
-@@ -475,6 +475,15 @@
-     bestClass = 0;
-     bestVisual = 0;
-     for (i=0; i < nVis; i++) {
-+        if (visList[i].depth >= 32 &&          
-+           strstr(ServerVendor(display), "X.Org") != 0) {
-+               /* Xorg 6.8.* 32-bit visuals (with alpha-channel) cause a lot
-+                  of problems, so we have to skip them.
-+                  Users can achieve the same effect with older versions of
-+                  NEdit by setting the environment variable 
-+                  XLIB_SKIP_ARGB_VISUALS. */
-+            continue;
-+        }
- 	if (visList[i].depth > maxDepth) {
- 	    maxDepth = visList[i].depth;
- 	    bestClass = 0;