qt5-qtdeclarative package update

Signed-off-by: guibuilder_pel7x64builder0 <guibuilder@powerel.org>
2020-05-03 21:45:07 +02:00 · 2020-05-03 21:45:07 +02:00 · 53fc84214a
parent 843b24b77d
commit 53fc84214a
2 changed files with 390 additions and 142 deletions
--- a/SOURCES/0045-QQuickItemView-refill-itself-before-populate-transit.patch
+++ b/SOURCES/0045-QQuickItemView-refill-itself-before-populate-transit.patch
@ -0,0 +1,162 @@
+From f806d64249c6e961ab12270d3a045e9980e19cf4 Mon Sep 17 00:00:00 2001
+From: Wang Chuan <ouchuanm@outlook.com>
+Date: Thu, 11 Jul 2019 10:24:38 +0800
+Subject: [PATCH 45/56] QQuickItemView: refill itself before populate
+ transition
+
+The view uses a visible items list, which is maintained by the refill()
+method, to determine which items should be triggered to do the populate
+transition.  The refill() was only invoked when component completed
+before doing the populate transition; but if the size of the view
+depends on the size of window (for example, using anchors.fill), more
+delegates could become visible after component completed. In such a
+case, part of visible items were not be triggered to do the transition.
+
+[ChangeLog][QtQuick][Item Views] Item views such as ListView now properly
+populate delegates with a populate transition when the view is resized
+after componentComplete.
+
+Fixes: QTBUG-76487
+Change-Id: Id90c3f73d9911c8a1d6d8b1ea0c51f6c27d0ed5b
+Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
+---
+ src/quick/items/qquickitemview.cpp            |  3 +
+ .../data/resizeAfterComponentComplete.qml     | 77 +++++++++++++++++++
+ .../qquicklistview/tst_qquicklistview.cpp     | 16 ++++
+ 3 files changed, 96 insertions(+)
+ create mode 100644 tests/auto/quick/qquicklistview/data/resizeAfterComponentComplete.qml
+
+diff --git a/src/quick/items/qquickitemview.cpp b/src/quick/items/qquickitemview.cpp
+index d0715cdb7..21d644dad 100644
+--- a/src/quick/items/qquickitemview.cpp
+++ b/src/quick/items/qquickitemview.cpp
+@@ -1845,6 +1845,9 @@ void QQuickItemViewPrivate::layout()
+     forceLayout = false;
+ 
+     if (transitioner && transitioner->canTransition(QQuickItemViewTransitioner::PopulateTransition, true)) {
+        // Give the view one more chance to refill itself,
+        // in case its size is changed such that more delegates become visible after component completed
+        refill();
+         for (FxViewItem *item : qAsConst(visibleItems)) {
+             if (!item->transitionScheduledOrRunning())
+                 item->transitionNextReposition(transitioner, QQuickItemViewTransitioner::PopulateTransition, true);
+diff --git a/tests/auto/quick/qquicklistview/data/resizeAfterComponentComplete.qml b/tests/auto/quick/qquicklistview/data/resizeAfterComponentComplete.qml
+new file mode 100644
+index 000000000..851d8f9a0
+--- /dev/null
+++ b/tests/auto/quick/qquicklistview/data/resizeAfterComponentComplete.qml
+@@ -0,0 +1,77 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.12
+
+ListView {
+    id: listView
+    property var lastItem
+    anchors.fill: parent
+    model: 10
+    delegate: Rectangle {
+        width: parent.width
+        height: 40
+        border.color: "lightsteelblue"
+        Text {
+            text: "Item" + (index + 1)
+        }
+        Component.onCompleted: {
+            if (index == 9)
+                listView.lastItem = this
+        }
+    }
+
+    populate: Transition {
+        NumberAnimation {
+            properties: "x,y"
+            duration: 1000
+        }
+    }
+}
+diff --git a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
+index cfd740f33..d956d8929 100644
+--- a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
+++ b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
+@@ -276,6 +276,7 @@ private slots:
+     void addOnCompleted();
+     void setPositionOnLayout();
+     void touchCancel();
+    void resizeAfterComponentComplete();
+ 
+ private:
+     template <class T> void items(const QUrl &source);
+@@ -8994,6 +8995,21 @@ void tst_QQuickListView::touchCancel() // QTBUG-74679
+     QTRY_COMPARE(listview->contentY(), 500.0);
+ }
+ 
+void tst_QQuickListView::resizeAfterComponentComplete()  // QTBUG-76487
+{
+    QScopedPointer<QQuickView> window(createView());
+    window->setSource(testFileUrl("resizeAfterComponentComplete.qml"));
+    window->resize(640, 480);
+    window->show();
+    QVERIFY(QTest::qWaitForWindowExposed(window.data()));
+
+    QObject *listView = window->rootObject();
+    QVERIFY(listView);
+
+    QObject *lastItem = qvariant_cast<QObject *>(listView->property("lastItem"));
+    QTRY_COMPARE(lastItem->property("y").toInt(), 9 * lastItem->property("height").toInt());
+}
+
+ QTEST_MAIN(tst_QQuickListView)
+ 
+ #include "tst_qquicklistview.moc"
+-- 
+2.21.0
+
--- a/SPECS/qt5-qtdeclarative.spec
+++ b/SPECS/qt5-qtdeclarative.spec
@ -1,73 +1,49 @@
-
 %global qt_module qtdeclarative

-# define to build docs, need to undef this for bootstrapping
-# where qt5-qttools builds are not yet available
-# only primary archs (for now), allow secondary to bootstrap
-# global bootstrap 1
-
-%if ! 0%{?bootstrap}
-%global docs 1
-%global tests 0
-%endif
-
-%if 0
-#ifarch %{ix86}
-%global nosse2_hack 1
-## TODO:
-# * consider debian's approach of runtime detection instead:
-#   https://codereview.qt-project.org/#/c/127354/
-%endif
-
 # definition borrowed from qtbase
 %global multilib_archs x86_64 %{ix86} %{?mips} ppc64 ppc s390x s390 sparc64 sparcv9

+#global bootstrap 1
+
 Summary: Qt5 - QtDeclarative component
 Name:    qt5-%{qt_module}
-Version: 5.9.2
-Release: 1%{?dist}
+Version: 5.12.5
+Release: 2%{?dist}

 # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
 Url:     http://www.qt.io
-Source0: http://download.qt.io/official_releases/qt/5.9/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz
+%global majmin %(echo %{version} | cut -d. -f1-2)
+Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodules/%{qt_module}-everywhere-src-%{version}.tar.xz

 # header file to workaround multilib issue
 # https://bugzilla.redhat.com/show_bug.cgi?id=1441343
 Source5: qv4global_p-multilib.h

-# support no_sse2 CONFIG (fedora i686 builds cannot assume -march=pentium4 -msse2 -mfpmath=sse flags, or the JIT that needs them)
-# https://codereview.qt-project.org/#change,73710
-Patch1: qtdeclarative-opensource-src-5.9.0-no_sse2.patch
-
-# workaround for possible deadlock condition in QQuickShaderEffectSource
-# https://bugzilla.redhat.com/show_bug.cgi?id=1237269
-# https://bugs.kde.org/show_bug.cgi?id=348385
-Patch2: qtdeclarative-QQuickShaderEffectSource_deadlock.patch
-
 ## upstream patches

 ## upstreamable patches
+# revert upstream commit that seemingly causes regressions with plasma-5.15.x notifcations applet
+# https://bugzilla.redhat.com/1758263
+Patch145: 0045-QQuickItemView-refill-itself-before-populate-transit.patch

-# https://bugs.kde.org/show_bug.cgi?id=346118#c108
-Patch201: qtdeclarative-kdebug346118.patch
-
-# https://codereview.qt-project.org/#/c/127354/
-# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=792594
-Patch202: http://sources.debian.net/data/main/q/qtdeclarative-opensource-src/5.9.0~beta3-2/debian/patches/Do-not-make-lack-of-SSE2-support-on-x86-32-fatal.patch
-
+# filter qml provides
 %global __provides_exclude_from ^%{_qt5_archdatadir}/qml/.*\\.so$

 Obsoletes: qt5-qtjsbackend < 5.2.0
+Obsoletes: qt5-qtdeclarative-render2d < 5.7.1-10

-BuildRequires: cmake
+BuildRequires: gcc-c++
+BuildRequires: qt5-rpm-macros >= %{version}
 BuildRequires: qt5-qtbase-devel >= %{version}
 BuildRequires: qt5-qtbase-private-devel
 %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
-%if ! 0%{?bootstrap}
-BuildRequires: qt5-qtxmlpatterns-devel
+BuildRequires: python%{python3_pkgversion}
+
+%if 0%{?bootstrap}
+Obsoletes: %{name}-examples < %{version}-%{release}
+%global no_examples CONFIG-=compile_examples
 %endif
-BuildRequires: python

 %if 0%{?tests}
 BuildRequires: dbus-x11
@ -82,6 +58,7 @@ BuildRequires: xorg-x11-server-Xvfb
 %package devel
 Summary: Development files for %{name}
 Obsoletes: qt5-qtjsbackend-devel < 5.2.0
+Obsoletes: qt5-qtdeclarative-render2d-devel < 5.7.1-10
 Provides:  %{name}-private-devel = %{version}-%{release}
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: qt5-qtbase-devel%{?_isa}
@ -94,19 +71,6 @@ Requires: %{name}-devel%{?_isa} = %{version}-%{release}
 %description static
 %{summary}.

-%if 0%{?docs}
-%package doc
-Summary: API documentation for %{name}
-License: GFDL
-Requires: %{name} = %{version}-%{release}
-BuildRequires: qt5-qdoc
-BuildRequires: qt5-qhelpgenerator
-# FTBS: same problem as qtbase
-# BuildArch: noarch
-%description doc
-%{summary}.
-%endif
-
 %package examples
 Summary: Programming examples for %{name}
 Requires: %{name}%{?_isa} = %{version}-%{release}
@ -115,47 +79,24 @@ Requires: %{name}%{?_isa} = %{version}-%{release}


 %prep
-%setup -q -n %{qt_module}-opensource-src-%{version}
-%if 0%{?nosse2_hack}
-%patch1 -p1 -b .no_sse2
-%endif
-%patch2 -p1 -b .QQuickShaderEffectSource_deadlock
-%patch201 -p0 -b .kdebug346118
-%patch202 -p1 -b .no_sse2_non_fatal
+%setup -q -n %{qt_module}-everywhere-src-%{version}
+
+%patch145 -p1 -R


 %build
-%if 0%{?nosse2_hack}
-# build libQt5Qml with no_sse2
-mkdir -p %{_target_platform}-no_sse2
-pushd    %{_target_platform}-no_sse2
-%{qmake_qt5} -config no_sse2 ..
-make sub-src-clean
-make %{?_smp_mflags} -C src/qml
-popd
-%endif

-# no shadow builds until fixed: https://bugreports.qt.io/browse/QTBUG-37417
-%{qmake_qt5}
+# HACK so calls to "python" get what we want
+ln -s %{__python3} python
+export PATH=`pwd`:$PATH

-%if 0%{?docs}
-make %{?_smp_mflags} docs
-%endif
+%qmake_qt5
+
+%make_build

-make %{?_smp_mflags}

 %install
-make install INSTALL_ROOT=%{buildroot}
-
-%if 0%{?nosse2_hack}
-mkdir -p %{buildroot}%{_qt5_libdir}/sse2
-mv %{buildroot}%{_qt5_libdir}/libQt5Qml.so.5* %{buildroot}%{_qt5_libdir}/sse2/
-make install INSTALL_ROOT=%{buildroot} -C %{_target_platform}-no_sse2/src/qml
-%endif
-
-%if 0%{?docs}
-make install_docs INSTALL_ROOT=%{buildroot}
-%endif
+%make_install INSTALL_ROOT=%{buildroot}

 %ifarch %{multilib_archs}
 # multilib: qv4global_p.h
@ -217,12 +158,10 @@ make check -k -C tests ||:
 %files
 %license LICENSE.LGPL*
 %{_qt5_libdir}/libQt5Qml.so.5*
-%if 0%{?nosse2_hack}
-%{_qt5_libdir}/sse2/libQt5Qml.so.5*
-%endif
 %{_qt5_libdir}/libQt5Quick.so.5*
 %{_qt5_libdir}/libQt5QuickWidgets.so.5*
 %{_qt5_libdir}/libQt5QuickParticles.so.5*
+%{_qt5_libdir}/libQt5QuickShapes.so.5*
 %{_qt5_libdir}/libQt5QuickTest.so.5*
 %{_qt5_plugindir}/qmltooling/
 %{_qt5_archdatadir}/qml/
@ -251,57 +190,204 @@ make check -k -C tests ||:
 %{_qt5_libdir}/libQt5QmlDebug.a
 %{_qt5_libdir}/libQt5QmlDebug.prl

-%if 0%{?docs}
-%files doc
-%license LICENSE.FDL
-%{_qt5_docdir}/qtqml.qch
-%{_qt5_docdir}/qtqml/
-%{_qt5_docdir}/qtquick.qch
-%{_qt5_docdir}/qtquick/
-
+%if ! 0%{?no_examples:1}
 %files examples
 %{_qt5_examplesdir}/
 %endif


 %changelog
-* Fri Oct 06 2017 Jan Grulich <jgrulich@redhat.com> - 5.9.2-1
- Update to 5.9.2
-  Resolves: bz#1482778
+* Mon Oct 07 2019 Rex Dieter <rdieter@fedoraproject.org> - 5.12.5-2
+- revert upstream commit possibly related to plasma notification applet crashes (#1758263)

-* Mon Sep 04 2017 Jan Grulich <jgrulich@redhat.com> - 5.9.1-2
- Enable documentation
-  Resolves: bz#1482778
+* Tue Sep 24 2019 Jan Grulich <jgrulich@redhat.com> - 5.12.5-1
+- 5.12.5

-* Mon Aug 21 2017 Jan Grulich <jgrulich@redhat.com> - 5.9.1-1
- Update to 5.9.1
-  Resolves: bz#1482778
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.12.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

-* Wed Jan 11 2017 Jan Grulich <jgrulich@redhat.com> - 5.6.2-1
- Update to 5.6.2
-  Resolves: bz#1384817
+* Tue Jul 16 2019 Rex Dieter <rdieter@fedoraproject.org> - 5.12.4-2
+- build with python3

-* Tue Aug 30 2016 Jan Grulich <jgrulich@redhat.com> - 5.6.1-10
- Increase build version to have newer version than in EPEL
-  Resolves: bz#1317400
+* Fri Jun 14 2019 Jan Grulich <jgrulich@redhat.com> - 5.12.4-1
+- 5.12.4

-* Wed Jun 22 2016 Jan Grulich <jgrulich@redhat.com> - 5.6.1-3
- QML: Only release types if they aren't referenced anymore
+* Tue Jun 04 2019 Jan Grulich <jgrulich@redhat.com> - 5.12.3-1
+- 5.12.3

-* Wed Jun 15 2016 Jan Grulich <jgrulich@redhat.com> - 5.6.1-2
- Apply no_sse2 hack to all architecturs to make qt5-qtdeclarative-devel multilib-clean
+* Fri Mar 15 2019 Rex Dieter <rdieter@fedoraproject.org> - 5.12.1-2
+- de-bootstrap

-* Wed Jun 08 2016 Jan Grulich <jgrulich@redhat.com> - 5.6.1-1
- Update to 5.6.1 + sync with Fedora
-  Resolves: bz#1317400
+* Mon Feb 04 2019 Rex Dieter <rdieter@fedoraproject.org> - 5.12.1-1
+- 5.12.1
+- drop remants of sse2 hack support
+- add bootstrap support (examples)

-* Wed Apr 13 2016 Jan Grulich <jgrulich@redhat.com> - 5.6.0-6
- Enable documentation
-  Resolves: bz#1317400
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.11.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

-* Thu Apr 07 2016 Jan Grulich <jgrulich@redhat.com> - 5.6.0-5
- Initial version for RHEL
-  Resolves: bz#1317400
+* Fri Dec 07 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.11.3-1
+- 5.11.3
+
+* Fri Sep 21 2018 Jan Grulich <jgrulich@redhat.com> - 5.11.2-1
+- 5.11.2
+
+* Sun Jul 15 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.11.1-3
+- BR: /usr/bin/python
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.11.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Tue Jun 19 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.11.1-1
+- 5.11.1
+
+* Mon Jun 18 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.11.0-2
+- %%ix86: nosse2_hack on < f29 only
+
+* Wed May 23 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.11.0-1
+- 5.11.0
+- i686: use nosse2_hack again
+
+* Tue Apr 03 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.10.1-5
+- pull in candidate memleak fix (review#224684)
+
+* Sun Mar 18 2018 Iryna Shcherbina <ishcherb@redhat.com> - 5.10.1-4
+- Update Python 2 dependency declarations to new packaging standards
+  (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
+
+* Thu Mar 08 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.10.1-3
+- BR: qt5-rpm-macros
+
+* Mon Mar 05 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.10.1-2
+- BR: gcc-c++, use %%make_build %%make_install %%ldconfig_scriptlets
+
+* Tue Feb 13 2018 Jan Grulich <jgrulich@redhat.com> - 5.10.1-1
+- 5.10.1
+
+* Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 5.10.0-2
+- Escape macros in %%changelog
+
+* Tue Dec 19 2017 Jan Grulich <jgrulich@redhat.com> - 5.10.0-1
+- 5.10.0
+
+* Thu Nov 23 2017 Jan Grulich <jgrulich@redhat.com> - 5.9.3-1
+- 5.9.3
+
+* Tue Oct 31 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.9.2-3
+- Obsoletes: qt5-qtdeclarative-render2d
+
+* Thu Oct 26 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.9.2-2
+- revert commit causing regresions (QTBUG-64017)
+
+* Mon Oct 09 2017 Jan Grulich <jgrulich@redhat.com> - 5.9.2-1
+- 5.9.2
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5.9.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5.9.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Wed Jul 19 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.9.1-1
+- 5.9.1
+
+* Thu Jun 15 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.9.0-3
+- drop shadow/out-of-tree builds (#1456211,QTBUG-37417)
+- use debian's i686/sse2 support patch
+
+* Fri Jun 02 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.9.0-2
+- rebuild
+
+* Wed May 31 2017 Helio Chissini de Castro <helio@kde.org> - 5.9.0-1
+- Upstream official release
+
+* Fri May 26 2017 Helio Chissini de Castro <helio@kde.org> - 5.9.0-0.1.rc
+- Upstream Release Candidate retagged
+
+* Wed May 24 2017 Helio Chissini de Castro <helio@kde.org> - 5.9.0-0.rc.1
+- Upstream Release Candidate 1
+
+* Sun May 14 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.9.0-0.5.beta3
+- Conflict in qt5-qtdeclarative-devel (#1441343), fix Release: 1%%{?dist}
+
+* Mon May 08 2017 Than Ngo <than@redhat.com> - 5.9.0-0.beta.4
+- drop useless qtdeclarative-opensource-src-5.9.0-v4bootstrap.patch,
+  apply correct qtdeclarative-opensource-src-5.9.0-no_sse2.patch to
+  fix the build issue in JIT on ppc64/ppc64le/s390x
+
+* Fri May 05 2017 Helio Chissini de Castro <helio@kde.org> - 5.9.0-0.beta.3
+- New upstream beta3 release
+
+* Sun Apr 16 2017 Helio Chissini de Castro <helio@kde.org> - 5.9.0-0.beta.1
+- New upstream beta release
+
+* Mon Apr 03 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.8.0-3
+- build -doc on all archs
+
+* Thu Mar 30 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.8.0-2
+- de-bootstrap
+
+* Fri Jan 27 2017 Helio Chissini de Castro <helio@kde.org> - 5.8.0-1
+- New upstream version
+- bootstrap
+
+* Mon Jan 02 2017 Rex Dieter <rdieter@math.unl.edu> - 5.7.1-6
+- filter qml provides
+
+* Sat Dec 17 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.7.1-5
+- restore bootstrap/doc macros, drop pkgconfig-style deps (for now)
+
+* Sat Dec 10 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.7.1-4
+- drop BR: cmake (handled by qt5-rpm-macros now)
+
+* Fri Dec 09 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.7.1-3
+- rebuild
+
+* Fri Dec 09 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.7.1-2
+- 5.7.1 dec5 snapshot
+
+* Wed Nov 09 2016 Helio Chissini de Castro <helio@kde.org> - 5.7.1-1
+- New upstream version
+
+* Mon Jul 04 2016 Helio Chissini de Castro <helio@kde.org> - 5.7.0-2
+- Compiled with gcc
+
+* Tue Jun 14 2016 Helio Chissini de Castro <helio@kde.org> - 5.7.0-1
+- Qt 5.7.0 release
+
+* Thu Jun 09 2016 Helio Chissini de Castro <helio@kde.org> - 5.7.0-0.1
+- Prepare for 5.7.0
+
+* Thu Jun 09 2016 Jan Grulich <jgrulich@redhat.com> - 5.6.1-1
+- Update to 5.6.1
+
+* Thu Jun 02 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.6.0-12
+- pull in upstream qml/jsruntime workaround (ie, apply compiler workarounds only for src/qml/)
+
+* Tue May 31 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.6.0-11
+- include crasher workaround (#1259472,kde#346118)
+
+* Sat May 28 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.6.0-10
+- macro'ize no_sse2 hack (to make it easier to enable/disable)
+- re-introduce -fno-delete-null-pointer-checks here (following upstream)
+- add -fno-lifetime-dse too, helps fix i686/qml crasher (#1331593)
+- disable tests (for now, not useful yet)
+
+* Fri May 20 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.6.0-9
+- Use system double-conversion (#1078524)
+
+* Thu May 19 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.6.0-8
+- -devel: don't own libQt5QuickWidgets.so.5 (#1337621)
+
+* Thu May 05 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.6.0-7
+- BR: mesa-dri-drivers (tests)
+
+* Thu May 05 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.6.0-6
+- drop local -fno-delete-null-pointer-checks hack, used in all Qt5 builds now
+- add %%check
+
+* Sun Apr 17 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.6.0-5
+- BR: qt5-qtbase-private-devel, -devel: Provides: -private-devel

 * Fri Mar 25 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.6.0-4
 - backport upstream fixes
@ -325,29 +411,29 @@ make check -k -C tests ||:
 * Mon Feb 15 2016 Helio Chissini de Castro <helio@kde.org> - 5.6.0-0.9
 - Update RC release

-* Tue Feb 02 2016 Rex Dieter <rdieter@fedoraproject.org> 5.6.0-0.8.beta
+* Tue Feb 02 2016 Rex Dieter <rdieter@fedoraproject.org> 5.6.0-0.8.beta3
 - build with -fno-delete-null-pointer-checks to workaround gcc6-related runtime crashes (#1303643)

-* Thu Jan 28 2016 Rex Dieter <rdieter@fedoraproject.org> 5.6.0-0.7.beta
+* Thu Jan 28 2016 Rex Dieter <rdieter@fedoraproject.org> 5.6.0-0.7.beta3
 - backport fix for older compilers (aka rhel6)

-* Sun Jan 17 2016 Rex Dieter <rdieter@fedoraproject.org> 5.6.0-0.6.beta
+* Sun Jan 17 2016 Rex Dieter <rdieter@fedoraproject.org> 5.6.0-0.6.beta3
 - use %%license

-* Mon Dec 21 2015 Rex Dieter <rdieter@fedoraproject.org> 5.6.0-0.5.beta
- fix Source URL, Release: tag
+* Mon Dec 21 2015 Rex Dieter <rdieter@fedoraproject.org> 5.6.0-0.5.beta3
+- fix Source URL, Release: 1%%{?dist}

 * Mon Dec 21 2015 Helio Chissini de Castro <helio@kde.org> - 5.6.0-0.4
- Update to final beta release
+- Update to final beta3 release

 * Thu Dec 10 2015 Helio Chissini de Castro <helio@kde.org> - 5.6.0-0.3
- Official beta release
+- Official beta3 release

 * Sun Dec 06 2015 Rex Dieter <rdieter@fedoraproject.org> 5.6.0-0.2
 - de-bootstrap

 * Tue Nov 03 2015 Helio Chissini de Castro <helio@kde.org> - 5.6.0-0.1
- Start to implement 5.6.0 beta, bootstrap
+- Start to implement 5.6.0 beta3, bootstrap

 * Sat Oct 24 2015 Rex Dieter <rdieter@fedoraproject.org> 5.5.1-3
 - workaround QQuickShaderEffectSource::updatePaintNode deadlock (#1237269, kde#348385)
@ -406,11 +492,11 @@ make check -k -C tests ||:
 * Fri Nov 28 2014 Rex Dieter <rdieter@fedoraproject.org> 5.4.0-0.3.rc
 - 5.4.0-rc

-* Mon Nov 03 2014 Rex Dieter <rdieter@fedoraproject.org> 5.4.0-0.2.beta
+* Mon Nov 03 2014 Rex Dieter <rdieter@fedoraproject.org> 5.4.0-0.2.beta3
 - use new %%qmake_qt5 macro

-* Sat Oct 18 2014 Rex Dieter <rdieter@fedoraproject.org> - 5.4.0-0.1.beta
- 5.4.0-beta
+* Sat Oct 18 2014 Rex Dieter <rdieter@fedoraproject.org> - 5.4.0-0.1.beta3
+- 5.4.0-beta3
 - %%ix84: drop sse2-optimized bits, need to rethink if/how to support it now

 * Tue Sep 16 2014 Rex Dieter <rdieter@fedoraproject.org> 5.3.2-1
@ -462,14 +548,14 @@ make check -k -C tests ||:
 * Mon Dec 02 2013 Rex Dieter <rdieter@fedoraproject.org> 5.2.0-0.10.rc1
 - 5.2.0-rc1

-* Mon Nov 25 2013 Rex Dieter <rdieter@fedoraproject.org> 5.2.0-0.5.beta1
+* Mon Nov 25 2013 Rex Dieter <rdieter@fedoraproject.org> 5.2.0-0.5.beta31
 - enable -doc only on primary archs (allow secondary bootstrap)

-* Sat Nov 09 2013 Rex Dieter <rdieter@fedoraproject.org> 5.2.0-0.4.beta1
+* Sat Nov 09 2013 Rex Dieter <rdieter@fedoraproject.org> 5.2.0-0.4.beta31
 - rebuild (arm/qreal)

-* Thu Oct 24 2013 Rex Dieter <rdieter@fedoraproject.org> 5.2.0-0.3.beta1
- 5.2.0-beta1
+* Thu Oct 24 2013 Rex Dieter <rdieter@fedoraproject.org> 5.2.0-0.3.beta31
+- 5.2.0-beta31

 * Wed Oct 16 2013 Rex Dieter <rdieter@fedoraproject.org> 5.2.0-0.2.alpha
 - bootstrap ppc