[arch-commits] Commit in qt5-declarative/repos (3 files)

[Antonio Rojas]

    Date: Thursday, December 7, 2017 @ 11:19:53
  Author: arojas
Revision: 311719

archrelease: copy trunk to staging-x86_64

Added:
  qt5-declarative/repos/staging-x86_64/
  qt5-declarative/repos/staging-x86_64/PKGBUILD
    (from rev 311718, qt5-declarative/trunk/PKGBUILD)
  qt5-declarative/repos/staging-x86_64/qtbug-61754.patch
    (from rev 311718, qt5-declarative/trunk/qtbug-61754.patch)

-------------------+
 PKGBUILD          |   52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 qtbug-61754.patch |   25 +++++++++++++++++++++++++
 2 files changed, 77 insertions(+)

Copied: qt5-declarative/repos/staging-x86_64/PKGBUILD (from rev 311718, qt5-declarative/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD	                        (rev 0)
+++ staging-x86_64/PKGBUILD	2017-12-07 11:19:53 UTC (rev 311719)
@@ -0,0 +1,52 @@
+# $Id: PKGBUILD 240297 2015-06-03 10:22:03Z fyan $
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=qt5-declarative
+_qtver=5.10.0
+pkgver=${_qtver/-/}
+pkgrel=1
+arch=('x86_64')
+url='http://qt-project.org/'
+license=('GPL3' 'LGPL3' 'FDL' 'custom')
+pkgdesc='Classes for QML and JavaScript languages'
+depends=('qt5-xmlpatterns')
+makedepends=('python2')
+groups=('qt' 'qt5')
+conflicts=('qtchooser' 'qt5-declarative-render2d')
+replaces=('qt5-declarative-render2d')
+_pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}"
+source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
+sha256sums=('5ccb4dbca5046554037bcffbb05918f6efcff321c44cd1c39b1c47be7e67711e')
+
+prepare() {
+  mkdir -p build
+
+  # Use python2 for Python 2.x
+  find -name '*.pro' -o -name '*.pri' | xargs sed -i -e 's|python -c|python2 -c|g' -e 's|python \$|python2 \$|g'
+}
+
+build() {
+  cd build
+
+  export PYTHON=python2
+  qmake ../${_pkgfqn}
+  make
+}
+
+package() {
+  cd build
+  make INSTALL_ROOT="$pkgdir" install
+
+  # Symlinks for backwards compatibility
+  for b in "$pkgdir"/usr/bin/*; do
+    ln -s /usr/bin/$(basename $b) "$pkgdir"/usr/bin/$(basename $b)-qt5
+  done
+
+  # Drop QMAKE_PRL_BUILD_DIR because reference the build dir
+  find "$pkgdir/usr/lib" -type f -name '*.prl' \
+    -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
+
+  install -d "$pkgdir"/usr/share/licenses
+  ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/${pkgname}
+}

Copied: qt5-declarative/repos/staging-x86_64/qtbug-61754.patch (from rev 311718, qt5-declarative/trunk/qtbug-61754.patch)
===================================================================
--- staging-x86_64/qtbug-61754.patch	                        (rev 0)
+++ staging-x86_64/qtbug-61754.patch	2017-12-07 11:19:53 UTC (rev 311719)
@@ -0,0 +1,25 @@
+From 768f606cd3cd37c235e85225127201a42d272946 Mon Sep 17 00:00:00 2001
+From: Joni Poikelin <joni.poikelin at 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 at qt.io>
+Reviewed-by: Roger Zanoni <rogerzanoni at 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;