[arch-commits] Commit in nedit/repos (4 files)

Eric Bélanger eric at archlinux.org
Wed Jul 29 19:42:49 UTC 2009


    Date: Wednesday, July 29, 2009 @ 15:42:49
  Author: eric
Revision: 47945

fixed svn conflict

Added:
  nedit/repos/extra-i686/ChangeLog
    (from rev 47941, nedit/trunk/ChangeLog)
  nedit/repos/extra-i686/nedit_xorg_composite_fix.patch
    (from rev 47941, nedit/trunk/nedit_xorg_composite_fix.patch)
Modified:
  nedit/repos/extra-i686/	(properties)
  nedit/repos/extra-i686/PKGBUILD

--------------------------------+
 ChangeLog                      |    5 +++++
 PKGBUILD                       |   39 +++++++++++++++++++--------------------
 nedit_xorg_composite_fix.patch |   18 ++++++++++++++++++
 3 files changed, 42 insertions(+), 20 deletions(-)


Property changes on: nedit/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /nedit/trunk:1
   + /nedit/trunk:1-47944

Copied: nedit/repos/extra-i686/ChangeLog (from rev 47941, nedit/trunk/ChangeLog)
===================================================================
--- extra-i686/ChangeLog	                        (rev 0)
+++ extra-i686/ChangeLog	2009-07-29 19:42:49 UTC (rev 47945)
@@ -0,0 +1,5 @@
+2009-07-29  Eric Belanger  <eric at archlinux.org>
+
+	* nedit 5.5-5
+	* FHS man pages
+        * Added ChangeLog

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-07-29 19:36:14 UTC (rev 47944)
+++ extra-i686/PKGBUILD	2009-07-29 19:42:49 UTC (rev 47945)
@@ -1,31 +1,30 @@
 # $Id$
+# Maintainer: Eric Belanger <eric at archlinux.org>
 # Contributor: Tom Newsom <Jeepster at gmx.co.uk> and Dale Blount <dale at archlinux.org>
-# Maintainer: Dale Blount <dale at archlinux.org>
+
 pkgname=nedit
 pkgver=5.5
-pkgrel=4
+pkgrel=5
 pkgdesc="A Unix text editor for programmers and general users"
-arch=(i686 x86_64)
-license=("GPL")
+arch=('i686' 'x86_64')
 url="http://www.nedit.org/"
-depends=(lesstif libxpm)
-source=(ftp://ftp.nedit.org/pub/NEdit/v5_5/$pkgname-$pkgver-src.tar.bz2 nedit_xorg_composite_fix.patch)
-md5sums=('48cb3dce52d44988f3a4d7c6f47b6bbe'
-         'ae1f56ae9b23163882051720ac52412d')
+license=('GPL')
+depends=('lesstif' 'libxpm')
+source=(http://www.nedit.org/ftp/v5_5/${pkgname}-${pkgver}-src.tar.bz2 nedit_xorg_composite_fix.patch)
+md5sums=('48cb3dce52d44988f3a4d7c6f47b6bbe' 'ae1f56ae9b23163882051720ac52412d')
+sha1sums=('7d3c87a793a5047cf857af1ac82e39f3b33e8a87' '1f6c75075a6bdc7b0dd8ca89d8117d68af8fc54e')
 
-
 build() {
-  cd $startdir/src/$pkgname-$pkgver
-  patch --verbose -p1 < $startdir/src/nedit_xorg_composite_fix.patch || return 1
-  sed -i -e 's/-Wl,-Bstatic//' makefiles/Makefile.linux
-  sed -i -e 's/0.93.0/0.94.4/' util/check_lin_tif.c
-  sed -i -e "s/CFLAGS=-O/CFLAGS=${CFLAGS} -DBUILD_UNTESTED_NEDIT/" makefiles/Makefile.linux
-  sed -i -e 's/"/bin/csh"/:"/bin/sh"/' source/preferences.c
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p1 < ../nedit_xorg_composite_fix.patch || return 1
+  sed -i 's/-Wl,-Bstatic//' makefiles/Makefile.linux || return 1
+  sed -i 's|fgets|//fgets|' util/check_lin_tif.c || return 1
+  sed -i "s/CFLAGS=-O/CFLAGS=${CFLAGS} -DBUILD_UNTESTED_NEDIT/" makefiles/Makefile.linux || return 1
+  sed -i 's|"/bin/csh"|"/bin/sh"|' source/preferences.c || return 1
 
   make linux || return 1
-  mkdir -p $startdir/pkg/usr/{bin,man/man1}
-  install -m755 source/nedit $startdir/pkg/usr/bin/nedit
-  install -m755 source/nc $startdir/pkg/usr/bin/nedit-client
-  install -m644 doc/nedit.man $startdir/pkg/usr/man/man1/nedit.1
-  install -m644 doc/nc.man $startdir/pkg/usr/man/man1/nedit-client.1
+  install -D -m755 source/nedit "${pkgdir}/usr/bin/nedit" || return 1
+  install -D -m755 source/nc "${pkgdir}/usr/bin/nedit-client" || return 1
+  install -D -m644 doc/nedit.man "${pkgdir}/usr/share/man/man1/nedit.1" || return 1
+  install -D -m644 doc/nc.man "${pkgdir}/usr/share/man/man1/nedit-client.1" || return 1
 }

Copied: nedit/repos/extra-i686/nedit_xorg_composite_fix.patch (from rev 47941, nedit/trunk/nedit_xorg_composite_fix.patch)
===================================================================
--- extra-i686/nedit_xorg_composite_fix.patch	                        (rev 0)
+++ extra-i686/nedit_xorg_composite_fix.patch	2009-07-29 19:42:49 UTC (rev 47945)
@@ -0,0 +1,18 @@
+--- 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;




More information about the arch-commits mailing list