[arch-commits] Commit in gv/trunk (ChangeLog PKGBUILD aplinedel.patch)

[Eric Bélanger]

    Date: Monday, December 13, 2010 @ 17:11:14
  Author: eric
Revision: 103001

upgpkg: gv 3.7.1-2
Fixed X11 resource file (close FS#22083)

Added:
  gv/trunk/aplinedel.patch
Modified:
  gv/trunk/PKGBUILD
Deleted:
  gv/trunk/ChangeLog

-----------------+
 ChangeLog       |   39 ---------------------------------------
 PKGBUILD        |   22 +++++++++++-----------
 aplinedel.patch |   11 +++++++++++
 3 files changed, 22 insertions(+), 50 deletions(-)

Deleted: ChangeLog
===================================================================
--- ChangeLog	2010-12-13 21:54:22 UTC (rev 103000)
+++ ChangeLog	2010-12-13 22:11:14 UTC (rev 103001)
@@ -1,39 +0,0 @@
-2010-06-12  Eric Belanger  <eric at archlinux.org>
-
-	* gv 3.7.1
-	* Upstream update
-	* Removed unneeded loop in gv.install
-
-2010-01-23  Eric Belanger  <eric at archlinux.org>
-
-	* gv 3.6.8-1
-	* Upstream update
-	* Rewrote .install script
-
-2009-03-31  Eric Belanger  <eric at archlinux.org>
-
-	* gv 3.6.7-1
-	* Upstream update
-
-2008-12-14  Eric Belanger  <eric at archlinux.org>
-
-	* gv 3.6.6-2
-	* Rebuilt against xaw3d 1.5E
-
-2008-12-07  Eric Belanger  <eric at archlinux.org>
-
-	* gv 3.6.6-1
-	* Upstream update
-	* Fixed icon (close FS#11542)
-	* Added install scriptlet to handle info pages
-
-2008-07-12  Eric Belanger  <eric at archlinux.org>
-
-	* gv 3.6.5-1
-	* Upstream update
-
-2008-06-13  Eric Belanger  <eric at archlinux.org>
-
-	* gv 3.6.4-1
-	* Upstream update
-	* Added ChangeLog

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-12-13 21:54:22 UTC (rev 103000)
+++ PKGBUILD	2010-12-13 22:11:14 UTC (rev 103001)
@@ -1,32 +1,32 @@
 # $Id$
 # Maintainer: Eric Belanger <eric at archlinux.org>
-# Contributor: Judd Vinet <jvinet at zeroflux.org>
 
 pkgname=gv
 pkgver=3.7.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A program to view PostScript and PDF documents"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/gv/"
 license=('GPL')
 depends=('xaw3d' 'ghostscript')
 install=gv.install
-source=(http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz gv.desktop gv.png)
+source=(http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz gv.desktop gv.png aplinedel.patch)
 md5sums=('bf4823d00d8e431f97dbcb7dd87c46ac' 'cf04652952f2d0903bc7578b4826f50c'\
-         'ab0e3879dbe39e59ad1c923020c28a86')
+         'ab0e3879dbe39e59ad1c923020c28a86' '8a57a5d50a0d68dc1d98108e9665bd2d')
 sha1sums=('05fcf76f29de77e67379bae7e9ca1c8a26bbf6e1' 'c8230fe08ee6d22525678a97832f44941237d174'\
-         '35b9168e526527001b1b5b8ee34a5b69d9369590')
+         '35b9168e526527001b1b5b8ee34a5b69d9369590' 'e6358e74ec2641730b44443a49df36322df2bdd8')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i -e "s:-dGraphicsAlphaBits=2:\0 -dAlignToPixels=0:" src/Makefile.{am,in} || return 1
-  ./configure --prefix=/usr || return 1
-  make || return 1
+  patch -p1 < ../aplinedel.patch
+  sed -i -e "s:-dGraphicsAlphaBits=2:\0 -dAlignToPixels=0:" src/Makefile.{am,in}
+  ./configure --prefix=/usr
+  make
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install || return 1
-  install -D -m644 ../gv.desktop "${pkgdir}/usr/share/applications/gv.desktop" || return 1
-  install -D -m644 ../gv.png "${pkgdir}/usr/share/pixmaps/gv.png" || return 1
+  make DESTDIR="${pkgdir}" install
+  install -D -m644 ../gv.desktop "${pkgdir}/usr/share/applications/gv.desktop"
+  install -D -m644 ../gv.png "${pkgdir}/usr/share/pixmaps/gv.png"
 }

Added: aplinedel.patch
===================================================================
--- aplinedel.patch	                        (rev 0)
+++ aplinedel.patch	2010-12-13 22:11:14 UTC (rev 103001)
@@ -0,0 +1,11 @@
+diff -ur a/src/gv_misc_res.dat b/src/gv_misc_res.dat
+--- a/src/gv_misc_res.dat	2010-10-15 09:21:36.000000000 +0200
++++ b/src/gv_misc_res.dat	2010-10-15 09:21:48.000000000 +0200
+@@ -476,7 +476,6 @@
+  <Key>BackSpace:	GV_Page(up,left-bottom,!page-1,bottom-rightedge)\n\
+  <Key>Insert:		GV_Page(page-5)		\n\
+  <Key>Delete:		GV_Page(page+5)		\n\
+- <Key>apLineDel:	GV_Page(page+5)		\n\
+  <Key>Home:		GV_Page(page=0)		\n\
+  <Key>End:		GV_Page(page=99999)	\n\
+  <Key>Prior:		GV_Page(page-1)		\n\