main/poppler: enable PNG and TIFF support, fix license

main/poppler/APKBUILD

@@ -5,16 +5,17 @@
 # So we build qt support in separate package poppler-qt4
 pkgname=poppler
 pkgver=0.56.0
-pkgrel=0
+pkgrel=1
 pkgdesc="PDF rendering library based on xpdf 3.0"
 url="https://poppler.freedesktop.org/"
 arch="all"
-license="GPL"
+options="!check"  # No test suite.
+license="GPL-2.0+"
 depends=
 depends_dev="cairo-dev glib-dev"
 makedepends="$depends_dev libjpeg-turbo-dev cairo-dev libxml2-dev
 	fontconfig-dev lcms2-dev gobject-introspection-dev
-	openjpeg-dev"
+	openjpeg-dev libpng-dev tiff-dev zlib-dev"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-utils $pkgname-glib
 	"
 source="https://poppler.freedesktop.org/poppler-$pkgver.tar.xz"
@@ -48,14 +49,13 @@ build() {
 		--enable-libjpeg \
 		--enable-zlib \
 		--enable-poppler-glib \
-		--disable-poppler-qt4 \
-		|| return 1
+		--disable-poppler-qt4
 	make
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
 }
 
 utils() {
@@ -70,14 +70,14 @@ glib() {
 	mkdir -p "$subpkgdir"/usr/lib
 	mv "$pkgdir"/usr/lib/libpoppler-glib.so.* \
 		"$pkgdir"/usr/lib/girepository* \
-		"$subpkgdir"/usr/lib/ || return 1
+		"$subpkgdir"/usr/lib/
 }
 
 _cpp() {
 	pkgdesc="Pure C++ wrapper for poppler"
 	mkdir -p "$subpkgdir"/usr/lib
 	mv "$pkgdir"/usr/lib/libpoppler-cpp.so.* \
-		"$subpkgdir"/usr/lib/ || return 1
+		"$subpkgdir"/usr/lib/
 }
 
 sha512sums="74d2ca63afcb7e155c153b4ddc71621b7f4f2c60d4fcafd873176d5ac59fafedc35b200a22c7af2013d7f75e670a1cc23d6ba878167a02209917f8d30002d528  poppler-0.56.0.tar.xz"