From e1786dc80374f7ab320c11c3e79edabe034cb794 Mon Sep 17 00:00:00 2001
From: Max Rees <maxcrees@me.com>
Date: Mon, 24 Jun 2019 14:37:43 -0400
Subject: user/poppler-qt5: [CVE] bump to 0.77.0

---
 user/poppler-qt5/APKBUILD | 38 ++++++++++++++++++++++++++++++--------
 1 file changed, 30 insertions(+), 8 deletions(-)

(limited to 'user/poppler-qt5/APKBUILD')

diff --git a/user/poppler-qt5/APKBUILD b/user/poppler-qt5/APKBUILD
index 8e62189f4..5c0bbf4c8 100644
--- a/user/poppler-qt5/APKBUILD
+++ b/user/poppler-qt5/APKBUILD
@@ -1,40 +1,62 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=poppler-qt5
 _realname=poppler
-pkgver=0.74.0
+pkgver=0.77.0
 pkgrel=0
+_testver=01c92874
 pkgdesc="PDF rendering library based on xpdf 3.0 (Qt 5 bindings)"
 url="https://poppler.freedesktop.org/"
 arch="all"
-options="!check"  # Test data not included in tarball
 license="GPL-2.0+"
 makedepends="libjpeg-turbo-dev cairo-dev libxml2-dev fontconfig-dev
 	qt5-qtbase-dev poppler-dev~$pkgver lcms2-dev openjpeg-dev"
 depends=""
 depends_dev="$makedepends"
 subpackages="$pkgname-dev"
-source="https://poppler.freedesktop.org/poppler-$pkgver.tar.xz"
-builddir="$srcdir"/$_realname-$pkgver
+source="https://poppler.freedesktop.org/poppler-$pkgver.tar.xz
+	https://dev.sick.bike/dist/poppler-test-$_testver.tar.gz"
+builddir="$srcdir"/$_realname-$pkgver/build
+
+# secfixes: poppler
+#   0.77.0-r0:
+#     - CVE-2019-9200
+#     - CVE-2019-9631
+#     - CVE-2019-9903
+#     - CVE-2019-10872
+#     - CVE-2019-10873
+#     - CVE-2019-11026
+#     - CVE-2019-12293
 
 prepare() {
-	mkdir -p build
+	default_prepare
+	mkdir "$builddir"
 }
 
 build() {
-	cd "$builddir"/build
 	cmake \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_LIBDIR=/usr/lib \
+		-DTESTDATADIR="$srcdir/poppler-test-$_testver" \
 		..
 	make
 }
 
+check() {
+	# check_qt5_annotations: fails on ppc64 and x86_64 as of 0.77.0-r0
+	# FAIL!  : TestAnnotations::checkFontSizeAndColor() Compared values are not the same
+	#   Actual   (textAnnot->contents()): "\u00C3\u00BE\u00C3\u00BF\u0000f\u0000o\u0000o\u0000b\u0000a\u0000r"
+	#   Expected (contents)             : "foobar"
+	#   Loc: [src/poppler-0.77.0/qt5/tests/check_annotations.cpp(100)]
+	ctest --output-on-failure \
+		-E check_qt5_annotations
+}
+
 package() {
-	cd "$builddir"/build
 	install -D -m644 poppler-qt5.pc "$pkgdir"/usr/lib/pkgconfig/poppler-qt5.pc
 	cd qt5
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="4e48e2ffb559863ee693930db3b8594fd7e60e4b4ca3cdeb198faf90a6f4dbb5e102461492a12058221bc1218fe7e17c9085afb9e7956ae4bf26c11674315e66  poppler-0.74.0.tar.xz"
+sha512sums="7c82cf584541fcbfa7cecdb06be9c4ba6d03479fc248377b874afeab561eac24015915eee566edc35fafe785b9f381f492c1789c070e67a2c1b344879c156040  poppler-0.77.0.tar.xz
+5275541ffa0fef9c55a0c02411947c610b2e7eb621f0a0fa9529810f8b09e2b0194c1da4b64eb9641b2c3af7b099e6bb7d1212b9087a21cf3af893090a10506b  poppler-test-01c92874.tar.gz"
-- 
cgit v1.2.3-60-g2f50