[SCM] qtdeclarative packaging branch, experimental, updated. debian/5.4.2-6-3-gc64fb68

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit c64fb68900983fe47ababa2fe0483ca43e0d3c38
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Thu Aug 13 23:51:00 2015 +0300

    Update patches for the new release.
---
 debian/changelog                                   |  2 +
 ...d_calling_potentially_pure-virtual_method.patch | 64 ----------------------
 .../patches/check_system_double-conversion.patch   | 14 ++---
 debian/patches/series                              |  3 -
 4 files changed, 9 insertions(+), 74 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6d06c98..d58e461 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ qtdeclarative-opensource-src (5.5.0-1) UNRELEASED; urgency=medium
   [ Dmitry Shachnev ]
   * New upstream release.
   * Bump Qt build-dependencies to 5.5.0.
+  * Drop avoid_calling_potentially_pure-virtual_method.patch, applied upstream.
+  * Refresh check_system_double-conversion.patch.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 13 Aug 2015 23:28:53 +0300
 
diff --git a/debian/patches/avoid_calling_potentially_pure-virtual_method.patch b/debian/patches/avoid_calling_potentially_pure-virtual_method.patch
deleted file mode 100644
index a2c9405..0000000
--- a/debian/patches/avoid_calling_potentially_pure-virtual_method.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 0d31aa1617c96ed3e3624d77332ea6f13aba1492 Mon Sep 17 00:00:00 2001
-From: David Edmundson <davidedmundson at kde.org>
-Date: Thu, 23 Apr 2015 15:01:24 +0200
-Subject: [PATCH] Avoid calling potentially pure virtual method
-
-In Qt 5.4 screenChanged is called indirectly from the destructor of
-QPlatformScreen. By comparing new values against the oldScreen we call
-call virtual methods of QPlatformScreen from it's own destructor which
-results in a crash.
-
-This patch simply emits change signals whenever a screen change regardless
-of whether the value differs from the previous screen. Arguably less
-efficient, but better than crashing.
-
-This fix is not needed in Qt 5.5 where the QPA architecture has changed.
-
-Task-number: QTBUG-45753
-Change-Id: Ic155906928855a377add9b21bff9e72b31f4667e
-Reviewed-by: Alan Alpert <aalpert at blackberry.com>
----
- src/quick/items/qquickscreen.cpp | 27 +++++++++------------------
- 1 file changed, 9 insertions(+), 18 deletions(-)
-
-diff --git a/src/quick/items/qquickscreen.cpp b/src/quick/items/qquickscreen.cpp
-index c4d1407..0900adb 100644
---- a/src/quick/items/qquickscreen.cpp
-+++ b/src/quick/items/qquickscreen.cpp
-@@ -347,24 +347,15 @@ void QQuickScreenAttached::screenChanged(QScreen *screen)
-             emit orientationUpdateMaskChanged();
-         }
- 
--        if (!oldScreen || screen->size() != oldScreen->size()) {
--            emit widthChanged();
--            emit heightChanged();
--        }
--        if (!oldScreen || screen->name() != oldScreen->name())
--            emit nameChanged();
--        if (!oldScreen || screen->orientation() != oldScreen->orientation())
--            emit orientationChanged();
--        if (!oldScreen || screen->primaryOrientation() != oldScreen->primaryOrientation())
--            emit primaryOrientationChanged();
--        if (!oldScreen || screen->availableVirtualGeometry() != oldScreen->availableVirtualGeometry())
--            emit desktopGeometryChanged();
--        if (!oldScreen || screen->logicalDotsPerInch() != oldScreen->logicalDotsPerInch())
--            emit logicalPixelDensityChanged();
--        if (!oldScreen || screen->physicalDotsPerInch() != oldScreen->physicalDotsPerInch())
--            emit pixelDensityChanged();
--        if (!oldScreen || screen->devicePixelRatio() != oldScreen->devicePixelRatio())
--            emit devicePixelRatioChanged();
-+        emit widthChanged();
-+        emit heightChanged();
-+        emit nameChanged();
-+        emit orientationChanged();
-+        emit primaryOrientationChanged();
-+        emit desktopGeometryChanged();
-+        emit logicalPixelDensityChanged();
-+        emit pixelDensityChanged();
-+        emit devicePixelRatioChanged();
- 
-         connect(screen, SIGNAL(geometryChanged(QRect)),
-                 this, SIGNAL(widthChanged()));
--- 
-2.1.4
-
diff --git a/debian/patches/check_system_double-conversion.patch b/debian/patches/check_system_double-conversion.patch
index a2a43f0..c0a80fd 100644
--- a/debian/patches/check_system_double-conversion.patch
+++ b/debian/patches/check_system_double-conversion.patch
@@ -83,7 +83,7 @@ Forwarded: https://codereview.qt-project.org/#/c/105650/
  
 --- a/src/qml/jsruntime/jsruntime.pri
 +++ b/src/qml/jsruntime/jsruntime.pri
-@@ -111,4 +111,9 @@ valgrind {
+@@ -117,4 +117,9 @@
  
  ios: DEFINES += ENABLE_ASSEMBLER_WX_EXCLUSIVE=1
  
@@ -96,7 +96,7 @@ Forwarded: https://codereview.qt-project.org/#/c/105650/
 +}
 --- a/src/qml/jsruntime/qv4numberobject.cpp
 +++ b/src/qml/jsruntime/qv4numberobject.cpp
-@@ -36,7 +36,12 @@
+@@ -38,7 +38,12 @@
  #include <QtCore/qmath.h>
  #include <QtCore/QDebug>
  #include <cassert>
@@ -111,9 +111,9 @@ Forwarded: https://codereview.qt-project.org/#/c/105650/
  
 --- a/src/qml/jsruntime/qv4runtime.cpp
 +++ b/src/qml/jsruntime/qv4runtime.cpp
-@@ -58,7 +58,11 @@
- #include <typeinfo>
- #include <stdlib.h>
+@@ -57,7 +57,11 @@
+ 
+ #include <wtf/MathExtras.h>
  
 -#include "../../3rdparty/double-conversion/double-conversion.h"
 +#ifdef SYSTEM_DOUBLECONVERSION
@@ -122,5 +122,5 @@ Forwarded: https://codereview.qt-project.org/#/c/105650/
 +#include <double-conversion.h>
 +#endif
  
- QT_BEGIN_NAMESPACE
- 
+ #ifdef QV4_COUNT_RUNTIME_FUNCTIONS
+ #  include <QtCore/QBuffer>
diff --git a/debian/patches/series b/debian/patches/series
index d12b4f6..9741485 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,2 @@
-# Upstream patches
-avoid_calling_potentially_pure-virtual_method.patch
-
 # Debian patches
 check_system_double-conversion.patch

-- 
qtdeclarative packaging