author | Antonio Rojas
<arojas@archlinux.org> 2017-12-07 11:14:45 UTC |
committer | Antonio Rojas
<arojas@archlinux.org> 2017-12-07 11:14:45 UTC |
parent | a4074ab9bb66fef9ab46293a295cc4ed5d3d9666 |
PKGBUILD | +4 | -4 |
qtbug-61754.patch | +25 | -0 |
diff --git a/PKGBUILD b/PKGBUILD index 44a2c0b..588c407 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Andrea Scarpino <andrea@archlinux.org> pkgname=qt5-declarative -_qtver=5.9.3 +_qtver=5.10.0 pkgver=${_qtver/-/} pkgrel=1 arch=('x86_64') @@ -11,13 +11,13 @@ url='http://qt-project.org/' license=('GPL3' 'LGPL3' 'FDL' 'custom') pkgdesc='Classes for QML and JavaScript languages' depends=('qt5-xmlpatterns') -makedepends=('python2' 'cmake') +makedepends=('python2') groups=('qt' 'qt5') conflicts=('qtchooser' 'qt5-declarative-render2d') replaces=('qt5-declarative-render2d') -_pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}" +_pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}" source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('505f66d2062c1d84ce743a0b4969531e1cf94e30970dc64efffe10f74f989407') +sha256sums=('5ccb4dbca5046554037bcffbb05918f6efcff321c44cd1c39b1c47be7e67711e') prepare() { mkdir -p build diff --git a/qtbug-61754.patch b/qtbug-61754.patch new file mode 100644 index 0000000..e5352ec --- /dev/null +++ b/qtbug-61754.patch @@ -0,0 +1,25 @@ +From 768f606cd3cd37c235e85225127201a42d272946 Mon Sep 17 00:00:00 2001 +From: Joni Poikelin <joni.poikelin@qt.io> +Date: Thu, 17 Aug 2017 09:49:25 +0300 +Subject: [PATCH] Fix memory leaks with threaded renderer + +Reverts 39061af50cc3092289cdd71d17802139590ecb59 and calls endSync() +instead after syncSceneGraph(). + +Task-number: QTBUG-61754 +Change-Id: I7b51ffdc93557bacd93927dd642ec3715980b21c +Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> +Reviewed-by: Roger Zanoni <rogerzanoni@gmail.com> +--- +diff --git a/src/quick/scenegraph/qsgthreadedrenderloop.cpp b/src/quick/scenegraph/qsgthreadedrenderloop.cpp +index 3a8e673c0..d28a73da2 100644 +--- a/src/quick/scenegraph/qsgthreadedrenderloop.cpp ++++ b/src/quick/scenegraph/qsgthreadedrenderloop.cpp +@@ -553,6 +553,7 @@ void QSGRenderThread::sync(bool inExpose) + if (d->renderer) + d->renderer->clearChangedFlag(); + d->syncSceneGraph(); ++ sgrc->endSync(); + if (!hadRenderer && d->renderer) { + qCDebug(QSG_LOG_RENDERLOOP) << QSG_RT_PAD << "- renderer was created"; + syncResultedInChanges = true;