Switched to depend on gcc6.

4 files changed, 21 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0fbdddaec642..a7596d28c3b9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,22 @@
 # Generated by mksrcinfo v8
-# Wed Jul  5 19:11:27 UTC 2017
+# Wed Aug  2 17:41:53 UTC 2017
 pkgbase = pdftk
 	pkgdesc = Pdftk is a simple tool for doing everyday things with PDF documents
 	pkgver = 2.02
-	pkgrel = 16
+	pkgrel = 17
 	url = http://www.pdfhacks.com/pdftk
 	arch = i686
 	arch = x86_64
 	license = GPL
-	depends = gcc63-gcj
+	depends = gcc6-gcj
 	depends = gcc-gcj-ecj
 	options = !makeflags
 	source = http://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/pdftk-2.02-src.zip
 	source = Makefile.Arch
 	source = pdftk
 	sha1sums = a4a27e984c5e1401cfa44b8e92a64113d7396a06
-	sha1sums = 50da68be80a2ed9cf9ae2c24d0016ea19f0eec0d
-	sha1sums = 9ccacd5bf6a759563f2548a5ecb66fbe5132d1e7
+	sha1sums = 0c8e1a442d266eb6782349e41652c6c07464222e
+	sha1sums = 668240583dc4f8564edd5eaec3c769ec6fdd4cc0
 
 pkgname = pdftk
 
diff --git a/Makefile.Arch b/Makefile.Arch
index b5fb6299d819..35481354de21 100644
--- a/Makefile.Arch
+++ b/Makefile.Arch
@@ -1,19 +1,20 @@
 # Based on 'Makefile.Debian', part of pdftk
 # Copyright (c) 2004-2012 Sid Steward
 
-export CXX= g++-6.3
-export GCJ= gcj-6.3
-export GIJ= gij-6.3
-export GCJH= gcjh-6.3
-export GJAR= gjar-6.3
-export CC1PLUS= cc1plus-6.3
+export CXX= g++-6
+export GCJ= gcj-6
+export GIJ= gij-6
+export GCJH= gcjh-6
+export GJAR= gjar-6
+export CC1PLUS= cc1plus-6
 export LIBGCJ= /usr/share/java/libgcj.jar
 export AR= ar
 export RM= rm
 export ARFLAGS= rs
 export RMFLAGS= -vf
 export CPPFLAGS= -DPATH_DELIM=0x2f -DASK_ABOUT_WARNINGS=false -DUNBLOCK_SIGNALS -fdollars-in-identifiers -fPIC
-export CXXFLAGS= -O2 -fPIC -I/usr/lib/gcc/x86_64-pc-linux-gnu/6.3.1/include/c++/ -I/usr/lib/gcc/x86_64-pc-linux-gnu/6.3.1/include/c++/x86_64-pc-linux-gnu
+GCC6VER=`gcc -dumpversion`
+export CXXFLAGS= -O2 -fPIC -I/usr/lib/gcc/x86_64-pc-linux-gnu/${GCC6VER}/include/c++/ -I/usr/lib/gcc/x86_64-pc-linux-gnu/${GCC6VER}/include/c++/x86_64-pc-linux-gnu
 export GCJFLAGS= -Wno-all -fsource=1.3 -O2 -fPIC
 export GCJHFLAGS= -force
 export LDLIBS= -lgcj
diff --git a/PKGBUILD b/PKGBUILD
index 5c02eb634650..744d2ac4cc27 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,20 +5,20 @@
 
 pkgname=pdftk
 pkgver=2.02
-pkgrel=16
+pkgrel=17
 pkgdesc="Pdftk is a simple tool for doing everyday things with PDF documents"
 arch=('i686' 'x86_64')
 url="http://www.pdfhacks.com/pdftk"
 license=("GPL")
-depends=('gcc63-gcj' 'gcc-gcj-ecj')
+depends=('gcc6-gcj' 'gcc-gcj-ecj')
 options=('!makeflags')
 source=("http://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/${pkgname}-${pkgver}-src.zip"
 	"Makefile.Arch"
 	"pdftk"
 )
 sha1sums=('a4a27e984c5e1401cfa44b8e92a64113d7396a06'
-          '50da68be80a2ed9cf9ae2c24d0016ea19f0eec0d'
-          '9ccacd5bf6a759563f2548a5ecb66fbe5132d1e7')
+          '0c8e1a442d266eb6782349e41652c6c07464222e'
+          '668240583dc4f8564edd5eaec3c769ec6fdd4cc0')
 
 prepare() {
 	cd "$srcdir/$pkgname-$pkgver-dist/$pkgname"
@@ -48,5 +48,7 @@ package() {
 	install -D -m 644 "pdftk.1" "$pkgdir/usr/share/man/man1/pdftk.1"
 
         # Install wrapper that sets the proper environment variables.
-	install -D -m 755 "${srcdir}/pdftk" "${pkgdir}/usr/bin/pdftk" 
+	sed -i "s/CARCH/${CARCH}/" ${srcdir}/pdftk
+	sed -i "s/GCCVER/`gcc-6 -dumpversion`/" ${srcdir}/pdftk
+	install -D -m 755 ${srcdir}/pdftk ${pkgdir}/usr/bin/pdftk
 }
diff --git a/pdftk b/pdftk
index fc793e6e6f82..12d821bd0069 100644
--- a/pdftk
+++ b/pdftk
@@ -1,3 +1,3 @@
 #!/bin/bash
-export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/lib/gcc/x86_64-pc-linux-gnu/6.3.1
+export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/lib/gcc/CARCH-pc-linux-gnu/GCCVER
 pdftk-bin "$@"