From ab0e56ef826abbea48aabe80dff477982a3319be Mon Sep 17 00:00:00 2001 From: Piraty Date: Thu, 14 Jun 2018 21:47:42 +0200 Subject: [PATCH] wkhtmltopdf: update to 0.12.5. Closes #2. Signed-off-by: Enno Boland --- common/shlibs | 2 +- srcpkgs/libwkhtmltopdf | 1 + .../wkhtmltopdf/patches/fix-patched-qt.patch | 24 ------------------- srcpkgs/wkhtmltopdf/template | 23 +++++++++--------- 4 files changed, 13 insertions(+), 37 deletions(-) create mode 120000 srcpkgs/libwkhtmltopdf delete mode 100644 srcpkgs/wkhtmltopdf/patches/fix-patched-qt.patch diff --git a/common/shlibs b/common/shlibs index 6ed62ba192..9dbabeb120 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3017,7 +3017,7 @@ libArcus.so.3 libArcus-3.1.0_1 libgutenprint.so.2 gutenprint-5.2.12_1 libunbound.so.2 unbound-1.6.6_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 libupnp.so.10 libupnp1.8-1.8.2_1 libevent_extra-2.1.so.6 libevent-2.1.8_3 diff --git a/srcpkgs/libwkhtmltopdf b/srcpkgs/libwkhtmltopdf new file mode 120000 index 0000000000..c4f52b3313 --- /dev/null +++ b/srcpkgs/libwkhtmltopdf @@ -0,0 +1 @@ +wkhtmltopdf \ No newline at end of file diff --git a/srcpkgs/wkhtmltopdf/patches/fix-patched-qt.patch b/srcpkgs/wkhtmltopdf/patches/fix-patched-qt.patch deleted file mode 100644 index a18d0c0f7f..0000000000 --- a/srcpkgs/wkhtmltopdf/patches/fix-patched-qt.patch +++ /dev/null @@ -1,24 +0,0 @@ -https://github.com/wkhtmltopdf/wkhtmltopdf/commit/af95531eabb212ae16a9fb689bb25a767eb580bc - -From af95531eabb212ae16a9fb689bb25a767eb580bc Mon Sep 17 00:00:00 2001 -From: Ashish Kulkarni -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 - } - - /*! diff --git a/srcpkgs/wkhtmltopdf/template b/srcpkgs/wkhtmltopdf/template index e6c05d1010..dc8bd4690d 100644 --- a/srcpkgs/wkhtmltopdf/template +++ b/srcpkgs/wkhtmltopdf/template @@ -1,29 +1,28 @@ # Template file for 'wkhtmltopdf' pkgname=wkhtmltopdf -version=0.12.4 -revision=2 +version=0.12.5 +revision=1 build_style=qmake hostmakedepends="qt5-qmake" +configure_args="INSTALLBASE=/usr" makedepends="qt5-xmlpatterns-devel qt5-svg-devel qt5-webkit-devel" depends="qt5-svg" short_desc="Convert HTML to PDF using Webkit" maintainer="Piraty " -license="LGPL-3" -homepage="https://wkhtmltopdf.org/" +license="LGPL-3.0-or-later" +homepage="https://wkhtmltopdf.org" distfiles="https://github.com/wkhtmltopdf/wkhtmltopdf/archive/${version}.tar.gz" -checksum=dd466f5c2504670459f3b8265de5697b9054f077e2f3e392e5172b5133080edf +checksum=861d6e61e2f5beb2d8daaade2cd5a85b84065ee9fac0d6d85000d8a7712a4621 if [ -n "$CROSS_BUILD" ]; then hostmakedepends+=" ${makedepends}" fi -post_install() { - local dir - vmkdir usr - for dir in bin lib share include; do - [ -e $DESTDIR/usr/$dir ] && rmdir $DESTDIR/usr/$dir - mv -v $DESTDIR/$dir $DESTDIR/usr/$dir - done +libwkhtmltopdf_package() { + short_desc+=" - runtime library" + pkg_install() { + vmove "usr/lib/*.so.*" + } } wkhtmltopdf-devel_package() {