From 24f4ae7327bfa3f01cf539665f3f4a15ba781f7f Mon Sep 17 00:00:00 2001
From: Andy Postnikov <apostnikov@gmail.com>
Date: Wed, 22 Aug 2018 00:01:59 +0300
Subject: testing/wkhtmltopdf: upgrade to 0.12.5 and modernize

---
 testing/wkhtmltopdf/APKBUILD                       | 27 +++++-----------------
 .../wkhtmltopdf-missing-setDevicePixelRatio.patch  | 11 ---------
 2 files changed, 6 insertions(+), 32 deletions(-)
 delete mode 100644 testing/wkhtmltopdf/wkhtmltopdf-missing-setDevicePixelRatio.patch

(limited to 'testing/wkhtmltopdf')

diff --git a/testing/wkhtmltopdf/APKBUILD b/testing/wkhtmltopdf/APKBUILD
index d4168239da..ae1a38b9a0 100644
--- a/testing/wkhtmltopdf/APKBUILD
+++ b/testing/wkhtmltopdf/APKBUILD
@@ -1,41 +1,26 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=wkhtmltopdf
-pkgver=0.12.4
+pkgver=0.12.5
 pkgrel=0
 pkgdesc="Simple shell utility to convert html to pdf"
 url="http://wkhtmltopdf.org/"
 arch="all"
 license="GPL-3.0-or-later"
-depends=""
-depends_dev=""
 makedepends="$depends_dev qt5-qtbase-dev qt5-qtwebkit-dev qt5-qtsvg-dev
 	qt5-qtxmlpatterns-dev"
-install=""
 subpackages="$pkgname-dev $pkgname-doc"
-source="$pkgname-$pkgver.tar.gz::https://github.com/wkhtmltopdf/wkhtmltopdf/archive/$pkgver.tar.gz
-	wkhtmltopdf-missing-setDevicePixelRatio.patch
-	"
-
+source="$pkgname-$pkgver.tar.gz::https://github.com/wkhtmltopdf/wkhtmltopdf/archive/$pkgver.tar.gz"
+options="!check" # no test suite
 _builddir="$srcdir"/wkhtmltopdf-$pkgver
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
 
 build() {
 	cd "$_builddir"
-	qmake-qt5 -makefile && make  || return 1
+	qmake-qt5 -makefile && make
 }
 
 package() {
 	cd "$_builddir"
-	make install INSTALL_ROOT="$pkgdir"/usr || return 1
+	make install INSTALL_ROOT="$pkgdir"/usr
 }
 
-sha512sums="6ec27453efdf32b97f6434a3eb5dd3d3470bbdccdbb4f997ff4234441c79960932e51d963e5d0d2d98bbf8b4f7ab2ed8835dbc1a35407a63815691b59217caa2  wkhtmltopdf-0.12.4.tar.gz
-05285d9f7aede92941edcc4513b61cc328ade39639b01e72e2f9857d44e8ea2240b67c02a40804022e7c3888de6de8338339cdd6f28b5c681f5be8585ce00983  wkhtmltopdf-missing-setDevicePixelRatio.patch"
+sha512sums="3f982a6964085b36f62988b618d88d4339f03ad8d2e733c1fcba5e2e7cb545ccc99313ce35474605df818f91c289a87ddd952f21974fdbe846f990bf03fc2fdb  wkhtmltopdf-0.12.5.tar.gz"
diff --git a/testing/wkhtmltopdf/wkhtmltopdf-missing-setDevicePixelRatio.patch b/testing/wkhtmltopdf/wkhtmltopdf-missing-setDevicePixelRatio.patch
deleted file mode 100644
index 2d81be583d..0000000000
--- a/testing/wkhtmltopdf/wkhtmltopdf-missing-setDevicePixelRatio.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/lib/multipageloader.cc.org	2017-02-13 16:39:31.915069019 -0700
-+++ b/src/lib/multipageloader.cc	2017-02-13 16:37:39.343605883 -0700
-@@ -216,7 +216,7 @@
- 
- 	double devicePixelRatio = multiPageLoader.dpi / 96.; // The used version of WebKit always renders at 96 DPI when no zoom is applied. It does not fully support a device pixel ratio != 1 natively.
- 	webPage.mainFrame()->setZoomFactor(devicePixelRatio * settings.zoomFactor); // Zoom in the page to achieve a higher DPI.
--	webPage.setDevicePixelRatio(devicePixelRatio); // Fix CSS media queries (does not affect anything else).
-+//	webPage.setDevicePixelRatio(devicePixelRatio); // Fix CSS media queries (does not affect anything else).
- }
- 
- /*!
-- 
cgit v1.2.3