[gentoo-commits] repo/gentoo:master commit in: media-gfx/wkhtmltopdf/, media-gfx/wkhtmltopdf/files/

[Andreas Sturmlechner]

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@×××××.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
-}