[SCM] qtdeclarative packaging branch, ubuntu+1, updated. debian/5.6.1-4-85-ga9edb26

[Timo Jyrinki]

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

The following commit has been merged in the ubuntu+1 branch:
commit e5a286395d4eb533560bcb997b0b97eff95e0564
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Tue Jul 19 05:54:31 2016 +0000

      - Drop debian/patches/Fix-crash-in-hasAtlasTexture.patch now in upstream.
---
 debian/changelog                                  |  2 +
 debian/control                                    |  2 +-
 debian/patches/Fix-crash-in-hasAtlasTexture.patch | 47 -----------------------
 debian/patches/series                             |  1 -
 4 files changed, 3 insertions(+), 49 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 670ffd5..2c18137 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,8 @@ qtdeclarative-opensource-src (5.6.1-4ubuntu1) UNRELEASED; urgency=medium
   * Refresh QML cache and test binary location patches to apply.
   * Modify QML cache patch to Qt 5.6 changes. (LP: #1556824)
   * Mark private symbols.
+  * Update for Qt 5.6.1:
+    - Drop debian/patches/Fix-crash-in-hasAtlasTexture.patch now in upstream.
 
  -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Tue, 26 Jan 2016 10:07:50 +0000
 
diff --git a/debian/control b/debian/control
index c56b252..79941b5 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Build-Depends: debhelper (>= 9),
                libqt5xmlpatterns5-dev (>= 5.6.1~),
                pkg-kde-tools (>= 0.15.17~),
                python,
-               qtbase5-private-dev (>= 5.6.1+dfsg~)
+               qtbase5-private-dev (>= 5.6.1+dfsg~),
                xauth,
                xvfb
 Build-Depends-Indep: libqt5sql5-sqlite (>= 5.6.1+dfsg~),
diff --git a/debian/patches/Fix-crash-in-hasAtlasTexture.patch b/debian/patches/Fix-crash-in-hasAtlasTexture.patch
deleted file mode 100644
index e605e13..0000000
--- a/debian/patches/Fix-crash-in-hasAtlasTexture.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From cef27bf90cbb8d4e6f36f6b77fa5efb361e01ad2 Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid <albert.astals at canonical.com>
-Date: Tue, 29 Mar 2016 14:40:23 +0200
-Subject: [PATCH] Fix crash in hasAtlasTexture
-
-Check for the QSGTextureProvider not being 0 before asking for its texture,
-we are doing the same in the loop of QQuickShaderEffectMaterial::compare so
-it was forgotten to do it here.
-
-Valgrind trace of the crash i get without it
-==26317== Invalid read of size 8
-==26317==    at 0x652B73A: hasAtlasTexture(QVector<QSGTextureProvider*> const&) (qquickshadereffectnode.cpp:49)
-==26317==    by 0x652BABC: QQuickShaderEffectMaterial::compare(QSGMaterial const*) const (qquickshadereffectnode.cpp:396)
-==26317==    by 0x63D1BF6: QSGBatchRenderer::Renderer::prepareOpaqueBatches() (qsgbatchrenderer.cpp:1525)
-==26317==    by 0x63DE7A7: QSGBatchRenderer::Renderer::render() (qsgbatchrenderer.cpp:2611)
-==26317==    by 0x63E9D3E: QSGRenderer::renderScene(QSGBindable const&) (qsgrenderer.cpp:208)
-==26317==    by 0x63EA58A: QSGRenderer::renderScene(unsigned int) (qsgrenderer.cpp:168)
-==26317==    by 0x63FAA7D: QSGRenderContext::renderNextFrame(QSGRenderer*, unsigned int) (qsgcontext.cpp:558)
-==26317==    by 0x644540A: QQuickWindowPrivate::renderSceneGraph(QSize const&) (qquickwindow.cpp:383)
-==26317==    by 0x641541A: QSGGuiThreadRenderLoop::renderWindow(QQuickWindow*) (qsgrenderloop.cpp:378)
-==26317==    by 0x6416520: QSGGuiThreadRenderLoop::event(QEvent*) (qsgrenderloop.cpp:474)
-==26317==    by 0x605F488: QCoreApplication::notify(QObject*, QEvent*) (in /usr/lib/x86_64-linux-gnu/libQt5Core.so.5.5.1)
-==26317==    by 0x605F5BA: QCoreApplication::notifyInternal(QObject*, QEvent*) (in /usr/lib/x86_64-linux-gnu/libQt5Core.so.5.5.1)
-==26317==  Address 0x0 is not stack'd, malloc'd or (recently) free'd
-
-Change-Id: I3b07450438d98910fbbff9f8b7a3d9d851ed4e5d
-Reviewed-by: Michael Brasser <michael.brasser at live.com>
----
- src/quick/items/qquickshadereffectnode.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/quick/items/qquickshadereffectnode.cpp b/src/quick/items/qquickshadereffectnode.cpp
-index 954aa6c..95537fd 100644
---- a/src/quick/items/qquickshadereffectnode.cpp
-+++ b/src/quick/items/qquickshadereffectnode.cpp
-@@ -46,7 +46,7 @@ static bool hasAtlasTexture(const QVector<QSGTextureProvider *> &textureProvider
- {
-     for (int i = 0; i < textureProviders.size(); ++i) {
-         QSGTextureProvider *t = textureProviders.at(i);
--        if (t->texture() && t->texture()->isAtlasTexture())
-+        if (t && t->texture() && t->texture()->isAtlasTexture())
-             return true;
-     }
-     return false;
--- 
-2.7.4
-
diff --git a/debian/patches/series b/debian/patches/series
index 2a8c281..4d95317 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 # Backported patches
 QQuickItemView-forceLayout-Also-call-layout-when-d-f.patch
-Fix-crash-in-hasAtlasTexture.patch
 qml_only_release_types_if_they_arent_referenced_anymore.patch
 
 # Debian patches

-- 
qtdeclarative packaging