summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2018-12-06 00:10:39 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2018-12-08 18:49:01 +0100
commit0f6840a9c60112733219a6dd26ded27de61e6cda (patch)
treeae7258af8f8d062769953aadbdecea962b6e0dbe /dev-qt/qtdeclarative
parentsys-libs/libnih: mark s390 stable (diff)
downloadgentoo-0f6840a9c60112733219a6dd26ded27de61e6cda.tar.gz
gentoo-0f6840a9c60112733219a6dd26ded27de61e6cda.tar.bz2
gentoo-0f6840a9c60112733219a6dd26ded27de61e6cda.zip
dev-qt: Drop Qt 5.9.6
5.11.1 is stable for some time, with 5.11.3 already being prepared. We did not bother to bump 5.9.7 anymore, and there are several sec fixes in these later versions. Depends on app-misc/geoclue:0 to be removed from repo. Does not build against >=OpenSSL-1.1. Does not build against >=ffmpeg-4. Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'dev-qt/qtdeclarative')
-rw-r--r--dev-qt/qtdeclarative/Manifest1
-rw-r--r--dev-qt/qtdeclarative/files/qtdeclarative-5.9.5-texture-memleak.patch59
-rw-r--r--dev-qt/qtdeclarative/qtdeclarative-5.9.6.ebuild58
3 files changed, 0 insertions, 118 deletions
diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest
index 0845b10c2fb..d97229a663e 100644
--- a/dev-qt/qtdeclarative/Manifest
+++ b/dev-qt/qtdeclarative/Manifest
@@ -1,4 +1,3 @@
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 c2a143ecbed..00000000000
--- 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.9.6.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.9.6.ebuild
deleted file mode 100644
index 6ad4e561730..00000000000
--- 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
-}