wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-06-05 06:33:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

wkhtmltopdf: update to 0.12.5.

Browse source 
Closes #2.

Signed-off-by: Enno Boland <gottox@voidlinux.eu>
This commit is contained in:
Piraty 2018-06-14 21:47:42 +02:00 • committed by Enno Boland
parent 6dfc1e180f
commit ab0e56ef82
4 changed files with 13 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/shlibs
View file

@ -3017,7 +3017,7 @@ libArcus.so.3 libArcus-3.1.0_1
libgutenprint.so.2 gutenprint-5.2.12_1 libgutenprint.so.2 gutenprint-5.2.12_1
libunbound.so.2 unbound-1.6.6_1 libunbound.so.2 unbound-1.6.6_1
libmirage.so.11 libmirage-3.1.0_1 libmirage.so.11 libmirage-3.1.0_1
libwkhtmltox.so.0 wkhtmltopdf-0.12.4_1 libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
libixml.so.10 libupnp1.8-1.8.2_1 libixml.so.10 libupnp1.8-1.8.2_1
libupnp.so.10 libupnp1.8-1.8.2_1 libupnp.so.10 libupnp1.8-1.8.2_1
libevent_extra-2.1.so.6 libevent-2.1.8_3 libevent_extra-2.1.so.6 libevent-2.1.8_3

1
srcpkgs/libwkhtmltopdf Symbolic link
View file

@ -0,0 +1 @@
wkhtmltopdf

24
srcpkgs/wkhtmltopdf/patches/fix-patched-qt.patch
View file

@ -1,24 +0,0 @@
https://github.com/wkhtmltopdf/wkhtmltopdf/commit/af95531eabb212ae16a9fb689bb25a767eb580bc
From af95531eabb212ae16a9fb689bb25a767eb580bc Mon Sep 17 00:00:00 2001
From: Ashish Kulkarni <kulkarni.ashish@gmail.com>
Date: Tue, 20 Dec 2016 17:53:46 +0530
Subject: [PATCH] fix build without patched Qt
This was broken since 96b03ae078b36122c48ec0ce9b164a24627c5312.
--- src/lib/multipageloader.cc
+++ src/lib/multipageloader.cc
@@ -213,10 +213,11 @@ ResourceObject::ResourceObject(MultiPageLoaderPrivate & mpl, const QUrl & u, con
}
webPage.setNetworkAccessManager(&networkAccessManager);
-
+#ifdef __EXTENSIVE_WKHTMLTOPDF_QT_HACK__
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).
+#endif
}
/*!

23
srcpkgs/wkhtmltopdf/template
View file

@ -1,29 +1,28 @@
# Template file for 'wkhtmltopdf' # Template file for 'wkhtmltopdf'
pkgname=wkhtmltopdf pkgname=wkhtmltopdf
version=0.12.4 version=0.12.5
revision=2 revision=1
build_style=qmake build_style=qmake
hostmakedepends="qt5-qmake" hostmakedepends="qt5-qmake"
configure_args="INSTALLBASE=/usr"
makedepends="qt5-xmlpatterns-devel qt5-svg-devel qt5-webkit-devel" makedepends="qt5-xmlpatterns-devel qt5-svg-devel qt5-webkit-devel"
depends="qt5-svg" depends="qt5-svg"
short_desc="Convert HTML to PDF using Webkit" short_desc="Convert HTML to PDF using Webkit"
maintainer="Piraty <piraty1@inbox.ru>" maintainer="Piraty <piraty1@inbox.ru>"
license="LGPL-3" license="LGPL-3.0-or-later"
homepage="https://wkhtmltopdf.org/" homepage="https://wkhtmltopdf.org"
distfiles="https://github.com/wkhtmltopdf/wkhtmltopdf/archive/${version}.tar.gz" distfiles="https://github.com/wkhtmltopdf/wkhtmltopdf/archive/${version}.tar.gz"
checksum=dd466f5c2504670459f3b8265de5697b9054f077e2f3e392e5172b5133080edf checksum=861d6e61e2f5beb2d8daaade2cd5a85b84065ee9fac0d6d85000d8a7712a4621
if [ -n "$CROSS_BUILD" ]; then if [ -n "$CROSS_BUILD" ]; then
hostmakedepends+=" ${makedepends}" hostmakedepends+=" ${makedepends}"
fi fi
post_install() { libwkhtmltopdf_package() {
local dir short_desc+=" - runtime library"
vmkdir usr pkg_install() {
for dir in bin lib share include; do vmove "usr/lib/*.so.*"
[ -e $DESTDIR/usr/$dir ] && rmdir $DESTDIR/usr/$dir }
mv -v $DESTDIR/$dir $DESTDIR/usr/$dir
done
} }
wkhtmltopdf-devel_package() { wkhtmltopdf-devel_package() {