From d934827bf44b7cfcf6711964418148fa60877668 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 25 Nov 2020 22:39:15 +0000 Subject: gentoo resync : 25.11.2020 --- dev-qt/qtdeclarative/Manifest | 6 +- ....2-QQuickMouseArea-stuck-in-pressed-state.patch | 55 ------------------- ...ative-5.14.2-fix-subpixel-positioned-text.patch | 64 ---------------------- .../qtdeclarative/qtdeclarative-5.14.2-r4.ebuild | 59 -------------------- dev-qt/qtdeclarative/qtdeclarative-5.15.1.ebuild | 2 +- 5 files changed, 2 insertions(+), 184 deletions(-) delete mode 100644 dev-qt/qtdeclarative/files/qtdeclarative-5.14.2-QQuickMouseArea-stuck-in-pressed-state.patch delete mode 100644 dev-qt/qtdeclarative/files/qtdeclarative-5.14.2-fix-subpixel-positioned-text.patch delete mode 100644 dev-qt/qtdeclarative/qtdeclarative-5.14.2-r4.ebuild (limited to 'dev-qt/qtdeclarative') diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest index 0093a69440d1..6aff20287627 100644 --- a/dev-qt/qtdeclarative/Manifest +++ b/dev-qt/qtdeclarative/Manifest @@ -1,9 +1,5 @@ AUX qtdeclarative-5.14.2-QQuickItemView-fix-maxXY-extent.patch 1566 BLAKE2B b6436c9be0a7de092635e1fc3999c3142fc3e916cbcc69f472691bbd559f611b4d5741f3627c47162a5ac86126382507add72a25a121235e856b1de802ee19be SHA512 dd5193f8d8a051238dabf63306cc77e3a5696fc12241c27f35cadfd30763ddfeb2af7d640849dcc7a810b7087173b8e9af17341ea1b68440906f2c2f1f96fee3 -AUX qtdeclarative-5.14.2-QQuickMouseArea-stuck-in-pressed-state.patch 2326 BLAKE2B 5e611e7f2700743deee7d930fff129f525af54c2e3d6e53dd84a50c989e30046f970989f01a60379473e6626c8f4e0c99a6c4b645a986133ea519e944d173168 SHA512 6b6155fd82edd8d20e2e43b3f9c9294d091ef011b49024994a5a6b78fb536e632f923a981859013969b7d1cbdb86a16bec9f9e3f0f8db26cc4f24847ec6c338e -AUX qtdeclarative-5.14.2-fix-subpixel-positioned-text.patch 3141 BLAKE2B 98aa28237d08909005267ff585b8112f1349f9f14e71bf505b84abbc38bc77fc1fb7c5a4588ff173df71223bfb842aed44283ac153b19f5cc6967fa4a3c275e4 SHA512 245097ed63bfe8f1cf3c4ec82a30757131a76b7ac9c47251044ca44822a2dbd8c5958f87cbc78f0196a67498f0cbbe03b7c15519fc55136e7ccb6f181a342b5f AUX qtdeclarative-5.4.2-disable-jit.patch 547 BLAKE2B 3f9cc85ab9ec7c2b79aad8bcbfe541ba51745f62e3f02111a2f455c6d1a7959c7980284e3a655ce8335d4a166d65570f2b9d236c681d155c015cc14dc3bb54af SHA512 cd410c0e731a1e096bd8a77b7ecc769a5e3503f7a2f12668f2f4f1c3099973eaa2060d97708962e422c580ee76ee3db3712834cd994b7e1aeeb57c0a4c3b0b3d -DIST qtdeclarative-everywhere-src-5.14.2.tar.xz 21305980 BLAKE2B 0ccbae8ddc46f4891af6732a4b3cf874c523c7ded5a06f78c7c5cd290fef8e32ad6efe5dcffe947024144128ab2f1108594e4a30da9ca79e1ce3008c73ca2a25 SHA512 48d3a547237514a8bdc2a4c0b3f97732abceacece0e0899d2f33787293eb99f54c28efce35a34b8c46dcd4d78ebbc88bfc820bc68496076eacace40aaceee004 DIST qtdeclarative-everywhere-src-5.15.1.tar.xz 21558724 BLAKE2B 15da5471799e461e5f5983fb0d947cad9d635a1bb0760da0b709f273ba9a9846df442f424d2009e857d831695d14a92c9be941270a07dc0f33cc46382ba44e6f SHA512 193ec706b764330a2ae00614b13482b7586642f9cfd32458e8c975daa07ba25f0f9887de0918c4034f52f613b860677c09c46a3b7d07d4229446cfc0805bcccd -EBUILD qtdeclarative-5.14.2-r4.ebuild 1420 BLAKE2B 68e9ad656186ac04da20d3f58428c93a8acf8a1282e1cce360d9807775ff1ae88f41d465af1787069d9399b072d85037c0d8d48699a768f36f1557548020fd6f SHA512 f3d46152bcd7443c308899d5c09b6374b67a6486060c0b37d395efbd3eaba2914daad2f46b25f3f32d4920731767358e00ce1afcb82117015c4f2fedf63e3ee5 -EBUILD qtdeclarative-5.15.1.ebuild 1286 BLAKE2B 0f2c83d2a4c097f9be3f2648806f7b6abee9ff0f5255f344f875e89037f079f22292c3f487c792848d4b69f411ab48e5d73628f862f3728f34f7f95598ff2227 SHA512 9d8458473f79e7a58739b115e854a62904d4557d23c8be5f8fd80e3e9061d1aaee5146f074bc05c6c4921adcecb5377e972d14f1ba0d62aa803fad2b433618b5 +EBUILD qtdeclarative-5.15.1.ebuild 1280 BLAKE2B 87beb6e2d2b9f39a8288930b7d13f5602cf8df6b74db037cbd03c336613496baffbc27899d93ff9671ad5bc95dc72bfe9725b44d68ed17ccc816dceec476cfca SHA512 7e3c5e12364f6e0c3110ad6039080fbc1b88a0285997eeecaae2dafbf73bff2791a5eb41c880b323e25f10cb5f7a91f014dc89e240636dc835d6e78822bb414a MISC metadata.xml 700 BLAKE2B 80c5bfdd7c6acd05795c20b36d062b76458fc4b3f83835eef83ed2f304e70dbae9dfe81908bf33e41fd944de4cc754e5f839451cf4c8ef4f06063817730b7cf6 SHA512 f1fbc57d96dc5b481d08da8c73ab9d1e183045ecefeb075a7ee8f1d6733583589077e3650ad5b2d52e4cafc67bf0894ae62fd4500e1974053e46d6a89377f3fd diff --git a/dev-qt/qtdeclarative/files/qtdeclarative-5.14.2-QQuickMouseArea-stuck-in-pressed-state.patch b/dev-qt/qtdeclarative/files/qtdeclarative-5.14.2-QQuickMouseArea-stuck-in-pressed-state.patch deleted file mode 100644 index 1dd0ff1155de..000000000000 --- a/dev-qt/qtdeclarative/files/qtdeclarative-5.14.2-QQuickMouseArea-stuck-in-pressed-state.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 8ace780b5aa298e3c01903bfd57f766a42209191 Mon Sep 17 00:00:00 2001 -From: Frederik Gladhorn -Date: Sat, 28 Mar 2020 15:14:41 +0100 -Subject: [PATCH] Fix QQuickMouseArea getting stuck in pressed state when - hiding in press -MIME-Version: 1.0 -Content-Type: text/plain; charset=utf8 -Content-Transfer-Encoding: 8bit - -In 78c1fcbc49f56463064eef738a475d9018357b24 we stopped giving the -exclusive grab to hidden or disabled items with is good. But the change -did not take into consideration how mouse area handles its internal -state. - -As a simple example: A mouse area that would set itself hiddin in the -press handler, would continue to have d->pressed == true, which means it -would not react to any future press events. - -The fix is to let mouse area check in its change handler whether it has -become invisible. -The test also checks that enabled behaves the same way. There is no -action needed, since mouse area does completely custom handling of -enabled (maybe something to fix in Qt 6), disabling a mouse area doesn't -disable its children for example, it doesn't invoke -QQuickItem::setEnabled at all. Due to this circumventing the common -behavior, by chance disabling a mouse area in the on pressed handler -works. - -Fixes: QTBUG-74987 -Change-Id: Idb8499b3e5bcb744fbba203fdea5c46695bd5077 -Reviewed-by: Jan Arve Sæther ---- - src/quick/items/qquickmousearea.cpp | 6 ++++ - 3 files changed, 80 insertions(+) - create mode 100644 tests/auto/quick/qquickmousearea/data/settingHiddenInPressUngrabs.qml - -diff --git a/src/quick/items/qquickmousearea.cpp b/src/quick/items/qquickmousearea.cpp -index 368379f5c40..dc60712a9cd 100644 ---- a/src/quick/items/qquickmousearea.cpp -+++ b/src/quick/items/qquickmousearea.cpp -@@ -1083,6 +1083,12 @@ void QQuickMouseArea::itemChange(ItemChange change, const ItemChangeData &value) - } - setHovered(!d->hovered); - } -+ if (d->pressed && (!isVisible())) { -+ // This happens when the mouse area sets itself disabled or hidden -+ // inside the press handler. In that case we should not keep the internal -+ // state as pressed, since we never became the mouse grabber. -+ ungrabMouse(); -+ } - break; - default: - break; --- -2.16.3 diff --git a/dev-qt/qtdeclarative/files/qtdeclarative-5.14.2-fix-subpixel-positioned-text.patch b/dev-qt/qtdeclarative/files/qtdeclarative-5.14.2-fix-subpixel-positioned-text.patch deleted file mode 100644 index 23eaa7d5100d..000000000000 --- a/dev-qt/qtdeclarative/files/qtdeclarative-5.14.2-fix-subpixel-positioned-text.patch +++ /dev/null @@ -1,64 +0,0 @@ -From e807f9d1d80559b8ff91f1c3cfdd755b3da56a6d Mon Sep 17 00:00:00 2001 -From: Eskil Abrahamsen Blomfeldt -Date: Tue, 5 May 2020 11:36:24 +0200 -Subject: [PATCH] Fix subpixel positioned text with Text.NativeRendering - -We would be generating subpixel positioned glyphs based on the -relative positions of the glyphs, ignoring the fractional part -contributed by the origin of the text. So if the text origin was -inside a pixel, the subpixel antialiasing would be wrong and we -would see kerning errors. - -This was especially visible when using AlignHCenter on text -with hinting disabled and resizing the item it was aligning to. - -Pick-to: 5.15 -Task-number: QTBUG-49646 -Change-Id: I0e709ba2b5d2440e34c94c6f819befe0a65a113a -Reviewed-by: Lars Knoll -Reviewed-by: Konstantin Ritt ---- - src/quick/scenegraph/qsgdefaultglyphnode_p.cpp | 9 ++++----- - 1 file changed, 4 insertions(+), 5 deletions(-) - -diff --git a/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp b/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp -index cfa645bfd03..f73b64f537f 100644 ---- a/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp -+++ b/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp -@@ -789,11 +789,12 @@ void QSGTextMaskMaterial::populate(const QPointF &p, - const QMargins &margins) - { - Q_ASSERT(m_font.isValid()); -+ QPointF position(p.x(), p.y() - m_font.ascent()); - QVector fixedPointPositions; - const int glyphPositionsSize = glyphPositions.size(); - fixedPointPositions.reserve(glyphPositionsSize); - for (int i=0; i < glyphPositionsSize; ++i) -- fixedPointPositions.append(QFixedPoint::fromPointF(glyphPositions.at(i))); -+ fixedPointPositions.append(QFixedPoint::fromPointF(position + glyphPositions.at(i))); - - QTextureGlyphCache *cache = glyphCache(); - -@@ -815,18 +816,16 @@ void QSGTextMaskMaterial::populate(const QPointF &p, - Q_ASSERT(geometry->sizeOfVertex() == sizeof(QVector4D)); - ushort *ip = geometry->indexDataAsUShort(); - -- QPointF position(p.x(), p.y() - m_font.ascent()); - bool supportsSubPixelPositions = fontD->fontEngine->supportsSubPixelPositions(); - for (int i=0; ifontEngine->subPixelPositionForX(QFixed::fromReal(glyphPositions.at(i).x())); -+ subPixelPosition = fontD->fontEngine->subPixelPositionForX(QFixed::fromReal(glyphPosition.x())); - - QTextureGlyphCache::GlyphAndSubPixelPosition glyph(glyphIndexes.at(i), subPixelPosition); - const QTextureGlyphCache::Coord &c = cache->coords.value(glyph); - -- QPointF glyphPosition = glyphPositions.at(i) + position; -- - // On a retina screen the glyph positions are not pre-scaled (as opposed to - // eg. the raster paint engine). To ensure that we get the same behavior as - // the raster engine (and CoreText itself) when it comes to rounding of the --- -2.16.3 diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.14.2-r4.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.14.2-r4.ebuild deleted file mode 100644 index ee5e2c5a785e..000000000000 --- a/dev-qt/qtdeclarative/qtdeclarative-5.14.2-r4.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 2009-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) -inherit python-any-r1 qt5-build - -DESCRIPTION="The QML and Quick modules for the Qt5 framework" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86" -fi - -IUSE="gles2-only +jit localstorage vulkan +widgets" - -BDEPEND="${PYTHON_DEPS}" -# qtgui[gles2-only=] is needed because of bug 504322 -DEPEND=" - ~dev-qt/qtcore-${PV} - ~dev-qt/qtgui-${PV}:5=[gles2-only=,vulkan=] - ~dev-qt/qtnetwork-${PV} - ~dev-qt/qttest-${PV} - localstorage? ( ~dev-qt/qtsql-${PV} ) - widgets? ( ~dev-qt/qtwidgets-${PV}[gles2-only=] ) -" -RDEPEND="${DEPEND} - !