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

Eric Bélanger eric at archlinux.org
Fri Mar 20 03:34:00 UTC 2015


    Date: Friday, March 20, 2015 @ 04:34:00
  Author: eric
Revision: 234191

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  nedit/repos/extra-i686/PKGBUILD
    (from rev 234190, nedit/trunk/PKGBUILD)
  nedit/repos/extra-x86_64/PKGBUILD
    (from rev 234190, nedit/trunk/PKGBUILD)
Deleted:
  nedit/repos/extra-i686/PKGBUILD
  nedit/repos/extra-i686/nedit_xorg_composite_fix.patch
  nedit/repos/extra-x86_64/PKGBUILD
  nedit/repos/extra-x86_64/nedit_xorg_composite_fix.patch

---------------------------------------------+
 /PKGBUILD                                   |   68 ++++++++++++++++++++++++++
 extra-i686/PKGBUILD                         |   38 --------------
 extra-i686/nedit_xorg_composite_fix.patch   |   18 ------
 extra-x86_64/PKGBUILD                       |   38 --------------
 extra-x86_64/nedit_xorg_composite_fix.patch |   18 ------
 5 files changed, 68 insertions(+), 112 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2015-03-20 03:31:40 UTC (rev 234190)
+++ extra-i686/PKGBUILD	2015-03-20 03:34:00 UTC (rev 234191)
@@ -1,38 +0,0 @@
-# $Id$
-# Maintainer: Eric Bélanger <eric at archlinux.org>
-
-pkgname=nedit
-pkgver=5.5
-pkgrel=7
-pkgdesc="A Unix text editor for programmers and general users"
-arch=('i686' 'x86_64')
-url="http://www.nedit.org/"
-license=('GPL')
-depends=('lesstif' 'libxpm')
-source=(http://www.nedit.org/${pkgname}-${pkgver}-src.tar.bz2 
-	nedit_xorg_composite_fix.patch)
-sha1sums=('7d3c87a793a5047cf857af1ac82e39f3b33e8a87'
-          '1f6c75075a6bdc7b0dd8ca89d8117d68af8fc54e')
-
-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
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-  install -Dm755 source/nedit "${pkgdir}/usr/bin/nedit"
-  install -Dm755 source/nc "${pkgdir}/usr/bin/nedit-client"
-  install -Dm644 doc/nedit.man "${pkgdir}/usr/share/man/man1/nedit.1"
-  install -Dm644 doc/nc.man "${pkgdir}/usr/share/man/man1/nedit-client.1"
-  install -Dm644 doc/nedit.html "${pkgdir}/usr/share/doc/nedit/nedit.html"
-}

Copied: nedit/repos/extra-i686/PKGBUILD (from rev 234190, nedit/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2015-03-20 03:34:00 UTC (rev 234191)
@@ -0,0 +1,34 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgname=nedit
+pkgver=5.6
+pkgrel=1
+pkgdesc="A Unix text editor for programmers and general users"
+arch=('i686' 'x86_64')
+url="http://sourceforge.net/projects/nedit/"
+license=('GPL')
+depends=('lesstif')
+options=('!makeflags')
+source=(http://sourceforge.net/projects/nedit/files/nedit-source/${pkgname}-${pkgver}-src.tar.gz)
+sha1sums=('133641224b0969e31e3404b874c71c35341f028b')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+  sed -i 's|fgets|//fgets|' util/check_lin_tif.c
+  sed -i 's|"/bin/csh"|"/bin/sh"|' source/preferences.c
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  make CFLAGS+="${CFLAGS} -DBUILD_UNTESTED_NEDIT" linux docs
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  install -Dm755 source/nedit "${pkgdir}/usr/bin/nedit"
+  install -Dm755 source/nc "${pkgdir}/usr/bin/nedit-client"
+  install -Dm644 doc/nedit.man "${pkgdir}/usr/share/man/man1/nedit.1"
+  install -Dm644 doc/nc.man "${pkgdir}/usr/share/man/man1/nedit-client.1"
+  install -Dm644 doc/nedit.html "${pkgdir}/usr/share/doc/nedit/nedit.html"
+}

Deleted: extra-i686/nedit_xorg_composite_fix.patch
===================================================================
--- extra-i686/nedit_xorg_composite_fix.patch	2015-03-20 03:31:40 UTC (rev 234190)
+++ extra-i686/nedit_xorg_composite_fix.patch	2015-03-20 03:34:00 UTC (rev 234191)
@@ -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;

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2015-03-20 03:31:40 UTC (rev 234190)
+++ extra-x86_64/PKGBUILD	2015-03-20 03:34:00 UTC (rev 234191)
@@ -1,38 +0,0 @@
-# $Id$
-# Maintainer: Eric Bélanger <eric at archlinux.org>
-
-pkgname=nedit
-pkgver=5.5
-pkgrel=7
-pkgdesc="A Unix text editor for programmers and general users"
-arch=('i686' 'x86_64')
-url="http://www.nedit.org/"
-license=('GPL')
-depends=('lesstif' 'libxpm')
-source=(http://www.nedit.org/${pkgname}-${pkgver}-src.tar.bz2 
-	nedit_xorg_composite_fix.patch)
-sha1sums=('7d3c87a793a5047cf857af1ac82e39f3b33e8a87'
-          '1f6c75075a6bdc7b0dd8ca89d8117d68af8fc54e')
-
-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
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-  install -Dm755 source/nedit "${pkgdir}/usr/bin/nedit"
-  install -Dm755 source/nc "${pkgdir}/usr/bin/nedit-client"
-  install -Dm644 doc/nedit.man "${pkgdir}/usr/share/man/man1/nedit.1"
-  install -Dm644 doc/nc.man "${pkgdir}/usr/share/man/man1/nedit-client.1"
-  install -Dm644 doc/nedit.html "${pkgdir}/usr/share/doc/nedit/nedit.html"
-}

Copied: nedit/repos/extra-x86_64/PKGBUILD (from rev 234190, nedit/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2015-03-20 03:34:00 UTC (rev 234191)
@@ -0,0 +1,34 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgname=nedit
+pkgver=5.6
+pkgrel=1
+pkgdesc="A Unix text editor for programmers and general users"
+arch=('i686' 'x86_64')
+url="http://sourceforge.net/projects/nedit/"
+license=('GPL')
+depends=('lesstif')
+options=('!makeflags')
+source=(http://sourceforge.net/projects/nedit/files/nedit-source/${pkgname}-${pkgver}-src.tar.gz)
+sha1sums=('133641224b0969e31e3404b874c71c35341f028b')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+  sed -i 's|fgets|//fgets|' util/check_lin_tif.c
+  sed -i 's|"/bin/csh"|"/bin/sh"|' source/preferences.c
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  make CFLAGS+="${CFLAGS} -DBUILD_UNTESTED_NEDIT" linux docs
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  install -Dm755 source/nedit "${pkgdir}/usr/bin/nedit"
+  install -Dm755 source/nc "${pkgdir}/usr/bin/nedit-client"
+  install -Dm644 doc/nedit.man "${pkgdir}/usr/share/man/man1/nedit.1"
+  install -Dm644 doc/nc.man "${pkgdir}/usr/share/man/man1/nedit-client.1"
+  install -Dm644 doc/nedit.html "${pkgdir}/usr/share/doc/nedit/nedit.html"
+}

Deleted: extra-x86_64/nedit_xorg_composite_fix.patch
===================================================================
--- extra-x86_64/nedit_xorg_composite_fix.patch	2015-03-20 03:31:40 UTC (rev 234190)
+++ extra-x86_64/nedit_xorg_composite_fix.patch	2015-03-20 03:34:00 UTC (rev 234191)
@@ -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;



More information about the arch-commits mailing list