commit: d61bc446767dd79cabe1168bdc85c6fc6bef3692 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat Jan 28 00:27:50 2017 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat Jan 28 12:22:08 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d61bc446
media-gfx/wkhtmltopdf: 0.12.4 version bump, switch to Qt5, EAPI 6 Gentoo-bug: 603990 Package-Manager: portage-2.3.3 media-gfx/wkhtmltopdf/Manifest | 1 + .../files/wkhtmltopdf-0.12.4-build.patch | 21 ++++++++++ media-gfx/wkhtmltopdf/wkhtmltopdf-0.12.4.ebuild | 48 ++++++++++++++++++++++ 3 files changed, 70 insertions(+) diff --git a/media-gfx/wkhtmltopdf/Manifest b/media-gfx/wkhtmltopdf/Manifest index eb252c6..655fb91 100644 --- a/media-gfx/wkhtmltopdf/Manifest +++ b/media-gfx/wkhtmltopdf/Manifest @@ -1,2 +1,3 @@ DIST wkhtmltopdf-0.12.1.2.tar.gz 127182 SHA256 2f27dd0e9e7957692aba98014c873121898275859b1da0f1dab42b7dd5e10098 SHA512 81f3e29e6714e9fc6737100218758b59760c9675b9d9caaad1b40737e6322e6067d80dcf51cf8a533aaa5fb293b0c72efc6331909eeeed60da007fccb90f88d8 WHIRLPOOL 1f1e6470fbbbee07a76073d2946df3159d962d6452211126431e3a9c6ad44c0bf0b6444ace4616251def091dde13196577c11f3b7c4daf56892c48b0725d60e5 DIST wkhtmltopdf-0.12.2.1.tar.gz 127565 SHA256 24847a2b8f495fb40d8b7a92c9051b40520d2439454ee8def0c952c932a1283d SHA512 4986d1a85ad8f3e8a3577ae0d6e1cfba726b143c67d3301ebbaac844c63a1ffd39b6d2b2c64054ec3603ca24efd01deb5b2f7501b14c092b09ad64160dc9db0e WHIRLPOOL f37afa640430db18cd48258f2f670405714fe3084a6cd2684aae9952bdbe5afdd1acc42fed4d0811c8a3329a5e4bd7b658444d7fb5683d228bb526670d624001 +DIST wkhtmltopdf-0.12.4.tar.gz 128695 SHA256 dd466f5c2504670459f3b8265de5697b9054f077e2f3e392e5172b5133080edf SHA512 6ec27453efdf32b97f6434a3eb5dd3d3470bbdccdbb4f997ff4234441c79960932e51d963e5d0d2d98bbf8b4f7ab2ed8835dbc1a35407a63815691b59217caa2 WHIRLPOOL 382c930e21e7136fe540b26afe86d53c74e6d97a70f87cd2138cc654ad65958f60cb11e76bf3e0a1aeb4f8bbc7671deae2e109058e9343d773684ec916d4aa8d diff --git a/media-gfx/wkhtmltopdf/files/wkhtmltopdf-0.12.4-build.patch b/media-gfx/wkhtmltopdf/files/wkhtmltopdf-0.12.4-build.patch new file mode 100644 index 00000000..0148f3b --- /dev/null +++ b/media-gfx/wkhtmltopdf/files/wkhtmltopdf-0.12.4-build.patch @@ -0,0 +1,21 @@ +Fix build without patched Qt + +This was broken since 96b03ae. + +diff --git a/src/lib/multipageloader.cc b/src/lib/multipageloader.cc +index 93dece8..456a857 100644 +--- a/src/lib/multipageloader.cc ++++ b/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/media-gfx/wkhtmltopdf/wkhtmltopdf-0.12.4.ebuild b/media-gfx/wkhtmltopdf/wkhtmltopdf-0.12.4.ebuild new file mode 100644 index 00000000..bde903f --- /dev/null +++ b/media-gfx/wkhtmltopdf/wkhtmltopdf-0.12.4.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit qmake-utils + +DESCRIPTION="Convert html to pdf (and various image formats) using webkit" +HOMEPAGE="http://wkhtmltopdf.org/ https://github.com/wkhtmltopdf/wkhtmltopdf/"; +SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="examples" + +RDEPEND=" + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtprintsupport:5 + dev-qt/qtsvg:5 + dev-qt/qtwebkit:5 + dev-qt/qtwidgets:5 +" +DEPEND="${RDEPEND} + dev-qt/qtxmlpatterns:5 +" + +DOCS=( AUTHORS CHANGELOG.md README.md ) + +PATCHES=( "${FILESDIR}"/${P}-build.patch ) + +src_prepare() { + default + sed -i "s:\(INSTALLBASE/\)lib:\1$(get_libdir):" src/lib/lib.pro || die +} + +src_configure() { + eqmake5 INSTALLBASE=/usr +} + +src_install() { + emake INSTALL_ROOT="${D}" install + use examples && dodoc -r examples + einstalldocs +}
