summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository mirror & CI <repomirrorci@gentoo.org>2018-12-08 18:04:09 +0000
committerRepository mirror & CI <repomirrorci@gentoo.org>2018-12-08 18:04:09 +0000
commitaafdfb5134aac3f9542bd8c08c3b219c081170fa (patch)
tree05cdad02675341fe4e6983ace765f37438f00a57 /dev-qt/qtdeclarative
parent2018-12-08 17:46:02 UTC (diff)
parentx11-misc/makedepend: mark s390 stable (diff)
downloadgentoo-aafdfb5134aac3f9542bd8c08c3b219c081170fa.tar.gz
gentoo-aafdfb5134aac3f9542bd8c08c3b219c081170fa.tar.bz2
gentoo-aafdfb5134aac3f9542bd8c08c3b219c081170fa.zip
Merge updates from master
Diffstat (limited to 'dev-qt/qtdeclarative')
-rw-r--r--dev-qt/qtdeclarative/Manifest2
-rw-r--r--dev-qt/qtdeclarative/files/qtdeclarative-5.9.5-texture-memleak.patch59
-rw-r--r--dev-qt/qtdeclarative/qtdeclarative-5.11.2.ebuild64
-rw-r--r--dev-qt/qtdeclarative/qtdeclarative-5.9.6.ebuild58
4 files changed, 0 insertions, 183 deletions
diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest
index 0845b10c2fb9..e76d57d43a6f 100644
--- a/dev-qt/qtdeclarative/Manifest
+++ b/dev-qt/qtdeclarative/Manifest
@@ -1,4 +1,2 @@
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-everywhere-src-5.11.3.tar.xz 22233024 BLAKE2B e443e578091f6f2154f4dda4384b07ff510f92757e113f07e1a6cc9a95caf6dc7994b72b8816e8fb03893ed8180058ae887031af880218e43758b49c397f58e4 SHA512 07d440b10ba2fbd700a191791cb6991fb9ce72c78787340e7f564bdb2bef24b035e15fe2aecd36d58f8794e56bd0aa35d28b350a73707e27748e54d46609e1a0
-DIST qtdeclarative-opensource-src-5.9.6.tar.xz 21417200 BLAKE2B 25d62058d85f845eb8a61ed949f7f3b2af972c0d3e97e4fe24b309fcc9570b5a00716bad012fca4cb8f65858b4aa7afb735181270be32e6a7bbe126d6a5931e4 SHA512 1fc7a542c60e8c13ba9b791d7b83a916fc1ffb1d3ab505405055a13d597a2c406f29bbd9309603af5bf56492874efeee33ab0128af1fa44866d66d689147ac39
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 <davidedmundson@kde.org>
-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 <kde@privat.broulik.de>
-Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
-Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
-Reviewed-by: Aleix Pol
-Reviewed-by: Andy Nichols <andy.nichols@qt.io>
----
- 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.2.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.11.2.ebuild
deleted file mode 100644
index 8876b08e5c0c..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,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"
-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}
- !<dev-qt/qtquickcontrols-5.7:5
-"
-
-src_prepare() {
- use jit || PATCHES+=("${FILESDIR}/${PN}-5.4.2-disable-jit.patch")
-
- qt_use_disable_mod localstorage sql \
- src/imports/imports.pro
-
- qt_use_disable_mod widgets widgets \
- src/src.pro \
- src/qmltest/qmltest.pro \
- tests/auto/auto.pro \
- tools/tools.pro \
- tools/qmlscene/qmlscene.pro \
- tools/qml/qml.pro
-
- qt_use_disable_mod xml xmlpatterns \
- src/imports/imports.pro \
- tests/auto/quick/quick.pro \
- tests/auto/quick/examples/examples.pro
-
- qt5-build_src_prepare
-}
-
-src_configure() {
- local myqmakeargs=(
- --
- -qml-debug
- )
- qt5-build_src_configure
-}
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.9.6.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.9.6.ebuild
deleted file mode 100644
index 6ad4e5617306..000000000000
--- a/dev-qt/qtdeclarative/qtdeclarative-5.9.6.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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 ~sparc 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}
- !<dev-qt/qtquickcontrols-5.7:5
-"
-
-PATCHES=( "${FILESDIR}/${PN}-5.9.5-texture-memleak.patch" )
-
-src_prepare() {
- use jit || PATCHES+=("${FILESDIR}/${PN}-5.4.2-disable-jit.patch")
-
- qt_use_disable_mod localstorage sql \
- src/imports/imports.pro
-
- qt_use_disable_mod widgets widgets \
- src/src.pro \
- src/qmltest/qmltest.pro \
- tests/auto/auto.pro \
- tools/tools.pro \
- tools/qmlscene/qmlscene.pro \
- tools/qml/qml.pro
-
- qt_use_disable_mod xml xmlpatterns \
- src/imports/imports.pro \
- tests/auto/quick/quick.pro \
- tests/auto/quick/examples/examples.pro
-
- qt5-build_src_prepare
-}