Accepting request 323351 from KDE:Qt5

Update to 5.5.0

OBS-URL: https://build.opensuse.org/request/show/323351
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtdeclarative?expand=0&rev=26

avoid-calling-potentially-pure-virtual-method.patch

@@ -1,61 +0,0 @@
-Parent:     9934c075 (QML: do not check stack size if stack grows up)
-Author:     David Edmundson <davidedmundson@kde.org>
-AuthorDate: 2015-04-23 15:01:24 +0200
-Commit:     David Edmundson <davidedmundson@kde.org>
-CommitDate: 2015-04-23 15:05:32 +0200
-
-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
----
-
-diff --git a/src/quick/items/qquickscreen.cpp b/src/quick/items/qquickscreen.cpp
-index 8ac5a1e..c19841f 100644
---- a/src/quick/items/qquickscreen.cpp
-+++ b/src/quick/items/qquickscreen.cpp
-@@ -347,24 +347,15 @@ void QQuickScreenAttached::screenChanged
-             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()));

libqt5-qtdeclarative.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Sun Aug 16 08:32:00 UTC 2015 - hrvoje.senjan@gmail.com
+
+- Update to 5.5.0
+  * For more details please see:
+    http://blog.qt.io/blog/2015/07/01/qt-5-5-released/
+    and https://wiki.qt.io/New_Features_in_Qt_5.5
+- Drop avoid-calling-potentially-pure-virtual-method.patch, merged
+  upstream
+
 -------------------------------------------------------------------
 Wed Jun  3 22:56:20 UTC 2015 - hrvoje.senjan@gmail.com
 

libqt5-qtdeclarative.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package libqt5-qtdeclarative
 #
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -21,20 +21,18 @@
 %define libname libQtQuick5
 
 Name:           libqt5-qtdeclarative
-Version:        5.4.2
+Version:        5.5.0
 Release:        0
 Summary:        Qt 5 Declarative Library
 License:        SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0
 Group:          Development/Libraries/X11
 Url:            http://qt.digia.com
 %define base_name libqt5
-%define real_version 5.4.2
+%define real_version 5.5.0
-%define so_version 5.4.2
+%define so_version 5.5.0
 %define tar_version qtdeclarative-opensource-src-%{real_version}
 Source:         %{tar_version}.tar.xz
 Source1:        baselibs.conf
-# PATCH-FIX-UPSTREAM avoid-calling-potentially-pure-virtual-method.patch
-Patch0:         avoid-calling-potentially-pure-virtual-method.patch
 # PATCH-FIX-OPENSUSE sse2_nojit.patch -- enable JIT and sse2 only on sse2 case
 Patch100:       sse2_nojit.patch
 BuildRequires:  fdupes
@@ -73,7 +71,6 @@ handling.
 
 %prep
 %setup -q -n qtdeclarative-opensource-src-%{real_version}
-%patch0 -p1
 %patch100 -p1
 
 %package -n %libname

qtdeclarative-opensource-src-5.4.2.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b73021d78fffe7894c5fde998a767a866b09811c7e210f8e46f252a32be741ae
-size 18497092

qtdeclarative-opensource-src-5.5.0.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:858a12c5647764da8f81edec4ed444af77888cf931b739c10168064ae96f6773
+size 18615972