From de49812990871e1705b64051c35161d5e6400269 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 24 Dec 2018 14:11:38 +0000 Subject: gentoo resync : 24.12.2018 --- dev-qt/qtdeclarative/Manifest | 9 +-- .../qtdeclarative-5.9.5-texture-memleak.patch | 59 -------------------- dev-qt/qtdeclarative/qtdeclarative-5.11.1.ebuild | 2 +- dev-qt/qtdeclarative/qtdeclarative-5.11.2.ebuild | 64 ---------------------- dev-qt/qtdeclarative/qtdeclarative-5.11.3.ebuild | 64 ++++++++++++++++++++++ dev-qt/qtdeclarative/qtdeclarative-5.9.6.ebuild | 58 -------------------- 6 files changed, 68 insertions(+), 188 deletions(-) delete mode 100644 dev-qt/qtdeclarative/files/qtdeclarative-5.9.5-texture-memleak.patch delete mode 100644 dev-qt/qtdeclarative/qtdeclarative-5.11.2.ebuild create mode 100644 dev-qt/qtdeclarative/qtdeclarative-5.11.3.ebuild delete mode 100644 dev-qt/qtdeclarative/qtdeclarative-5.9.6.ebuild (limited to 'dev-qt/qtdeclarative') diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest index cbd46a4be89d..b7fe05689d89 100644 --- a/dev-qt/qtdeclarative/Manifest +++ b/dev-qt/qtdeclarative/Manifest @@ -1,9 +1,6 @@ AUX qtdeclarative-5.4.2-disable-jit.patch 547 BLAKE2B 3f9cc85ab9ec7c2b79aad8bcbfe541ba51745f62e3f02111a2f455c6d1a7959c7980284e3a655ce8335d4a166d65570f2b9d236c681d155c015cc14dc3bb54af SHA512 cd410c0e731a1e096bd8a77b7ecc769a5e3503f7a2f12668f2f4f1c3099973eaa2060d97708962e422c580ee76ee3db3712834cd994b7e1aeeb57c0a4c3b0b3d -AUX qtdeclarative-5.9.5-texture-memleak.patch 2199 BLAKE2B 7b0f531e095fd80731983faf106811ef32d38ce83c2bb595683203d81d671d105720c6ee840740c4c30b0027c52825844bd1fe60a7ab52499feb2699ada92729 SHA512 20c83cd85120475fcec31c6394c149ab6d271f8f4856cd9da60346faebb67e3b119001fc3b0cbfd3f198f5237c4330e878d68d530f859192b6dd9560d7a949e5 DIST qtdeclarative-everywhere-src-5.11.1.tar.xz 22203488 BLAKE2B 3304d5f1982380da6a82db9dee9782c7214fd307059055c9f42754b70cc760f9931357f5b9b4fc28bf5f6c799659d927f270ad154d43e91b28592465d7eac386 SHA512 d4252f58fcc811273b1a51f80167bca19f744d70c47362b631bbb7875473a808402d64b26475e2f5ff1813d8b8cc66b81cac1b8a4b5e36f7ca1fdbb15666f053 -DIST qtdeclarative-everywhere-src-5.11.2.tar.xz 22217460 BLAKE2B 91a5619aeb09bc98dbe9c9ddc5e00b65d5cc9aac9f2d40f7e4a7001bbd2a1806a640e2a30d7de8698513b54b67d5bd4b551654ea119ecffa27cd91f3dba9327b SHA512 30d3ddfabceaf48666cb5ebc5c3a25318152daeed599b1a0a1b3c2feff353708de4760472babbe55a685582c0640a2789fa2fa239d151d17fe2b36950836f7ee -DIST qtdeclarative-opensource-src-5.9.6.tar.xz 21417200 BLAKE2B 25d62058d85f845eb8a61ed949f7f3b2af972c0d3e97e4fe24b309fcc9570b5a00716bad012fca4cb8f65858b4aa7afb735181270be32e6a7bbe126d6a5931e4 SHA512 1fc7a542c60e8c13ba9b791d7b83a916fc1ffb1d3ab505405055a13d597a2c406f29bbd9309603af5bf56492874efeee33ab0128af1fa44866d66d689147ac39 -EBUILD qtdeclarative-5.11.1.ebuild 1410 BLAKE2B e8b8f4709e85a283717b67844724a143529774ef173af538952c162925dc44a5a1e3b7c563d4ebe5b4c3f70a5db5fec2a81767d7ca1fc7acf24fb102a0fa56c7 SHA512 658e20956e049df0fb0e0738cd025e5d0caadf5683f6070c7280e7ab0de37cb0ea6bbb62dd7e6395dc78fe5594d31e8cfacaa4dca68dd2b5486d8d4eb93498f8 -EBUILD qtdeclarative-5.11.2.ebuild 1412 BLAKE2B 45f629e505ef268c5e296edb07694e34598c4f17b935acdc1696a25f95493910760083b3378dec25ad0f3f20b15560a4d9f6c8c90ecba366ef333ea7a4552cc1 SHA512 4ab1b083ed4b9dbcced35d66f81a04792a1342ec8cfefeb61e46591293bf46774d3d3d5c11901a2cd9dfca0a862a761385ed80cf42f84df67619e2bc8c5f6c4a -EBUILD qtdeclarative-5.9.6.ebuild 1391 BLAKE2B 19044927b073a5f22b05ab071d1c33299503a16532884987a1b7f1ebe42de240cb13d9dde9022e689bbc76a16c7e5797ec4a9f7458f0020fe3235531b4a81bbc SHA512 4af1771d4bc4886fa2361eb65be5711f7133d9e5a1e4f9b9394690f3ddd9b0945042d93b17a08531f64297afe154535c139264300f173d1c75bde8b0c4a5598b +DIST qtdeclarative-everywhere-src-5.11.3.tar.xz 22233024 BLAKE2B e443e578091f6f2154f4dda4384b07ff510f92757e113f07e1a6cc9a95caf6dc7994b72b8816e8fb03893ed8180058ae887031af880218e43758b49c397f58e4 SHA512 07d440b10ba2fbd700a191791cb6991fb9ce72c78787340e7f564bdb2bef24b035e15fe2aecd36d58f8794e56bd0aa35d28b350a73707e27748e54d46609e1a0 +EBUILD qtdeclarative-5.11.1.ebuild 1408 BLAKE2B 4eada134a4434034fa24aff60d0f3fbcc50e7fb9b5573420acfe38d611fc14fcea58790d3deb568b5ab262b16d97ebc9d24f6c0a3c60037e5a168e4276b3ad33 SHA512 2b0568144286812f6b7ac1a9267c1f2e946c0adb35ac74562333189ee8cce34435481a0e5def6e4d17a93257b26c71057cb38efb6fcd3e1e67de363d54557c78 +EBUILD qtdeclarative-5.11.3.ebuild 1414 BLAKE2B 41c13dbd30089ce055583b5c4f1efa404eb6be11faf288b7e12d6bbcf53b98dfc592ee3f2e5db670105536bf5d2be4d1c74aedbdbee18e948f826e5534a1e4a7 SHA512 7558d871cc6cb9316d7bed96192ce0a02618411a8e7bb96014c639ffbe2022ef0d619bc4f31a3dcf6fa023c8cc92857e8c203317649495042efffe8840b88aad MISC metadata.xml 811 BLAKE2B aca4ded12a2034fb5964d6c38806edeb1b2b984c182fe6ae5cf26f28db3ffa8cc942e8354971e46d7bd6f8eef600fe52ef3e0cdb5cb2aef7c7fe616fbc81d712 SHA512 0e278f92094bfc3d7a295cf559178ff093f5ff6776f03037cc9cb4e8574c9298c76f6210f84e611c8cf1c6c063cfd78f8d0c478f30798fc775d7bedcc409c711 diff --git a/dev-qt/qtdeclarative/files/qtdeclarative-5.9.5-texture-memleak.patch b/dev-qt/qtdeclarative/files/qtdeclarative-5.9.5-texture-memleak.patch deleted file mode 100644 index c2a143ecbeda..000000000000 --- a/dev-qt/qtdeclarative/files/qtdeclarative-5.9.5-texture-memleak.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 839f09c65523fb5c419b62e078f72bb39285449a Mon Sep 17 00:00:00 2001 -From: David Edmundson -Date: Wed, 28 Mar 2018 00:24:56 +0100 -Subject: [PATCH] Avoid marking hidden windows as updatePending in Gui render - loop - -Since eeb320bbd8763f3e72f79369cc3908e999a0da3c the GL context only -deletes textures when all windows with pending updates have finished -rendering. - -renderWindow will not process any window that is not visible. This -leaves a logic bug that we can have the updatePending flag set but -never cleared. - -If we have two windows, this leaves the other window still updating -normally, but lastDirtyWindow will always be false and we never call -endSync. - -This results in an effective memory leak of all textures. - -This patch resets the flag on hide() a move that can be considered safe -given the show() method will reset this flag anyway. - -Change-Id: Iab0171716e27e31077a66b5e36a00bf28a2e7a8c -Reviewed-by: Kai Uwe Broulik -Reviewed-by: Qt CI Bot -Reviewed-by: Dominik Holland -Reviewed-by: Aleix Pol -Reviewed-by: Andy Nichols ---- - src/quick/scenegraph/qsgrenderloop.cpp | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/src/quick/scenegraph/qsgrenderloop.cpp b/src/quick/scenegraph/qsgrenderloop.cpp -index 60f3538662..2eaed497ef 100644 ---- a/src/quick/scenegraph/qsgrenderloop.cpp -+++ b/src/quick/scenegraph/qsgrenderloop.cpp -@@ -305,6 +305,8 @@ void QSGGuiThreadRenderLoop::hide(QQuickWindow *window) - { - QQuickWindowPrivate *cd = QQuickWindowPrivate::get(window); - cd->fireAboutToStop(); -+ if (m_windows.contains(window)) -+ m_windows[window].updatePending = false; - } - - void QSGGuiThreadRenderLoop::windowDestroyed(QQuickWindow *window) -@@ -494,7 +496,8 @@ QImage QSGGuiThreadRenderLoop::grab(QQuickWindow *window) - - void QSGGuiThreadRenderLoop::maybeUpdate(QQuickWindow *window) - { -- if (!m_windows.contains(window)) -+ QQuickWindowPrivate *cd = QQuickWindowPrivate::get(window); -+ if (!cd->isRenderable() || !m_windows.contains(window)) - return; - - m_windows[window].updatePending = true; --- -2.16.3 - diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.11.1.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.11.1.ebuild index e9a3916454fe..81afe9dc24bb 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.11.1.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.11.1.ebuild @@ -8,7 +8,7 @@ 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 x86 ~amd64-fbsd" + KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-fbsd" fi IUSE="gles2 +jit localstorage +widgets xml" diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.11.2.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.11.2.ebuild deleted file mode 100644 index 325ae743da16..000000000000 --- a/dev-qt/qtdeclarative/qtdeclarative-5.11.2.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) -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 ~x86 ~amd64-fbsd" -fi - -IUSE="gles2 +jit localstorage +widgets xml" - -# qtgui[gles2=] is needed because of bug 504322 -COMMON_DEPEND=" - ~dev-qt/qtcore-${PV} - ~dev-qt/qtgui-${PV}[gles2=] - ~dev-qt/qtnetwork-${PV} - ~dev-qt/qttest-${PV} - localstorage? ( ~dev-qt/qtsql-${PV} ) - widgets? ( ~dev-qt/qtwidgets-${PV}[gles2=] ) - xml? ( - ~dev-qt/qtnetwork-${PV} - ~dev-qt/qtxmlpatterns-${PV} - ) -" -DEPEND="${COMMON_DEPEND} - ${PYTHON_DEPS} -" -RDEPEND="${COMMON_DEPEND} - !