* [gentoo-commits] repo/gentoo:master commit in: media-gfx/wkhtmltopdf/, media-gfx/wkhtmltopdf/files/
@ 2017-01-28 12:24 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2017-01-28 12:24 UTC (permalink / raw
To: gentoo-commits
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
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/wkhtmltopdf/, media-gfx/wkhtmltopdf/files/
@ 2017-09-30 8:21 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2017-09-30 8:21 UTC (permalink / raw
To: gentoo-commits
commit: 849b2089f3afbb6339245cdee27afa216ded3614
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 30 08:20:13 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Sep 30 08:21:49 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=849b2089
media-gfx/wkhtmltopdf: Add missing USE-dep
Also fixing GCC6 build warning.
Reported-by: Andreas Schürch <nativemad <AT> gentoo.org>
Gentoo-bug: 631724
Package-Manager: Portage-2.3.10, Repoman-2.3.3
.../files/wkhtmltopdf-0.12.4-gcc6-warn.patch | 33 ++++++++++++++
media-gfx/wkhtmltopdf/wkhtmltopdf-0.12.4-r1.ebuild | 50 ++++++++++++++++++++++
2 files changed, 83 insertions(+)
diff --git a/media-gfx/wkhtmltopdf/files/wkhtmltopdf-0.12.4-gcc6-warn.patch b/media-gfx/wkhtmltopdf/files/wkhtmltopdf-0.12.4-gcc6-warn.patch
new file mode 100644
index 00000000000..83f862677a6
--- /dev/null
+++ b/media-gfx/wkhtmltopdf/files/wkhtmltopdf-0.12.4-gcc6-warn.patch
@@ -0,0 +1,33 @@
+From c7a709f3d9b7628d5416e45c365901381beef7cc Mon Sep 17 00:00:00 2001
+From: Ashish Kulkarni <kulkarni.ashish@gmail.com>
+Date: Tue, 20 Dec 2016 17:57:26 +0530
+Subject: [PATCH] fix compilation warning with GCC 6.2
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+../lib/pdfsettings.cc: In function ‘QString wkhtmltopdf::settings::unitRealToStr(const UnitReal&, bool*)’:
+../lib/pdfsettings.cc:308:3: warning: this ‘if’ clause does not guard... [-Wmisleading-indentation]
+ if (ok) *ok=false; break;
+ ^~
+../lib/pdfsettings.cc:308:22: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the ‘if’
+ if (ok) *ok=false; break;
+ ^~~~~
+---
+ src/lib/pdfsettings.cc | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/lib/pdfsettings.cc b/src/lib/pdfsettings.cc
+index e3c62526..b339ec10 100644
+--- a/src/lib/pdfsettings.cc
++++ b/src/lib/pdfsettings.cc
+@@ -305,7 +305,8 @@ QString unitRealToStr(const UnitReal & ur, bool * ok) {
+ case QPrinter::Point: c = "pt"; break;
+ case QPrinter::Millimeter: c = "mm"; break;
+ default:
+- if (ok) *ok=false; break;
++ if (ok) *ok=false;
++ return "";
+ }
+ return QString("%1%2").arg(ur.first).arg(c);
+ }
diff --git a/media-gfx/wkhtmltopdf/wkhtmltopdf-0.12.4-r1.ebuild b/media-gfx/wkhtmltopdf/wkhtmltopdf-0.12.4-r1.ebuild
new file mode 100644
index 00000000000..26b0e472f39
--- /dev/null
+++ b/media-gfx/wkhtmltopdf/wkhtmltopdf-0.12.4-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit qmake-utils
+
+DESCRIPTION="Convert html to pdf (and various image formats) using webkit"
+HOMEPAGE="https://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[printsupport]
+ dev-qt/qtwidgets:5
+"
+DEPEND="${RDEPEND}
+ dev-qt/qtxmlpatterns:5
+"
+
+DOCS=( AUTHORS CHANGELOG.md README.md )
+
+PATCHES=(
+ "${FILESDIR}"/${P}-build.patch
+ "${FILESDIR}"/${P}-gcc6-warn.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
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/wkhtmltopdf/, media-gfx/wkhtmltopdf/files/
@ 2019-04-29 0:18 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2019-04-29 0:18 UTC (permalink / raw
To: gentoo-commits
commit: b1cd7f987e0776ccff9ab36572f4115c0809e005
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 29 00:17:05 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Apr 29 00:17:45 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1cd7f98
media-gfx/wkhtmltopdf: Drop 0.12.4-r1
Package-Manager: Portage-2.3.65, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/wkhtmltopdf/Manifest | 1 -
.../files/wkhtmltopdf-0.12.4-build.patch | 21 ---------
.../files/wkhtmltopdf-0.12.4-gcc6-warn.patch | 33 --------------
media-gfx/wkhtmltopdf/wkhtmltopdf-0.12.4-r1.ebuild | 50 ----------------------
4 files changed, 105 deletions(-)
diff --git a/media-gfx/wkhtmltopdf/Manifest b/media-gfx/wkhtmltopdf/Manifest
index 1ad4a25859c..ecedd947ff2 100644
--- a/media-gfx/wkhtmltopdf/Manifest
+++ b/media-gfx/wkhtmltopdf/Manifest
@@ -1,2 +1 @@
-DIST wkhtmltopdf-0.12.4.tar.gz 128695 BLAKE2B 4bd65b8c0b424973524d9307ff329f05702a9ba3206b91abd8252a4127781a502cf40314669b35b395bb0b3712f9fbcf8ba2537164a7fcf8b3276c3262283eb3 SHA512 6ec27453efdf32b97f6434a3eb5dd3d3470bbdccdbb4f997ff4234441c79960932e51d963e5d0d2d98bbf8b4f7ab2ed8835dbc1a35407a63815691b59217caa2
DIST wkhtmltopdf-0.12.5.tar.gz 511181 BLAKE2B f52d56fd932dfa514cc2711d22f99ea29960a3c4da2522be9f58f3197cb12494f1cdc8856399e328cfc39956282b8174886ee8edfc7417ba5c5d65ea353f6046 SHA512 3f982a6964085b36f62988b618d88d4339f03ad8d2e733c1fcba5e2e7cb545ccc99313ce35474605df818f91c289a87ddd952f21974fdbe846f990bf03fc2fdb
diff --git a/media-gfx/wkhtmltopdf/files/wkhtmltopdf-0.12.4-build.patch b/media-gfx/wkhtmltopdf/files/wkhtmltopdf-0.12.4-build.patch
deleted file mode 100644
index 0148f3b4294..00000000000
--- a/media-gfx/wkhtmltopdf/files/wkhtmltopdf-0.12.4-build.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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/files/wkhtmltopdf-0.12.4-gcc6-warn.patch b/media-gfx/wkhtmltopdf/files/wkhtmltopdf-0.12.4-gcc6-warn.patch
deleted file mode 100644
index 83f862677a6..00000000000
--- a/media-gfx/wkhtmltopdf/files/wkhtmltopdf-0.12.4-gcc6-warn.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From c7a709f3d9b7628d5416e45c365901381beef7cc Mon Sep 17 00:00:00 2001
-From: Ashish Kulkarni <kulkarni.ashish@gmail.com>
-Date: Tue, 20 Dec 2016 17:57:26 +0530
-Subject: [PATCH] fix compilation warning with GCC 6.2
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-../lib/pdfsettings.cc: In function ‘QString wkhtmltopdf::settings::unitRealToStr(const UnitReal&, bool*)’:
-../lib/pdfsettings.cc:308:3: warning: this ‘if’ clause does not guard... [-Wmisleading-indentation]
- if (ok) *ok=false; break;
- ^~
-../lib/pdfsettings.cc:308:22: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the ‘if’
- if (ok) *ok=false; break;
- ^~~~~
----
- src/lib/pdfsettings.cc | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/lib/pdfsettings.cc b/src/lib/pdfsettings.cc
-index e3c62526..b339ec10 100644
---- a/src/lib/pdfsettings.cc
-+++ b/src/lib/pdfsettings.cc
-@@ -305,7 +305,8 @@ QString unitRealToStr(const UnitReal & ur, bool * ok) {
- case QPrinter::Point: c = "pt"; break;
- case QPrinter::Millimeter: c = "mm"; break;
- default:
-- if (ok) *ok=false; break;
-+ if (ok) *ok=false;
-+ return "";
- }
- return QString("%1%2").arg(ur.first).arg(c);
- }
diff --git a/media-gfx/wkhtmltopdf/wkhtmltopdf-0.12.4-r1.ebuild b/media-gfx/wkhtmltopdf/wkhtmltopdf-0.12.4-r1.ebuild
deleted file mode 100644
index 26b0e472f39..00000000000
--- a/media-gfx/wkhtmltopdf/wkhtmltopdf-0.12.4-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit qmake-utils
-
-DESCRIPTION="Convert html to pdf (and various image formats) using webkit"
-HOMEPAGE="https://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[printsupport]
- dev-qt/qtwidgets:5
-"
-DEPEND="${RDEPEND}
- dev-qt/qtxmlpatterns:5
-"
-
-DOCS=( AUTHORS CHANGELOG.md README.md )
-
-PATCHES=(
- "${FILESDIR}"/${P}-build.patch
- "${FILESDIR}"/${P}-gcc6-warn.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
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-04-29 0:18 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-09-30 8:21 [gentoo-commits] repo/gentoo:master commit in: media-gfx/wkhtmltopdf/, media-gfx/wkhtmltopdf/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2019-04-29 0:18 Andreas Sturmlechner
2017-01-28 12:24 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox