- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.gitignore

@@ -1,8 +1,4 @@
-/qtdeclarative-opensource-src-5.5.1.tar.xz
+/qtdeclarative-everywhere-src-5.11.3.tar.xz
-/qtdeclarative-opensource-src-5.6.0-beta1.tar.xz
+/qtdeclarative-everywhere-src-5.12.1.tar.xz
-/qtdeclarative-opensource-src-5.6.0-beta.tar.gz
+/qtdeclarative-everywhere-src-5.12.3.tar.xz
-/qtdeclarative-opensource-src-5.6.0-rc.tar.xz
+/qtdeclarative-everywhere-src-5.12.4.tar.xz
-/qtdeclarative-opensource-src-5.6.0.tar.xz
-/qtdeclarative-opensource-src-5.6.1.tar.xz
-/qtdeclarative-opensource-src-5.7.0.tar.xz
-/qtdeclarative-opensource-src-5.7.1.tar.xz

qt5-qtdeclarative-bz#1120451-persian-keyboard.patch

@@ -1,94 +0,0 @@
-diff -up qtdeclarative-opensource-src-5.7.1/src/quick/items/qquicktextcontrol.cpp.bz#1120451 qtdeclarative-opensource-src-5.7.1/src/quick/items/qquicktextcontrol.cpp
---- qtdeclarative-opensource-src-5.7.1/src/quick/items/qquicktextcontrol.cpp.bz#1120451	2016-11-11 07:18:01.000000000 +0100
-+++ qtdeclarative-opensource-src-5.7.1/src/quick/items/qquicktextcontrol.cpp	2017-07-19 17:19:18.253590767 +0200
-@@ -608,7 +608,7 @@ void QQuickTextControl::clear()
- }
- 
- QQuickTextControl::QQuickTextControl(QTextDocument *doc, QObject *parent)
--    : QObject(*new QQuickTextControlPrivate, parent)
-+    : QInputControl(TextEdit, *new QQuickTextControlPrivate, parent)
- {
-     Q_D(QQuickTextControl);
-     Q_ASSERT(doc);
-@@ -980,9 +980,8 @@ void QQuickTextControlPrivate::keyPressE
- 
- process:
-     {
--        QString text = e->text();
--        if (!text.isEmpty() && (text.at(0).isPrint() || text.at(0) == QLatin1Char('\t'))) {
--            cursor.insertText(text);
-+        if (q->isAcceptableInput(e)) {
-+            cursor.insertText(e->text());
-             selectionChanged();
-         } else {
-             e->ignore();
-diff -up qtdeclarative-opensource-src-5.7.1/src/quick/items/qquicktextcontrol_p.h.bz#1120451 qtdeclarative-opensource-src-5.7.1/src/quick/items/qquicktextcontrol_p.h
---- qtdeclarative-opensource-src-5.7.1/src/quick/items/qquicktextcontrol_p.h.bz#1120451	2016-11-11 07:18:01.000000000 +0100
-+++ qtdeclarative-opensource-src-5.7.1/src/quick/items/qquicktextcontrol_p.h	2017-07-19 17:19:18.253590767 +0200
-@@ -59,6 +59,7 @@
- #include <QtGui/qabstracttextdocumentlayout.h>
- #include <QtGui/qtextdocumentfragment.h>
- #include <QtGui/qclipboard.h>
-+#include <QtGui/private/qinputcontrol_p.h>
- #include <QtCore/qmimedata.h>
- 
- QT_BEGIN_NAMESPACE
-@@ -71,7 +72,7 @@ class QAbstractScrollArea;
- class QEvent;
- class QTimerEvent;
- 
--class Q_AUTOTEST_EXPORT QQuickTextControl : public QObject
-+class Q_AUTOTEST_EXPORT QQuickTextControl : public QInputControl
- {
-     Q_OBJECT
-     Q_DECLARE_PRIVATE(QQuickTextControl)
-diff -up qtdeclarative-opensource-src-5.7.1/src/quick/items/qquicktextinput.cpp.bz#1120451 qtdeclarative-opensource-src-5.7.1/src/quick/items/qquicktextinput.cpp
---- qtdeclarative-opensource-src-5.7.1/src/quick/items/qquicktextinput.cpp.bz#1120451	2016-11-11 07:18:01.000000000 +0100
-+++ qtdeclarative-opensource-src-5.7.1/src/quick/items/qquicktextinput.cpp	2017-07-19 17:20:55.479933008 +0200
-@@ -63,6 +63,7 @@
- #endif
- 
- #include <QtGui/private/qtextengine_p.h>
-+#include <QtGui/private/qinputcontrol_p.h>
- 
- QT_BEGIN_NAMESPACE
- 
-@@ -2619,6 +2620,7 @@ void QQuickTextInputPrivate::init()
-         option.setUseDesignMetrics(renderType != QQuickTextInput::NativeRendering);
-         m_textLayout.setTextOption(option);
-     }
-+    m_inputControl = new QInputControl(QInputControl::LineEdit, q);
- }
- 
- void QQuickTextInputPrivate::resetInputMethod()
-@@ -4452,9 +4454,8 @@ void QQuickTextInputPrivate::processKeyE
-     }
- 
-     if (unknown && !m_readOnly) {
--        QString t = event->text();
--        if (!t.isEmpty() && t.at(0).isPrint()) {
--            insert(t);
-+        if (m_inputControl->isAcceptableInput(event)) {
-+            insert(event->text());
-             event->accept();
-             return;
-         }
-diff -up qtdeclarative-opensource-src-5.7.1/src/quick/items/qquicktextinput_p_p.h.bz#1120451 qtdeclarative-opensource-src-5.7.1/src/quick/items/qquicktextinput_p_p.h
---- qtdeclarative-opensource-src-5.7.1/src/quick/items/qquicktextinput_p_p.h.bz#1120451	2016-11-11 07:18:01.000000000 +0100
-+++ qtdeclarative-opensource-src-5.7.1/src/quick/items/qquicktextinput_p_p.h	2017-07-19 17:19:18.254590729 +0200
-@@ -70,6 +70,7 @@
- QT_BEGIN_NAMESPACE
- 
- class QQuickTextNode;
-+class QInputControl;
- 
- class Q_QUICK_PRIVATE_EXPORT QQuickTextInputPrivate : public QQuickImplicitSizeItemPrivate
- {
-@@ -227,6 +228,7 @@ public:
-     QQuickItem *cursorItem;
-     QQuickTextNode *textNode;
-     MaskInputData *m_maskData;
-+    QInputControl *m_inputControl;
- 
-     QList<int> m_transactions;
-     QVector<Command> m_history;

qt5-qtdeclarative.spec

@@ -1,67 +1,46 @@
 %global qt_module qtdeclarative
 
-# define to build docs, need to undef this for bootstrapping
+# definition borrowed from qtbase
-# where qt5-qttools builds are not yet available
+%global multilib_archs x86_64 %{ix86} %{?mips} ppc64 ppc s390x s390 sparc64 sparcv9
-# only primary archs (for now), allow secondary to bootstrap
+
 #global bootstrap 1
 
-%if ! 0%{?bootstrap}
-%ifarch %{arm} %{ix86} x86_64
-%global docs 1
-#global tests 1
-%endif
-%endif
-
-%ifarch %{ix86}
-%global nosse2_hack 1
-## TODO:
-# * consider debian's approach of runtime detection instead:
-#   https://codereview.qt-project.org/#/c/127354/
-%endif
-
 Summary: Qt5 - QtDeclarative component
 Name:    qt5-%{qt_module}
-Version: 5.7.1
+Version: 5.12.4
-Release: 9%{?dist}
+Release: 3%{?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.7/%{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
 
-# support no_sse2 CONFIG (fedora i686 builds cannot assume -march=pentium4 -msse2 -mfpmath=sse flags, or the JIT that needs them)
+# header file to workaround multilib issue
-# https://codereview.qt-project.org/#change,73710
+# https://bugzilla.redhat.com/show_bug.cgi?id=1441343
-Patch1: qtdeclarative-opensource-src-5.7.0-no_sse2.patch
+Source5: qv4global_p-multilib.h
-
-# 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
-# use system double-conversation
-# https://bugs.kde.org/show_bug.cgi?id=346118#c108
-Patch201: qtdeclarative-kdebug346118.patch
-
-# backport fix to accept PUA characters, ZWNJ and ZWJ as input in TextInput/Edit
-# qtdeclarative needs qt5-qtbase >= %{version}-20 due to the change
-# in the privat header files to support PUA characters, ZWNJ and ZWJ as input in TextInput/Edit
-Patch202: qt5-qtdeclarative-bz#1120451-persian-keyboard.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: 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: python%{python3_pkgversion}
-BuildRequires: qt5-qtxmlpatterns-devel
+
+%if 0%{?bootstrap}
+Obsoletes: %{name}-examples < %{version}-%{release}
+%global no_examples CONFIG-=compile_examples
 %endif
-BuildRequires: python
 
 %if 0%{?tests}
 BuildRequires: dbus-x11
@@ -70,13 +49,13 @@ BuildRequires: time
 BuildRequires: xorg-x11-server-Xvfb
 %endif
 
-
 %description
 %{summary}.
 
 %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}
@@ -89,18 +68,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
-BuildArch: noarch
-%description doc
-%{summary}.
-%endif
-
 %package examples
 Summary: Programming examples for %{name}
 Requires: %{name}%{?_isa} = %{version}-%{release}
@@ -109,45 +76,28 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 
 
 %prep
-%setup -q -n %{qt_module}-opensource-src-%{version}
+%autosetup -n %{qt_module}-everywhere-src-%{version}
-%if 0%{?nosse2_hack}
+
-%patch1 -p1 -b .no_sse2
-%endif
-%patch2 -p1 -b .QQuickShaderEffectSource_deadlock
-%patch201 -p0 -b .kdebug346118
-%patch202 -p1 -b .bz#1120451
 
 %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
 
-%{qmake_qt5}
+# HACK so calls to "python" get what we want
+ln -s %{__python3} python
+export PATH=`pwd`:$PATH
 
-make %{?_smp_mflags}
+%qmake_qt5
 
-%if 0%{?docs}
+%make_build
-make %{?_smp_mflags} docs
-%endif
 
 
 %install
-make install INSTALL_ROOT=%{buildroot}
+%make_install INSTALL_ROOT=%{buildroot}
 
-%if 0%{?nosse2_hack}
+%ifarch %{multilib_archs}
-mkdir -p %{buildroot}%{_qt5_libdir}/sse2
+# multilib: qv4global_p.h
-mv %{buildroot}%{_qt5_libdir}/libQt5Qml.so.5* %{buildroot}%{_qt5_libdir}/sse2/
+  mv %{buildroot}%{_qt5_headerdir}/QtQml/%{version}/QtQml/private/qv4global_p.h \
-make install INSTALL_ROOT=%{buildroot} -C %{_target_platform}-no_sse2/src/qml
+     %{buildroot}%{_qt5_headerdir}/QtQml/%{version}/QtQml/private/qv4global_p-%{__isa_bits}.h
-%endif
+  install -p -m644 -D %{SOURCE5} %{buildroot}%{_qt5_headerdir}/QtQml/%{version}/QtQml/private/qv4global_p.h
-
-%if 0%{?docs}
-make install_docs INSTALL_ROOT=%{buildroot}
 %endif
 
 # hardlink files to %{_bindir}, add -qt5 postfix to not conflict
@@ -197,19 +147,15 @@ make check -k -C tests ||:
 %endif
 
 
-%post -p /sbin/ldconfig
+%ldconfig_scriptlets
-%postun -p /sbin/ldconfig
 
 %files
-%{!?_licensedir:%global license %%doc}
+%license LICENSE.LGPL*
-%license LICENSE.LGPL* LGPL_EXCEPTION.txt
 %{_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/
@@ -226,6 +172,7 @@ make check -k -C tests ||:
 %{_qt5_libdir}/cmake/Qt5*/Qt5*Config*.cmake
 %{_qt5_libdir}/pkgconfig/Qt5*.pc
 %{_qt5_archdatadir}/mkspecs/modules/*.pri
+%{_qt5_archdatadir}/mkspecs/features/*.prf
 %dir %{_qt5_libdir}/cmake/Qt5Qml/
 %{_qt5_libdir}/cmake/Qt5Qml/Qt5Qml_*Factory.cmake
 
@@ -237,29 +184,140 @@ make check -k -C tests ||:
 %{_qt5_libdir}/libQt5QmlDebug.a
 %{_qt5_libdir}/libQt5QmlDebug.prl
 
-%if 0%{?docs}
+%if ! 0%{?no_examples:1}
-%files doc
-%license LICENSE.FDL
-%{_qt5_docdir}/qtqml.qch
-%{_qt5_docdir}/qtqml/
-%{_qt5_docdir}/qtquick.qch
-%{_qt5_docdir}/qtquick/
-%endif
-
 %files examples
 %{_qt5_examplesdir}/
+%endif
 
 
 %changelog
-* Wed Jul 19 2017 Than Ngo <than@redhat.com> - 5.7.1-9
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.12.4-3
-- backported to fix bz#1120451, accept PUA characters, ZWNJ and ZWJ
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-  as input in TextInput/Edit
 
-* Fri Jun 16 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.7.1-8
+* Tue Jul 16 2019 Rex Dieter <rdieter@fedoraproject.org> - 5.12.4-2
-- (branch backport): drop shadow/out-of-tree builds (#1456211,QTBUG-37417)
+- build with python3
 
-* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5.7.1-7
+* Fri Jun 14 2019 Jan Grulich <jgrulich@redhat.com> - 5.12.4-1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+- 5.12.4
+
+* Tue Jun 04 2019 Jan Grulich <jgrulich@redhat.com> - 5.12.3-1
+- 5.12.3
+
+* Fri Mar 15 2019 Rex Dieter <rdieter@fedoraproject.org> - 5.12.1-2
+- de-bootstrap
+
+* 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)
+
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.11.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* 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
@@ -341,29 +399,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
+* Mon Dec 21 2015 Rex Dieter <rdieter@fedoraproject.org> 5.6.0-0.5.beta3
-- fix Source URL, Release: tag
+- 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)
@@ -422,11 +480,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
+* Sat Oct 18 2014 Rex Dieter <rdieter@fedoraproject.org> - 5.4.0-0.1.beta3
-- 5.4.0-beta
+- 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
@@ -478,14 +536,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
+* Thu Oct 24 2013 Rex Dieter <rdieter@fedoraproject.org> 5.2.0-0.3.beta31
-- 5.2.0-beta1
+- 5.2.0-beta31
 
 * Wed Oct 16 2013 Rex Dieter <rdieter@fedoraproject.org> 5.2.0-0.2.alpha
 - bootstrap ppc

qtdeclarative-QQuickShaderEffectSource_deadlock.patch

@@ -1,15 +0,0 @@
---- qtdeclarative-opensource-src-5.4.2/src/quick/items/qquickshadereffectsource.cpp	2015-06-30 07:30:51.938794778 +0200
-+++ qtdeclarative-opensource-src-5.4.2/src/quick/items/qquickshadereffectsource.cpp.orig	2015-06-30 07:29:47.019163937 +0200
-@@ -632,8 +632,12 @@ 
- 
-     const QSize minTextureSize = d->sceneGraphContext()->minimumFBOSize();
-     // Keep power-of-two by doubling the size.
-+    if (textureSize.width() < 1)
-+       textureSize.rwidth() = 1;
-     while (textureSize.width() < minTextureSize.width())
-         textureSize.rwidth() *= 2;
-+    if (textureSize.height() < 1)
-+       textureSize.rheight() = 1;
-     while (textureSize.height() < minTextureSize.height())
-         textureSize.rheight() *= 2;
- 

qtdeclarative-kdebug346118.patch

@@ -1,19 +0,0 @@
---- src/qml/util/qqmladaptormodel.cpp.orig	2016-05-27 17:06:31.192332166 -0300
-+++ src/qml/util/qqmladaptormodel.cpp	2016-05-27 18:37:27.764552053 -0300
-@@ -163,8 +163,14 @@ public:
-                 signalIndexes.append(propertyId + signalOffset);
-         }
- 
--        for (int i = 0, c = items.count();  i < c; ++i) {
--            QQmlDelegateModelItem *item = items.at(i);
-+        const QList<QQmlDelegateModelItem *> copy = items;
-+        for (int i = 0, c = copy.count();  i < c; ++i) {
-+            // Applying the same logic used in QQmlDelegateModel::_q_itemsRemoved().
-+            QQmlDelegateModelItem *item = copy.at(i);
-+            if (!items.contains(item)) {
-+                continue;
-+            }
-+
-             const int idx = item->modelIndex();
-             if (idx >= index && idx < index + count) {
-                 for (int i = 0; i < signalIndexes.count(); ++i)

qtdeclarative-opensource-src-5.7.0-no_sse2.patch

@@ -1,36 +0,0 @@
---- qtdeclarative-opensource-src-5.7.0/src/qml/jsruntime/qv4global_p.h	2016-06-11 14:05:08.000000000 +0200
-+++ qtdeclarative-opensource-src-5.7.0/src/qml/jsruntime/qv4global_p.h.new	2016-07-15 21:17:04.313953097 +0200
-@@ -91,7 +91,7 @@
- //
- // NOTE: This should match the logic in qv4targetplatform_p.h!
- 
--#if defined(Q_PROCESSOR_X86) && !defined(__ILP32__) \
-+#if defined(Q_PROCESSOR_X86) && !defined(__ILP32__) && defined(__SSE2__) \
-     && (defined(Q_OS_WIN) || defined(Q_OS_LINUX) || defined(Q_OS_QNX) || defined(Q_OS_FREEBSD))
- #  define V4_ENABLE_JIT
- #elif defined(Q_PROCESSOR_X86_64) && !defined(__ILP32__) \
---- qtdeclarative-opensource-src-5.7.0/src/qml/jsruntime/jsruntime.pri	2016-06-11 14:05:08.000000000 +0200
-+++ qtdeclarative-opensource-src-5.7.0/src/qml/jsruntime/jsruntime.pri.new	2016-07-15 21:13:37.519119496 +0200
-@@ -108,6 +108,11 @@
-     $$PWD/qv4string.cpp \
-     $$PWD/qv4value.cpp
- 
-+linux-g++*:isEqual(QT_ARCH,i386):!no_sse2 {
-+    QMAKE_CFLAGS += -msse2 -mfpmath=sse
-+    QMAKE_CXXFLAGS += -msse2 -mfpmath=sse
-+}
-+
- valgrind {
-     DEFINES += V4_USE_VALGRIND
- }
---- qtdeclarative-opensource-src-5.7.0/src/qml/qml/v8/qv8engine.cpp	2016-06-11 14:05:08.000000000 +0200
-+++ qtdeclarative-opensource-src-5.7.0/src/qml/qml/v8/qv8engine.cpp.new	2016-07-15 21:18:37.202327536 +0200
-@@ -130,7 +130,7 @@
-     , m_xmlHttpRequestData(0)
-     , m_listModelData(0)
- {
--#ifdef Q_PROCESSOR_X86_32
-+#if defined(Q_PROCESSOR_X86_32) && defined(__SSE2__)
-     if (!qCpuHasFeature(SSE2)) {
-         qFatal("This program requires an X86 processor that supports SSE2 extension, at least a Pentium 4 or newer");
-     }

qv4global_p-multilib.h

@@ -0,0 +1,23 @@
+/* qvglobal_p.h */
+/* This file is here to prevent a file conflict on multiarch systems.  A
+ * conflict will occur because qconfig.h has arch-specific definitions.
+ *
+ * DO NOT INCLUDE THE NEW FILE DIRECTLY -- ALWAYS INCLUDE THIS ONE INSTEAD. */
+
+#ifndef MULTILIB_QV4GLOBAL_H
+#define MULTILIB_QV4GLOBAL_H
+
+#ifndef __WORDSIZE
+#include <bits/wordsize.h>
+#endif
+
+#if __WORDSIZE == 32
+#include <private/qv4global_p-32.h>
+#elif __WORDSIZE == 64
+#include <private/qv4global_p-64.h>
+#else
+#error "unexpected value for __WORDSIZE macro"
+#endif
+
+#endif
+

sources

@@ -1 +1 @@
-SHA512 (qtdeclarative-opensource-src-5.7.1.tar.xz) = 8c56099a13103f4831a7ceb29223722c1f8efb0e9a87a4c1fdf0b55a3c5b4cedfdac6e06960ea5d03df4184b3d1c6bc3f21bdcdbd2400591143930aa8e32a2ab
+SHA512 (qtdeclarative-everywhere-src-5.12.4.tar.xz) = 953b0dac76b73a7a21b393ab88718da12d77dfc688dc07c55c96ea1658bc14acd9097bef60df4a95d2923d3fb1e02b46499c032aa53844d4fd344b0037514671