diff --git a/.gitignore b/.gitignore index da6381c..43857e2 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/qtdeclarative-opensource-src-5.6.1.tar.xz +SOURCES/qtdeclarative-opensource-src-5.6.2.tar.xz diff --git a/.qt5-qtdeclarative.metadata b/.qt5-qtdeclarative.metadata index d07ca22..8285da9 100644 --- a/.qt5-qtdeclarative.metadata +++ b/.qt5-qtdeclarative.metadata @@ -1 +1 @@ -e79365a05d963d92a703f8013fd83608bda832b4 SOURCES/qtdeclarative-opensource-src-5.6.1.tar.xz +61771306a53b1bbeaa8956e0fa884d1b7c013961 SOURCES/qtdeclarative-opensource-src-5.6.2.tar.xz diff --git a/SOURCES/Check-for-NULL-from-glGetString.patch b/SOURCES/Check-for-NULL-from-glGetString.patch index 5d8e04e..bc9f732 100644 --- a/SOURCES/Check-for-NULL-from-glGetString.patch +++ b/SOURCES/Check-for-NULL-from-glGetString.patch @@ -91,26 +91,6 @@ index dcc485c..43e234b 100644 } return useWorkaround; } -diff --git a/src/quick/scenegraph/util/qsgatlastexture.cpp b/src/quick/scenegraph/util/qsgatlastexture.cpp -index 8e8e870..d726907 100644 ---- a/src/quick/scenegraph/util/qsgatlastexture.cpp -+++ b/src/quick/scenegraph/util/qsgatlastexture.cpp -@@ -150,13 +150,13 @@ Atlas::Atlas(const QSize &size) - wrongfullyReportsBgra8888Support = false; - - const char *ext = (const char *) QOpenGLContext::currentContext()->functions()->glGetString(GL_EXTENSIONS); -- if (!wrongfullyReportsBgra8888Support -+ if (!wrongfullyReportsBgra8888Support && ext - && (strstr(ext, "GL_EXT_bgra") - || strstr(ext, "GL_EXT_texture_format_BGRA8888") - || strstr(ext, "GL_IMG_texture_format_BGRA8888"))) { - m_internalFormat = m_externalFormat = GL_BGRA; - #ifdef Q_OS_IOS -- } else if (strstr(ext, "GL_APPLE_texture_format_BGRA8888")) { -+ } else if (ext && strstr(ext, "GL_APPLE_texture_format_BGRA8888")) { - m_internalFormat = GL_RGBA; - m_externalFormat = GL_BGRA; - #endif // IOS -- 1.9.3 diff --git a/SOURCES/qt5-qtdeclarative-5.6.1-only-release-types-when-they-are-not-referenced-anymore.patch b/SOURCES/qt5-qtdeclarative-5.6.1-only-release-types-when-they-are-not-referenced-anymore.patch deleted file mode 100644 index 885da67..0000000 --- a/SOURCES/qt5-qtdeclarative-5.6.1-only-release-types-when-they-are-not-referenced-anymore.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff --git a/src/qml/qml/qqmltypeloader.cpp b/src/qml/qml/qqmltypeloader.cpp -index c684c86..01200fd 100644 ---- a/src/qml/qml/qqmltypeloader.cpp -+++ b/src/qml/qml/qqmltypeloader.cpp -@@ -1961,7 +1961,8 @@ void QQmlTypeLoader::trimCache() - QList unneededTypes; - for (TypeCache::Iterator iter = m_typeCache.begin(), end = m_typeCache.end(); iter != end; ++iter) { - QQmlTypeData *typeData = iter.value(); -- if (typeData->m_compiledData && typeData->m_compiledData->count() == 1) { -+ if (typeData->m_compiledData && typeData->count() == 1 -+ && typeData->m_compiledData->count() == 1) { - // There are no live objects of this type - unneededTypes.append(iter); - } -diff --git a/tests/auto/qml/qqmltypeloader/tst_qqmltypeloader.cpp b/tests/auto/qml/qqmltypeloader/tst_qqmltypeloader.cpp -index 7045c7c..a1eaa05 100644 ---- a/tests/auto/qml/qqmltypeloader/tst_qqmltypeloader.cpp -+++ b/tests/auto/qml/qqmltypeloader/tst_qqmltypeloader.cpp -@@ -86,10 +86,19 @@ void tst_QQMLTypeLoader::trimCache() - url.setQuery(QString::number(i)); - - QQmlTypeData *data = loader.getType(url); -- if (i % 5 == 0) // keep references to some of them so that they aren't trimmed -- data->compiledData()->addref(); -+ // Run an event loop to receive the callback that release()es. -+ QTRY_COMPARE(data->count(), 2); - -- data->release(); -+ // keep references to some of them so that they aren't trimmed. References to either the -+ // QQmlTypeData or its compiledData() should prevent the trimming. -+ if (i % 10 == 0) { -+ // keep ref on data, don't add ref on data->compiledData() -+ } else if (i % 5 == 0) { -+ data->compiledData()->addref(); -+ data->release(); -+ } else { -+ data->release(); -+ } - } - - for (int i = 0; i < 256; ++i) { diff --git a/SOURCES/qtdeclarative-opensource-src-5.6.0-qml_no-lifetime-dse.patch b/SOURCES/qtdeclarative-opensource-src-5.6.0-qml_no-lifetime-dse.patch deleted file mode 100644 index eaf677e..0000000 --- a/SOURCES/qtdeclarative-opensource-src-5.6.0-qml_no-lifetime-dse.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up qtdeclarative-opensource-src-5.6.0/src/qml/qml.pro.1135 qtdeclarative-opensource-src-5.6.0/src/qml/qml.pro ---- qtdeclarative-opensource-src-5.6.0/src/qml/qml.pro.1135 2016-06-02 08:43:24.509068141 -0500 -+++ qtdeclarative-opensource-src-5.6.0/src/qml/qml.pro 2016-06-02 10:25:28.813766581 -0500 -@@ -21,7 +21,7 @@ exists("qqml_enable_gcov") { - - greaterThan(QT_GCC_MAJOR_VERSION, 5) { - # Our code is bad. Temporary workaround. -- QMAKE_CXXFLAGS += -fno-delete-null-pointer-checks -+ QMAKE_CXXFLAGS += -fno-delete-null-pointer-checks -fno-lifetime-dse - } - - QMAKE_DOCS = $$PWD/doc/qtqml.qdocconf diff --git a/SPECS/qt5-qtdeclarative.spec b/SPECS/qt5-qtdeclarative.spec index ca68ffe..28de045 100644 --- a/SPECS/qt5-qtdeclarative.spec +++ b/SPECS/qt5-qtdeclarative.spec @@ -15,17 +15,15 @@ %global nosse2_hack 1 -#define prerelease - Summary: Qt5 - QtDeclarative component Name: qt5-%{qt_module} -Version: 5.6.1 -Release: 10%{?prerelease:.%{prerelease}}%{?dist} +Version: 5.6.2 +Release: 1%{?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/snapshots/qt/5.6/%{version}%{?prerelease:-%{prerelease}}/submodules/%{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}}.tar.xz +Source0: http://download.qt.io/official_releases/qt/5.6/%{version}/submodules/%{qt_module}-opensource-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) # https://codereview.qt-project.org/#change,73710 @@ -38,9 +36,6 @@ Patch2: qtdeclarative-QQuickShaderEffectSource_deadlock.patch ## upstream patches -# https://bugreports.qt.io/browse/QTBUG-53761 -Patch100: qt5-qtdeclarative-5.6.1-only-release-types-when-they-are-not-referenced-anymore.patch - ## upstreamable patches # use system double-conversation %if 0%{?fedora} @@ -50,8 +45,6 @@ BuildRequires: double-conversion-devel Patch200: qtdeclarative-system_doubleconv.patch # https://bugs.kde.org/show_bug.cgi?id=346118#c108 Patch201: qtdeclarative-kdebug346118.patch -# additional i686/qml workaround (on top of existing patch135), https://bugzilla.redhat.com/1331593 -Patch235: qtdeclarative-opensource-src-5.6.0-qml_no-lifetime-dse.patch ## upstream patches under review # Check-for-NULL-from-glGetStrin @@ -64,7 +57,7 @@ BuildRequires: qt5-qtbase-devel >= %{version} BuildRequires: qt5-qtbase-private-devel %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} %if ! 0%{?bootstrap} -BuildRequires: pkgconfig(Qt5XmlPatterns) +BuildRequires: qt5-qtxmlpatterns-devel %endif BuildRequires: python @@ -113,20 +106,17 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %prep -%setup -q -n %{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}} +%setup -q -n %{qt_module}-opensource-src-%{version} %if 0%{?nosse2_hack} %patch1 -p1 -b .no_sse2 %endif %patch2 -p1 -b .QQuickShaderEffectSource_deadlock -%patch100 -p1 -b .only-release-types-when-they-are-not-referenced-anymore - %if 0%{?system_doubleconv} %patch200 -p1 -b .system_doubleconv rm -rfv src/3rdparty/double-conversion %endif %patch201 -p0 -b .kdebug346118 -%patch235 -p1 -b .qml_no-lifetime-dse %patch500 -p1 -b .Check-for-NULL-from-glGetString @@ -194,15 +184,23 @@ popd # nuke .prl reference(s) to %%buildroot, excessive (.la-like) libs pushd %{buildroot}%{_qt5_libdir} for prl_file in libQt5*.prl ; do - sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" ${prl_file} + sed -i \ + -e "/^QMAKE_PRL_BUILD_DIR/d" \ + -e "/-ldouble-conversion/d" \ + ${prl_file} if [ -f "$(basename ${prl_file} .prl).so" ]; then rm -fv "$(basename ${prl_file} .prl).la" - sed -i -e "/^QMAKE_PRL_LIBS/d" ${prl_file} + else + sed -i \ + -e "/^QMAKE_PRL_LIBS/d" \ + -e "/-ldouble-conversion/d" \ + $(basename ${prl_file} .prl).la fi done popd %check +test -z "$(grep double-conversion %{buildroot}%{_qt5_libdir}/*.{la,prl})" %if 0%{?tests} export CTEST_OUTPUT_ON_FAILURE=1 export PATH=%{buildroot}%{_qt5_bindir}:$PATH @@ -264,6 +262,10 @@ make check -k -C %{_target_platform}/tests ||: %changelog +* Wed Jan 11 2017 Jan Grulich - 5.6.2-1 +- Update to 5.6.2 + Resolves: bz#1384817 + * Tue Aug 30 2016 Jan Grulich - 5.6.1-10 - Increase build version to have newer version than in EPEL Resolves: bz#1317400