diff options
Diffstat (limited to 'dev-qt')
| -rw-r--r-- | dev-qt/Manifest.gz | bin | 10017 -> 10013 bytes | |||
| -rw-r--r-- | dev-qt/qtgui/Manifest | 2 | ||||
| -rw-r--r-- | dev-qt/qtgui/files/qtgui-5.14.0-restore-scaling.patch | 34 | ||||
| -rw-r--r-- | dev-qt/qtgui/qtgui-5.14.0-r2.ebuild | 187 | ||||
| -rw-r--r-- | dev-qt/qtsvg/Manifest | 3 | ||||
| -rw-r--r-- | dev-qt/qtsvg/files/qtsvg-5.14.0-revert-keep-aspectratio.patch | 85 | ||||
| -rw-r--r-- | dev-qt/qtsvg/qtsvg-5.14.0-r1.ebuild (renamed from dev-qt/qtsvg/qtsvg-5.14.0.ebuild) | 4 |
7 files changed, 313 insertions, 2 deletions
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz Binary files differindex 6547faa3f753..df9729b442d7 100644 --- a/dev-qt/Manifest.gz +++ b/dev-qt/Manifest.gz diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest index 8942c20c3f55..47271bcfc4d0 100644 --- a/dev-qt/qtgui/Manifest +++ b/dev-qt/qtgui/Manifest @@ -1,5 +1,6 @@ AUX qt-5.12-gcc-avx2.patch 1038 BLAKE2B cb54308c8ef4df9efaa8727ba292b7e959ae069237f8dbc6c7432556c4697f0263dca098f348b0afe94cc93359f929c564c8201a60d585b5907b6bd497369e24 SHA512 0eb51d41996bf42bc896eef53d2e335777c6c6f56fe027581f8b636a57759c98b3f08a5330c9fdeb0054aaa1955024140b161fd19c6457cc66fe68414b1cd8ff AUX qtgui-5.13.2-no-xcb-no-xkbcommon.patch 1327 BLAKE2B d51ed6761d300aec44fc9f1ac86c6f26649fd28f9dfafa0aeb8de4d5b8bb64c46697cfa2089f2a97a22e5cad311c7b372aac12be16c83b3932f2686a240d25c9 SHA512 71433f589554e2fef82d73cf112d7b5d2e2454ec5e3560878d0af05e6721ce4919623175c9355be7c54568da26c68e8c9dfe6cc956465e005b01e3ab974cb310 +AUX qtgui-5.14.0-restore-scaling.patch 1210 BLAKE2B 31bf77f244427b0d77ed6cb0044c72ea6a79162e42bb08a2481b0b38c351b9c595e8f213737553698b09db231e0b5c885e87787bd2530fc4fce23654dcb76223 SHA512 51874cb63f0693df9526dae36aa97abd81c0a349b1e32364251252db93b5c973ee148fcd5bb0b0666cd6a91ba12f5265ec21360c9a7fd2272c44e37d5c8b98df DIST qtbase-everywhere-src-5.12.3.tar.xz 48382148 BLAKE2B 779c43a75403e0f21357a90228bbcc3f216495613f4f17a2f442c7aa93f277a79cc7addf5ae44e22964069580f4932cfd14ba4773aa0ab30405d5587577a545c SHA512 1dab927573eb22b1ae772de3a418f7d3999ea78d6e667a7f2494390dd1f0981ea93f4f892cb6e124ac18812c780ee71da3021b485c61eaf1ef2234a5c12b7fe2 DIST qtbase-everywhere-src-5.12.5.tar.xz 48463288 BLAKE2B db394becd1c0c2be9f86658f58dbadb5e3b81af82edf2e8b69652a8587a2aa30f481774fa20d55ce7e8b9cc158dedd343dc3964e4ff0bcf111e8c4feceb27e0a SHA512 9a95060318cadfcd6dace6b28353fa868a8dcfe9def0bd884edf7d9f72606bae625de0269323a94b81d594a6c398106c266304106329b79c7dae4e5b88269660 DIST qtbase-everywhere-src-5.13.2.tar.xz 48735704 BLAKE2B 50b8d69212602427b76dce6efefb9195e91e4bf5a09b732e564b66a4e27cfaf193fd860139b2c4cc774b0b1132af1426b79e381fb42eafd506239096bd87837e SHA512 b00ad017cc95876698615fd6e41c6ade366146c1f7057e1925bc1b72918f091aa39aa6bf0ea450fc6cd4d8f9810b228770d981dcb6cbe8ad30abb2c42804a204 @@ -8,4 +9,5 @@ EBUILD qtgui-5.12.3-r1.ebuild 3707 BLAKE2B b73f820eded407365f5cb7d3a0938dd938a8e EBUILD qtgui-5.12.5.ebuild 3792 BLAKE2B 865e36e7dc7c5686bdcea6005063b83d8489291e5541b93d53b2ce8b66f2120f5c6e7c9b773c6edfbdcf7759bf11071252ee0a889eae7eae05f88a6a3f971c85 SHA512 279f7cbd934cea6fa8e6230a6407eb264212178c43617536f720074e02cf2a55aeab533544e2649ae067147074a28775707efba8e268a0f6bb0ff6a13b02e719 EBUILD qtgui-5.13.2.ebuild 3851 BLAKE2B ed81578d7ec0459dd2d55d7b9236a14ade1cac2ceee5b046d7010327fbb09437dad1f2603bbccd8fee0bf42f51e6d0e0e40f05c73b9558e20cfbb8a25f7b96ac SHA512 2d66bc1a4f942d8d425cbb90937d081aa58cd704075ddcd220cec91933e1942e2cd6bdc688bee82d284bb3b672e6668b18c40daaa334d29e93fa242e1a79d749 EBUILD qtgui-5.14.0-r1.ebuild 4111 BLAKE2B 978a7d785a9e7ca67782b5e22bc892e56ef5b8f888d2c014d37770c88582cace01128d65917958633e329f6ab04e97f0b049385a8d8cf47fa1ab73e4422e2b7d SHA512 de76c010cf14b1663283c6242ae750bbd6b0492176f7f651d6fa1bfb185ba0518b032b303c6aa6c1602e4cb98819186c6fd489321c7b1924893c7bced57ef7a5 +EBUILD qtgui-5.14.0-r2.ebuild 4181 BLAKE2B ffac194264e284458686143ad8ec8136b52bf39033815343650d84d2b7b855ac1b3519e216f78f45bdab39f39fc9b3592293091ce11fdd67e5f8856bd66b4d54 SHA512 5ef16ffece81c1a6a70bcc11ea12316373be9c0023e34500bf9454439f0b40c5d8502a337fc706216f774f7026f67c4cff6dc37b19eed55569890f7211a3386d MISC metadata.xml 1322 BLAKE2B b6161b568e3a4c34a8fce62a8cce9e1bd7cabbc0d2d2baa0e5e41295974b877d59adff4983b731bb359040f3662999a7915a1527bedeca9de09eb702541d1ae7 SHA512 dcfcdc8f5622e5d6b8488f07b6de62aae829b564ecdb9fb8b9f273bc2593c312f5265849bb3d2175d0ab468977ac2afb8099519cfb66224d8e5df0efec01ae4a diff --git a/dev-qt/qtgui/files/qtgui-5.14.0-restore-scaling.patch b/dev-qt/qtgui/files/qtgui-5.14.0-restore-scaling.patch new file mode 100644 index 000000000000..5fc047aa7ec0 --- /dev/null +++ b/dev-qt/qtgui/files/qtgui-5.14.0-restore-scaling.patch @@ -0,0 +1,34 @@ +From b31852c4caa36cc564e25adbdacfa534e1dfe7c0 Mon Sep 17 00:00:00 2001 +From: =?utf8?q?Morten=20Johan=20S=C3=B8rvig?= <morten.sorvig@qt.io> +Date: Mon, 13 Jan 2020 14:48:32 +0100 +Subject: [PATCH] Restore QHighDPIScaling::isActive() 5.13 behavior + +In 5.13, isActive() would become true only if there +was a scale factor >1 present. This was accidentally +changed in 5.14, where isActive() becomes true whenever +e.g. AA_EneableHighDpiScaling is set, no matter the actual +scale factor values. + +Change-Id: Iacbe2010cddbc3b9015ac24004ae2fe417d4f434 +Fixes: QTBUG-80967 +Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> +--- + src/gui/kernel/qhighdpiscaling.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/gui/kernel/qhighdpiscaling.cpp b/src/gui/kernel/qhighdpiscaling.cpp +index fde6bb0180b..671c2d93ef6 100644 +--- a/src/gui/kernel/qhighdpiscaling.cpp ++++ b/src/gui/kernel/qhighdpiscaling.cpp +@@ -535,7 +535,7 @@ void QHighDpiScaling::updateHighDpiScaling() + ++i; + } + } +- m_active = m_globalScalingActive || m_screenFactorSet || m_usePixelDensity; ++ m_active = m_globalScalingActive || m_screenFactorSet || m_pixelDensityScalingActive; + } + + /* +-- +2.16.3 + diff --git a/dev-qt/qtgui/qtgui-5.14.0-r2.ebuild b/dev-qt/qtgui/qtgui-5.14.0-r2.ebuild new file mode 100644 index 000000000000..1f814dd0fe50 --- /dev/null +++ b/dev-qt/qtgui/qtgui-5.14.0-r2.ebuild @@ -0,0 +1,187 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +QT5_MODULE="qtbase" +inherit qt5-build + +DESCRIPTION="The GUI module and platform plugins for the Qt5 framework" + +if [[ ${QT5_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" +fi + +# TODO: linuxfb + +IUSE="accessibility dbus egl eglfs evdev +gif gles2 ibus + jpeg +libinput +png tslib tuio +udev vnc wayland +xcb" +REQUIRED_USE=" + || ( eglfs xcb ) + accessibility? ( dbus xcb ) + eglfs? ( egl ) + ibus? ( dbus ) + libinput? ( udev ) + xcb? ( gles2? ( egl ) ) +" + +COMMON_DEPEND=" + dev-libs/glib:2 + ~dev-qt/qtcore-${PV} + dev-util/gtk-update-icon-cache + media-libs/fontconfig + >=media-libs/freetype-2.6.1:2 + >=media-libs/harfbuzz-1.6.0:= + sys-libs/zlib:= + virtual/opengl + dbus? ( ~dev-qt/qtdbus-${PV} ) + egl? ( media-libs/mesa[egl] ) + eglfs? ( + media-libs/mesa[gbm] + x11-libs/libdrm + ) + evdev? ( sys-libs/mtdev ) + gles2? ( media-libs/mesa[gles2] ) + jpeg? ( virtual/jpeg:0 ) + libinput? ( + dev-libs/libinput:= + >=x11-libs/libxkbcommon-0.5.0 + ) + png? ( media-libs/libpng:0= ) + tslib? ( >=x11-libs/tslib-1.21 ) + tuio? ( ~dev-qt/qtnetwork-${PV} ) + udev? ( virtual/libudev:= ) + vnc? ( ~dev-qt/qtnetwork-${PV} ) + xcb? ( + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + >=x11-libs/libxcb-1.12:=[xkb] + >=x11-libs/libxkbcommon-0.5.0[X] + x11-libs/xcb-util-image + x11-libs/xcb-util-keysyms + x11-libs/xcb-util-renderutil + x11-libs/xcb-util-wm + ) +" +DEPEND="${COMMON_DEPEND} + evdev? ( sys-kernel/linux-headers ) + udev? ( sys-kernel/linux-headers ) +" +# bug 703306, _populate_Gui_plugin_properties breaks installed cmake modules +RDEPEND="${COMMON_DEPEND} + !<dev-qt/qtimageformats-5.14.0:5 + !<dev-qt/qtsvg-5.14.0:5 + !<dev-qt/qtvirtualkeyboard-5.14.0:5 + !<dev-qt/qtwayland-5.14.0:5 +" +PDEPEND=" + ibus? ( app-i18n/ibus ) + wayland? ( ~dev-qt/qtwayland-${PV} ) +" + +QT5_TARGET_SUBDIRS=( + src/tools/qvkgen + src/gui + src/openglextensions + src/platformheaders + src/platformsupport + src/plugins/generic + src/plugins/imageformats + src/plugins/platforms + src/plugins/platforminputcontexts +) + +QT5_GENTOO_CONFIG=( + accessibility:accessibility-atspi-bridge + egl:egl: + eglfs:eglfs: + eglfs:eglfs_egldevice: + eglfs:eglfs_gbm: + evdev:evdev: + evdev:mtdev: + :fontconfig: + :system-freetype:FREETYPE + !:no-freetype: + !gif:no-gif: + gles2::OPENGL_ES + gles2:opengles2:OPENGL_ES_2 + !:no-gui: + :system-harfbuzz: + !:no-harfbuzz: + jpeg:system-jpeg:IMAGEFORMAT_JPEG + !jpeg:no-jpeg: + libinput + libinput:xkbcommon: + :opengl + png:png: + png:system-png:IMAGEFORMAT_PNG + !png:no-png: + tslib:tslib: + udev:libudev: + xcb:xcb: + xcb:xcb-glx: + xcb:xcb-plugin: + xcb:xcb-render: + xcb:xcb-sm: + xcb:xcb-xlib: + xcb:xcb-xinput: +) + +QT5_GENTOO_PRIVATE_CONFIG=( + :gui +) + +PATCHES=( + "${FILESDIR}/qt-5.12-gcc-avx2.patch" # bug 672946 + "${FILESDIR}/${PN}-5.13.2-no-xcb-no-xkbcommon.patch" # bug 699110 + "${FILESDIR}/${P}-restore-scaling.patch" # QTBUG-80967, in Qt 5.14.1 +) + +src_prepare() { + # don't add -O3 to CXXFLAGS, bug 549140 + sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/gui/gui.pro || die + + # egl_x11 is activated when both egl and xcb are enabled + use egl && QT5_GENTOO_CONFIG+=(xcb:egl_x11:) || QT5_GENTOO_CONFIG+=(egl:egl_x11:) + + qt_use_disable_config dbus dbus \ + src/platformsupport/themes/genericunix/genericunix.pri + + qt_use_disable_config tuio tuiotouch src/plugins/generic/generic.pro + + qt_use_disable_mod ibus dbus \ + src/plugins/platforminputcontexts/platforminputcontexts.pro + + use vnc || sed -i -e '/SUBDIRS += vnc/d' \ + src/plugins/platforms/platforms.pro || die + + qt5-build_src_prepare +} + +src_configure() { + local myconf=( + $(usex dbus -dbus-linked '') + $(qt_use egl) + $(qt_use eglfs) + $(usex eglfs '-gbm -kms' '') + $(qt_use evdev) + $(qt_use evdev mtdev) + -fontconfig + -system-freetype + $(usex gif '' -no-gif) + -gui + -system-harfbuzz + $(qt_use jpeg libjpeg system) + $(qt_use libinput) + -opengl $(usex gles2 es2 desktop) + $(qt_use png libpng system) + $(qt_use tslib) + $(qt_use udev libudev) + $(qt_use xcb xcb system) + $(usex xcb '-xcb-xlib -xcb-xinput -xkb' '') + ) + if use libinput || use xcb; then + myconf+=( -xkbcommon ) + fi + qt5-build_src_configure +} diff --git a/dev-qt/qtsvg/Manifest b/dev-qt/qtsvg/Manifest index 4ffc1a508b64..be56fd9c956b 100644 --- a/dev-qt/qtsvg/Manifest +++ b/dev-qt/qtsvg/Manifest @@ -1,3 +1,4 @@ +AUX qtsvg-5.14.0-revert-keep-aspectratio.patch 4104 BLAKE2B f447969d89147457ad577dcbd5e67b3dd59ad0a47b63f97f0d10d060708953cfb3bd5567d8b9f53cb6514ed006fb6b950f38a353f6a66bcfc23b748eb8af0934 SHA512 100003b8c2df0c40d54d8a62c84c976e9c071c6a7795ba91f12630df0377ba2772836db7694f5371b87f6091f30708f493529634cc938968ae019bd8369b8631 DIST qtsvg-everywhere-src-5.12.3.tar.xz 1859680 BLAKE2B 9ee0a2dbde09ef19fc72285f5ec9b865fd65c23bbecc4fcc8969a5f84bbe31818a086e066f32873e0cfd82aaab4a077660eabd2cbcc7494e84949c64b4a99740 SHA512 23517dbdc30d7128fcbeb12a301eeeb300424bb17bc0d156d5e9298c092d3d3afd2cba45768f2512e58977ee2408450f50c385e03a47ccaf3ff6bc7e4fddf61a DIST qtsvg-everywhere-src-5.12.5.tar.xz 1860340 BLAKE2B 51162f36eb7a645d5670f4d425596fa4fe96d5149833074ab1147ccb0b6ad603cf00a45b116f09beb1c692c071248c5a425aa3f4948e0dc4af4ba131537b795d SHA512 3d7f89d106b36c8a0fd04c6e6f0ccde0c50ced7192980ea7d9330ba73d9307559e60ed2b10c28481a419d19aaae6609bde9e1dd74ccedf340dacf0194a60429d DIST qtsvg-everywhere-src-5.13.2.tar.xz 1890380 BLAKE2B 7b15ea615afe387e39ef4aec60489319230447abe560bbe2ce5dcc283a6ed6d49a44971306baf51791ac910feb25896324d48a21ff3a85ffa4a480354c077ceb SHA512 fbe2df9e8756c8982c0e91c0d0356e50dd22d898087dfd028dfa6ed363ea18e1ddce5d5838d705e2d31509d1d823ccddcaf5f8916c587919e10a39ae04ee0090 @@ -5,5 +6,5 @@ DIST qtsvg-everywhere-src-5.14.0.tar.xz 1865488 BLAKE2B 2d0510907c0592e688896d4e EBUILD qtsvg-5.12.3.ebuild 451 BLAKE2B 4fec4a1db6e4f9356b6694af96026bd63da867159d3719cdae73189ee84838d50c75a46471fd0061f534c8409a743585fce87fddbd114a560dc780a89454d95e SHA512 a9d56575038000380c279bcb598cdb34c135c1c73769a4052c3c50cbf56486dd4086e08e3a877c6179edc268f4d37b619bead08921a62ddfc47289028cfe8474 EBUILD qtsvg-5.12.5.ebuild 454 BLAKE2B d5f7aef3f4373c51d3af0ddddc84d6b5c64c77778734a3ceffac5982ebdf17ebe625970ddd24322cf490b801f654cac4ef9d6313072c6586597d0e774444b152 SHA512 36e3a8ce8869e8b617683e40ddf0031416fc039748c3211c692106e9b84507b99495d2a699b12a9e759d992b5343dc27f4647973f960d8234b62810a5a03b321 EBUILD qtsvg-5.13.2.ebuild 453 BLAKE2B 6d36a6e147c6196645b4e03b92ce44e8032b11527eb28d4852b495451821521335e81c41adf1ed1df0c1d515ebf21b33d3abba92916abcb16ff72f9d98e1e3f0 SHA512 753f690f89d442cc04ecc07c89cd5d1f486d68eff71c65a0a9f5b379573d5e1830d7398e488203d2deef6dde309cf006c9820f3bd1edaeaf502aa60f0bd472ab -EBUILD qtsvg-5.14.0.ebuild 457 BLAKE2B 6560ce0d4b6302d76a804f9da6bec07ccd76052786e1d809c17fe4fc2fb8b1c082a0a3911ec984035045a09c69a21affab1f0bc1e63ec9319cfaa822061f955e SHA512 2678e34b30a855eb56fbb863ba3f5945a322aece8bbcd983b7b2989e4cf9c514d0669e2bf9aee45b08fff27d8f320d2cc72653803ca272b68596386fbc59c75f +EBUILD qtsvg-5.14.0-r1.ebuild 533 BLAKE2B b034c1466db0b54a09f4858d775280cb3bc12ca695ed1a94c7c863ccce4871e19c6d8cbff58afe6bd8683bebd70994d2a55265257ed5cb5878696fd51ebc8bbf SHA512 57e9caa099ba165ae5ebbcc2bf3804608824e1bc67a793c4be28cc36498adc442c8f5e712b7263f2322c2734b25bbb29e8789e221992c04397f727238efa5944 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f 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 new file mode 100644 index 000000000000..589492ca6bab --- /dev/null +++ b/dev-qt/qtsvg/files/qtsvg-5.14.0-revert-keep-aspectratio.patch @@ -0,0 +1,85 @@ +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.ebuild b/dev-qt/qtsvg/qtsvg-5.14.0-r1.ebuild index f143da2e4881..4716b5e4790f 100644 --- a/dev-qt/qtsvg/qtsvg-5.14.0.ebuild +++ b/dev-qt/qtsvg/qtsvg-5.14.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -21,3 +21,5 @@ RDEPEND=" DEPEND="${RDEPEND} test? ( ~dev-qt/qtxml-${PV} ) " + +PATCHES=( "${FILESDIR}/${P}-revert-keep-aspectratio.patch" ) # QTBUG-81259 |