Update to 1.10

Bump ghostpdl version to 9.22. Mentioned in the README as the highest tested version.
Removed the || return 1 statements, as those are unnecessary.

3 files changed, 29 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0b9cf2815090..b978a3de204c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Mon May 30 11:40:41 UTC 2016
 pkgbase = gsdjvu
 	pkgdesc = Very efficient way of converting PostScript and PDF documents into DjVu
-	pkgver = 1.9
-	pkgrel = 2
+	pkgver = 1.10
+	pkgrel = 1
 	url = http://djvu.sourceforge.net/gsdjvu.html
 	arch = i686
 	arch = x86_64
@@ -13,15 +11,15 @@ pkgbase = gsdjvu
 	depends = libpng12>=1.2.6
 	depends = zlib>=1.2.1
 	optdepends = djvulibre
-	noextract = ghostscript-9.18.tar.bz2
+	noextract = ghostscript-9.22.tar.bz2
 	noextract = ghostscript-fonts-std-8.11.tar.gz
 	options = !libtool
 	options = !makeflags
-	source = http://downloads.sourceforge.net/sourceforge/djvu/gsdjvu-1.9.tar.gz
-	source = http://downloads.ghostscript.com/public/old-gs-releases/ghostscript-9.18.tar.bz2
+	source = http://downloads.sourceforge.net/sourceforge/djvu/gsdjvu-1.10.tar.gz
+	source = https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs922/ghostpdl-9.22.tar.gz
 	source = http://downloads.sourceforge.net/ghostscript/ghostscript-fonts-std-8.11.tar.gz
-	sha1sums = f98eed58ecc161ade57a5c067277b2e9d631b2b3
-	sha1sums = 388fea50a38e422a4c6ff27c184491bf5ecb96e1
+	sha1sums = 0ce418b0a06c807c2010458694a09a9fbf847a0b
+	sha1sums = 59ac602416468dca63ddca5154cd51e5116b3481
 	sha1sums = 2a7198e8178b2e7dba87cb5794da515200b568f5
 
 pkgname = gsdjvu
diff --git a/PKGBUILD b/PKGBUILD
index acf15b6f9e04..528c8d4e17d2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,10 +2,10 @@
 # Contributor: AndyRTR <andyrtr@archlinux.org>
 
 pkgname=gsdjvu
-pkgver=1.9
-_gsver=9.18
+pkgver=1.10
+_gsver=9.22
 _fontsver=8.11
-pkgrel=2
+pkgrel=1
 pkgdesc="Very efficient way of converting PostScript and PDF documents into DjVu"
 arch=(i686 x86_64)
 # This program mixes GPL and CPL licensed codes, so the binaries are not redistributable.
@@ -14,33 +14,38 @@ depends=('libcups>=1.3.9-3' 'cairo' 'libpng12>=1.2.6' 'zlib>=1.2.1')
 optdepends=('djvulibre') # for the djvudigital converter
 url="http://djvu.sourceforge.net/gsdjvu.html"
 source=("http://downloads.sourceforge.net/sourceforge/djvu/gsdjvu-${pkgver}.tar.gz" 
-	"http://downloads.ghostscript.com/public/old-gs-releases/ghostscript-${_gsver}.tar.bz2"
-	"http://downloads.sourceforge.net/ghostscript/ghostscript-fonts-std-${_fontsver}.tar.gz" )
+        "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${_gsver/./}/ghostpdl-${_gsver}.tar.gz"
+        "http://downloads.sourceforge.net/ghostscript/ghostscript-fonts-std-${_fontsver}.tar.gz")
 noextract=("ghostscript-${_gsver}.tar.bz2"
 	"ghostscript-fonts-std-${_fontsver}.tar.gz")
 options=('!libtool' '!makeflags')
-sha1sums=('f98eed58ecc161ade57a5c067277b2e9d631b2b3'
-          '388fea50a38e422a4c6ff27c184491bf5ecb96e1'
+sha1sums=('0ce418b0a06c807c2010458694a09a9fbf847a0b'
+          '59ac602416468dca63ddca5154cd51e5116b3481'
           '2a7198e8178b2e7dba87cb5794da515200b568f5')
 
-build() {
+
+prepare() {
     cd "$pkgname-$pkgver"
 
     mkdir -p BUILD
-    ln -sf "$srcdir/ghostscript-${_gsver}.tar.bz2" BUILD
+    ln -sf "$srcdir/ghostpdl-${_gsver}.tar.gz" BUILD
     ln -sf "$srcdir/ghostscript-fonts-std-${_fontsver}.tar.gz" BUILD
+}
+
+build() {
+    cd "$pkgname-$pkgver"
 
-    echo -e 'YES\n\n' | "$srcdir/gsdjvu-$pkgver/build-gsdjvu" || return 1
+    echo -e 'YES\n\n' | "$srcdir/gsdjvu-$pkgver/build-gsdjvu"
 }
 
 package() {
     cd "$pkgname-$pkgver"
 
-    install -dm755 "$pkgdir/usr/lib" || return 1
-    cp -a BUILD/INST/gsdjvu "$pkgdir/usr/lib" || return 1
-    install -dm755 "$pkgdir/usr/bin" || return 1
-    ln -s "/usr/lib/gsdjvu/gsdjvu" "$pkgdir/usr/bin/gsdjvu" || return 1
-    sed -i -e 's,/usr/bin/gs,/usr/lib/gsdjvu/bin/gs,' "$pkgdir/usr/lib/gsdjvu/gsdjvu" || return 1
-    install -dm755 "$pkgdir/usr/share/licenses/$pkgname" || return 1
-    install -m644 COPYING* "$pkgdir/usr/share/licenses/$pkgname" || return 1
+    install -dm755 "$pkgdir/usr/lib"
+    cp -a BUILD/INST/gsdjvu "$pkgdir/usr/lib"
+    install -dm755 "$pkgdir/usr/bin"
+    ln -s "/usr/lib/gsdjvu/gsdjvu" "$pkgdir/usr/bin/gsdjvu"
+    sed -i -e 's,/usr/bin/gs,/usr/lib/gsdjvu/bin/gs,' "$pkgdir/usr/lib/gsdjvu/gsdjvu"
+    install -dm755 "$pkgdir/usr/share/licenses/$pkgname"
+    install -m644 COPYING* "$pkgdir/usr/share/licenses/$pkgname"
 }
diff --git a/PKGBUILD.sig b/PKGBUILD.sig
deleted file mode 100644
index 9be995d2fc69..000000000000
--- a/PKGBUILD.sig
+++ /dev/null
@@ -1,11 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQEcBAABCAAGBQJXTCakAAoJECSyfCdcYmjT2SQH/AxgA8BGe/aXYqOx5trjLGlt
-Nms4J/QgNn8jAh4JJ28mJ5S7w6MgaM1lE8iMY+qmdB2lg+UbjfwuaZ2r4pl29pOP
-1gkz9/4oUYJ9ByRZyAqA5PunwO6wMiTyAD/9lqJcCxYRM7gHj+HHV1sQ6TvZ/8p9
-yfknh1Eb+nL8TRcA4H9DNfPGy4JVyghh1jLpMLmfPkxtklBzipQpAafSTsqNubdl
-+M//mwnAQGAwNoE/09RlyvHFkXHaycNEk+nCDwvoYaa8jtFTfNSP67an13EubFeI
-4BwnqwMIjhtqy+hWeZfXNlyHY694tB+GyfYuJ/eGrSyqvfMWaENF0PDL3+CSQ1c=
-=aJFZ
------END PGP SIGNATURE-----