[SCM] qtdeclarative packaging branch, experimental, updated. debian/5.9.1-6-3-gc76c722

[Dmitry Shachnev]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtdeclarative.git;a=commitdiff;h=ffc7088

The following commit has been merged in the experimental branch:
commit ffc7088692a8298c7cf97dc10ac87176985a7a9e
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Tue Oct 10 19:41:08 2017 +0300

    Drop patches that have been applied upstream.
---
 debian/changelog                                   |  3 +++
 debian/patches/fix_image_source_memory_leak.patch  | 21 ---------------
 .../rebuild-QmlDatapropertyCache-if-deleted.patch  | 31 ----------------------
 debian/patches/series                              |  2 --
 4 files changed, 3 insertions(+), 54 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 49c0b3e..258ce21 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ qtdeclarative-opensource-src (5.9.2-1) UNRELEASED; urgency=medium
 
   [ Dmitry Shachnev ]
   * New upstream release.
+  * Drop patches, applied upstream:
+    - fix_image_source_memory_leak.patch
+    - rebuild-QmlDatapropertyCache-if-deleted.patch
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 10 Oct 2017 19:34:09 +0300
 
diff --git a/debian/patches/fix_image_source_memory_leak.patch b/debian/patches/fix_image_source_memory_leak.patch
deleted file mode 100644
index c4c9206..0000000
--- a/debian/patches/fix_image_source_memory_leak.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: fix memory leak with threaded renderer
- This patch is actually the merge of https://codereview.qt-project.org/#/c/200715/
- and https://codereview.qt-project.org/#/c/202781/ and will be included in the
- next minor release.
-Bug-Qt: https://bugreports.qt.io/browse/QTBUG-61754
-Author: Mitch Curtis
-
----
- src/quick/scenegraph/qsgthreadedrenderloop.cpp |    1 +
- 1 file changed, 1 insertion(+)
-
---- 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;
diff --git a/debian/patches/rebuild-QmlDatapropertyCache-if-deleted.patch b/debian/patches/rebuild-QmlDatapropertyCache-if-deleted.patch
deleted file mode 100644
index c6b3047..0000000
--- a/debian/patches/rebuild-QmlDatapropertyCache-if-deleted.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Description: Rebuild QQmlData::propertyCache if deleted by another engine
- QQmlData is shared between engines, but the relevant QObjectWrapper is
- not. Since 749a7212e903d8e8c6f256edb1836b9449cc7fe1 when a
- QObjectWrapper is deleted it resets the shared QQmlData propertyCache.
- .
- In most cases the propertyCache except when a property updated in an
- existing binding in the first engine, where it currently asserts.
- .
- This patch can be dropped once 5.9.2 is packaged.
-Author: David Edmundson <davidedmundson at kde.org>
-Origin: upstream
-Bug: https://bugreports.qt.io/browse/QTBUG-61681
-Applied-Upstream: ab5d4c78224c9ec79165e8890e5f8b8e838e0709
-Reviewed-by: Simon Hausmann <simon.hausmann at qt.io>
-Last-Update: 2017-08-02
---- a/src/qml/qml/qqmlbinding.cpp
-+++ b/src/qml/qml/qqmlbinding.cpp
-@@ -515,7 +515,12 @@ void QQmlBinding::getPropertyData(QQmlPropertyData **propertyData, QQmlPropertyD
-     Q_ASSERT(propertyData);
- 
-     QQmlData *data = QQmlData::get(*m_target, false);
--    Q_ASSERT(data && data->propertyCache);
-+    Q_ASSERT(data);
-+
-+    if (Q_UNLIKELY(!data->propertyCache)) {
-+        data->propertyCache = QQmlEnginePrivate::get(context()->engine)->cache(m_target->metaObject());
-+        data->propertyCache->addref();
-+    }
- 
-     *propertyData = data->propertyCache->property(m_targetIndex.coreIndex());
-     Q_ASSERT(*propertyData);
diff --git a/debian/patches/series b/debian/patches/series
index 374e350..ab002cf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,9 +1,7 @@
 # Backported patches
-fix_image_source_memory_leak.patch
 
 # Debian patches
 disableopengltests.patch
 fix_test_remove_qlibraryinfo.patch
 Do-not-make-lack-of-SSE2-support-on-x86-32-fatal.patch
 disable_jit_on_mips.patch
-rebuild-QmlDatapropertyCache-if-deleted.patch

-- 
qtdeclarative packaging