summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2020-01-29 20:49:37 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2020-01-29 21:27:58 +0100
commit47ea4a3f896a0b68a5742399e53b7b3e9021d9b0 (patch)
tree8360a9e6f585de964c6d9a28c9f906e7f55c0b0d /dev-qt/qtsvg
parentdev-qt: Drop all KEYWORDS from 5.12.3 except arm, x86 (diff)
downloadgentoo-47ea4a3f896a0b68a5742399e53b7b3e9021d9b0.tar.gz
gentoo-47ea4a3f896a0b68a5742399e53b7b3e9021d9b0.tar.bz2
gentoo-47ea4a3f896a0b68a5742399e53b7b3e9021d9b0.zip
dev-qt: Drop 5.14.0
Package-Manager: Portage-2.3.86, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'dev-qt/qtsvg')
-rw-r--r--dev-qt/qtsvg/Manifest1
-rw-r--r--dev-qt/qtsvg/files/qtsvg-5.14.0-revert-keep-aspectratio.patch85
-rw-r--r--dev-qt/qtsvg/qtsvg-5.14.0-r1.ebuild25
3 files changed, 0 insertions, 111 deletions
diff --git a/dev-qt/qtsvg/Manifest b/dev-qt/qtsvg/Manifest
index 5f29b7d03377..a7513d5ae905 100644
--- a/dev-qt/qtsvg/Manifest
+++ b/dev-qt/qtsvg/Manifest
@@ -1,4 +1,3 @@
DIST qtsvg-everywhere-src-5.12.3.tar.xz 1859680 BLAKE2B 9ee0a2dbde09ef19fc72285f5ec9b865fd65c23bbecc4fcc8969a5f84bbe31818a086e066f32873e0cfd82aaab4a077660eabd2cbcc7494e84949c64b4a99740 SHA512 23517dbdc30d7128fcbeb12a301eeeb300424bb17bc0d156d5e9298c092d3d3afd2cba45768f2512e58977ee2408450f50c385e03a47ccaf3ff6bc7e4fddf61a
DIST qtsvg-everywhere-src-5.13.2.tar.xz 1890380 BLAKE2B 7b15ea615afe387e39ef4aec60489319230447abe560bbe2ce5dcc283a6ed6d49a44971306baf51791ac910feb25896324d48a21ff3a85ffa4a480354c077ceb SHA512 fbe2df9e8756c8982c0e91c0d0356e50dd22d898087dfd028dfa6ed363ea18e1ddce5d5838d705e2d31509d1d823ccddcaf5f8916c587919e10a39ae04ee0090
-DIST qtsvg-everywhere-src-5.14.0.tar.xz 1865488 BLAKE2B 2d0510907c0592e688896d4e4ef1b2be431837fba61d3486924ea7a31efa68584461852f033bf1364d8cadf95aa45fb28f38a778dcf8131f8c8d4d0808043e64 SHA512 eecc808311c4b149800edbdf9695a8f6438e01757d19938d554e816f44b92c3571c5f7d8b6e5cc95fa2e527e1b068707d8be4fd560c80a3b2d1900ca0b868378
DIST qtsvg-everywhere-src-5.14.1.tar.xz 1879708 BLAKE2B b3af3b007b0a80cb90af361526e09439510e977047bae784728dddf7daf00e2c35d58315423a0ebb4b7326a55957a8d51f19829edd9a371a522625e6a3faadcb SHA512 022f2a4ddfb13e8b35746394f968b117b38bb805869cf3dd8f354d3e76b3e64e47414e9d12dcdb04bcf2162b520ee5521836d6ee4a6d1257e7f1e5ec565ca821
diff --git a/dev-qt/qtsvg/files/qtsvg-5.14.0-revert-keep-aspectratio.patch b/dev-qt/qtsvg/files/qtsvg-5.14.0-revert-keep-aspectratio.patch
deleted file mode 100644
index 589492ca6bab..000000000000
--- a/dev-qt/qtsvg/files/qtsvg-5.14.0-revert-keep-aspectratio.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From 51694a5e293ae4eb7b83167e7cb54822907eb594 Mon Sep 17 00:00:00 2001
-From: Eirik Aavitsland <eirik.aavitsland@qt.io>
-Date: Thu, 9 Jan 2020 11:03:44 +0100
-Subject: [PATCH] Revert the keep-aspectratio feature for 5.14.1
-
-This was introduced as non-optional behavior for 5.14.0, but caused
-many regressions. This patch reverts that, and instead prepares for
-introducing it as an opt-in feature in Qt 5.15.
-
-[ChangeLog][QSVGRenderer] In Qt 5.14.0, rendering would keep aspect
-ratio implied by the viewbox, independently of the specified target
-area. This caused many regressions with existing code, so is reverted
-now in 5.14.1. The feature will instead be available as an opt-in in
-Qt 5.15.
-
-Task-number: QTBUG-81259
-Change-Id: I3efa2db864eb80ee00e8a067e56d9912bab36442
----
- src/svg/qsvgtinydocument.cpp | 14 ++++++++------
- tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp | 3 +++
- 2 files changed, 11 insertions(+), 6 deletions(-)
-
-diff --git a/src/svg/qsvgtinydocument.cpp b/src/svg/qsvgtinydocument.cpp
-index 56960bf..b364634 100644
---- a/src/svg/qsvgtinydocument.cpp
-+++ b/src/svg/qsvgtinydocument.cpp
-@@ -420,9 +420,10 @@ void QSvgTinyDocument::mapSourceToTarget(QPainter *p, const QRectF &targetRect,
- source = viewBox();
-
- if (source != target && !source.isNull()) {
-- if (m_implicitViewBox || !sourceRect.isNull()) {
-- // Code path used when no view box is set, or when an explicit source size is given which
-- // overrides it (which is the case when we're rendering only a specific element by id).
-+#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
-+ if (m_implicitViewBox || !preserveAspectRatio()) {
-+ // Code path used when no view box is set, or IgnoreAspectRatio requested
-+#endif
- QTransform transform;
- transform.scale(target.width() / source.width(),
- target.height() / source.height());
-@@ -431,10 +432,10 @@ void QSvgTinyDocument::mapSourceToTarget(QPainter *p, const QRectF &targetRect,
- target.y() - c2.y());
- p->scale(target.width() / source.width(),
- target.height() / source.height());
-+#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
- } else {
-- // Code path used when a view box is specified and we're not rendering a specific element by id
-- // but the entire document. This attempts to emulate the default values of the <preserveAspectRatio>
-- // tag that's implicitly defined when <viewbox> is used.
-+ // Code path used when KeepAspectRatio is requested. This attempts to emulate the default values
-+ // of the <preserveAspectRatio tag that's implicitly defined when <viewbox> is used.
-
- // Scale the view box into the view port (target) by preserve the aspect ratio.
- QSizeF viewBoxSize = source.size();
-@@ -451,6 +452,7 @@ void QSvgTinyDocument::mapSourceToTarget(QPainter *p, const QRectF &targetRect,
- p->translate(target.x() - source.x(),
- target.y() - source.y());
- }
-+#endif
- }
- }
-
-diff --git a/tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp b/tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp
-index 309c646..43a3eb8 100644
---- a/tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp
-+++ b/tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp
-@@ -269,6 +269,8 @@ void tst_QSvgRenderer::testMapViewBoxToTarget()
- QCOMPARE(picture.boundingRect(), QRect(125, 125, 250, 250));
- }
-
-+#if 0
-+ // Requires keep-aspectratio feature
- { // Viewport and viewBox specified -> scale 500x500 square to 1000x750 while preserving aspect ratio gives 750x750
- data = "<svg width=\"1000\" height=\"750\" viewBox=\"-250 -250 500 500\"><g><rect x=\"0\" y=\"0\" width=\"500\" height=\"500\" /></g></svg>";
- QPicture picture;
-@@ -278,6 +280,7 @@ void tst_QSvgRenderer::testMapViewBoxToTarget()
- painter.end();
- QCOMPARE(picture.boundingRect(), QRect(500, 375, 750, 750));
- }
-+#endif
- }
-
- void tst_QSvgRenderer::testRenderElement()
---
-2.25.0
diff --git a/dev-qt/qtsvg/qtsvg-5.14.0-r1.ebuild b/dev-qt/qtsvg/qtsvg-5.14.0-r1.ebuild
deleted file mode 100644
index 4716b5e4790f..000000000000
--- a/dev-qt/qtsvg/qtsvg-5.14.0-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="SVG rendering library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-IUSE=""
-
-RDEPEND="
- ~dev-qt/qtcore-${PV}
- ~dev-qt/qtgui-${PV}
- ~dev-qt/qtwidgets-${PV}
- sys-libs/zlib:=
-"
-DEPEND="${RDEPEND}
- test? ( ~dev-qt/qtxml-${PV} )
-"
-
-PATCHES=( "${FILESDIR}/${P}-revert-keep-aspectratio.patch" ) # QTBUG-81259