From 8fb65fe1167da7b0bebc56a6f37d7a5cb1e50012 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 28 Apr 2020 05:02:35 -0400 Subject: [PATCH] import qt5-qttools-5.12.5-1.el8 --- .gitignore | 2 +- .qt5-qttools.metadata | 2 +- SOURCES/qttools-find-clang.patch | 10 ++-- ...ttools-fix-data-files-path-for-tests.patch | 18 +++---- SPECS/qt5-qttools.spec | 49 +++++++++---------- 5 files changed, 39 insertions(+), 42 deletions(-) diff --git a/.gitignore b/.gitignore index fdcc048..5f7da26 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/qttools-everywhere-src-5.11.1.tar.xz +SOURCES/qttools-everywhere-src-5.12.5.tar.xz diff --git a/.qt5-qttools.metadata b/.qt5-qttools.metadata index 0f3d6c3..edb617e 100644 --- a/.qt5-qttools.metadata +++ b/.qt5-qttools.metadata @@ -1 +1 @@ -8643889053c625f40d10189d5d107c55316ce989 SOURCES/qttools-everywhere-src-5.11.1.tar.xz +dddc9b21ebfafc60eb6ae1c567d57e86b855d80b SOURCES/qttools-everywhere-src-5.12.5.tar.xz diff --git a/SOURCES/qttools-find-clang.patch b/SOURCES/qttools-find-clang.patch index 4a75024..3b1903a 100644 --- a/SOURCES/qttools-find-clang.patch +++ b/SOURCES/qttools-find-clang.patch @@ -1,8 +1,8 @@ -diff --git a/mkspecs/features/qt_find_clang.prf b/mkspecs/features/qt_find_clang.prf -index 583cf0e..361ba85 100644 ---- a/mkspecs/features/qt_find_clang.prf -+++ b/mkspecs/features/qt_find_clang.prf -@@ -72,7 +72,7 @@ for(_, $$list(_)) { # just a way to break easily +diff --git a/src/qdoc/configure.pri b/src/qdoc/configure.pri +index 17008c3..8a6f01a 100644 +--- a/src/qdoc/configure.pri ++++ b/src/qdoc/configure.pri +@@ -109,7 +109,7 @@ defineTest(qtConfTest_libclang) { output = $$system("$$llvm_config --version 2>/dev/null") CLANG_VERSION = $$extractVersion($$output) } else { diff --git a/SOURCES/qttools-fix-data-files-path-for-tests.patch b/SOURCES/qttools-fix-data-files-path-for-tests.patch index 81e7cd9..ebe75bb 100644 --- a/SOURCES/qttools-fix-data-files-path-for-tests.patch +++ b/SOURCES/qttools-fix-data-files-path-for-tests.patch @@ -1,5 +1,5 @@ diff --git a/tests/auto/qhelpcontentmodel/tst_qhelpcontentmodel.cpp b/tests/auto/qhelpcontentmodel/tst_qhelpcontentmodel.cpp -index 63ee55c..09dfa2e 100644 +index 039ea2f..514578a 100644 --- a/tests/auto/qhelpcontentmodel/tst_qhelpcontentmodel.cpp +++ b/tests/auto/qhelpcontentmodel/tst_qhelpcontentmodel.cpp @@ -84,12 +84,12 @@ private: @@ -19,7 +19,7 @@ index 63ee55c..09dfa2e 100644 QFile f(m_colFile); f.setPermissions(QFile::WriteUser|QFile::ReadUser); diff --git a/tests/auto/qhelpenginecore/tst_qhelpenginecore.cpp b/tests/auto/qhelpenginecore/tst_qhelpenginecore.cpp -index 4793250..2398e83 100644 +index ba2b153..7f42a8e 100644 --- a/tests/auto/qhelpenginecore/tst_qhelpenginecore.cpp +++ b/tests/auto/qhelpenginecore/tst_qhelpenginecore.cpp @@ -81,14 +81,14 @@ private: @@ -100,7 +100,7 @@ index 4793250..2398e83 100644 QCOMPARE(c.documentationFileName(QLatin1String("trolltech.com.3-3-8.qmake")), - QString(m_path + "/data/qmake-3.3.8.qch")); + QString(m_path + "qmake-3.3.8.qch")); - QCOMPARE(c.documentationFileName(QLatin1String("trolltech.com.1-0-0.test")), + QCOMPARE(c.documentationFileName(QLatin1String("trolltech.com.1.0.0.test")), - QString(m_path + "/data/test.qch")); + QString(m_path + "test.qch")); QCOMPARE(c.documentationFileName(QLatin1String("trolltech.com.empty")), @@ -108,7 +108,7 @@ index 4793250..2398e83 100644 } @@ -367,7 +367,7 @@ void tst_QHelpEngineCore::fileData() QCOMPARE(ba.size(), 0); - ba = help.fileData(QUrl("qthelp://trolltech.com.1-0-0.test/testFolder/test.html")); + ba = help.fileData(QUrl("qthelp://trolltech.com.1.0.0.test/testFolder/test.html")); QTextStream s(ba, QIODevice::ReadOnly|QIODevice::Text); - QFile f(m_path + "/data/test.html"); + QFile f(m_path + "test.html"); @@ -128,7 +128,7 @@ index 4793250..2398e83 100644 } diff --git a/tests/auto/qhelpgenerator/tst_qhelpgenerator.cpp b/tests/auto/qhelpgenerator/tst_qhelpgenerator.cpp -index 10cfff9..fdb3b93 100644 +index 47a879d..99f4615 100644 --- a/tests/auto/qhelpgenerator/tst_qhelpgenerator.cpp +++ b/tests/auto/qhelpgenerator/tst_qhelpgenerator.cpp @@ -57,8 +57,8 @@ private: @@ -167,8 +167,8 @@ index 10cfff9..fdb3b93 100644 if (!data.readData(inputFile)) QFAIL("Cannot read qhp file!"); - QHelpGenerator generator1; - QHelpGenerator generator2; + HelpGenerator generator1; + HelpGenerator generator2; - QString outputFile1 = path + QLatin1String("/data/test1.qch"); - QString outputFile2 = path + QLatin1String("/data/test2.qch"); + QString outputFile1 = path + QLatin1String("test1.qch"); @@ -177,7 +177,7 @@ index 10cfff9..fdb3b93 100644 QCOMPARE(generator2.generate(&data, outputFile2), true); diff --git a/tests/auto/qhelpindexmodel/tst_qhelpindexmodel.cpp b/tests/auto/qhelpindexmodel/tst_qhelpindexmodel.cpp -index 494355c..4e1c015 100644 +index 713c229..65ee62f 100644 --- a/tests/auto/qhelpindexmodel/tst_qhelpindexmodel.cpp +++ b/tests/auto/qhelpindexmodel/tst_qhelpindexmodel.cpp @@ -84,12 +84,12 @@ private: @@ -197,7 +197,7 @@ index 494355c..4e1c015 100644 QFile f(m_colFile); f.setPermissions(QFile::WriteUser|QFile::ReadUser); diff --git a/tests/auto/qhelpprojectdata/tst_qhelpprojectdata.cpp b/tests/auto/qhelpprojectdata/tst_qhelpprojectdata.cpp -index 3686416..bb507fa 100644 +index a09135d..d59a3fc 100644 --- a/tests/auto/qhelpprojectdata/tst_qhelpprojectdata.cpp +++ b/tests/auto/qhelpprojectdata/tst_qhelpprojectdata.cpp @@ -52,8 +52,8 @@ private: diff --git a/SPECS/qt5-qttools.spec b/SPECS/qt5-qttools.spec index d2ae6e5..894401c 100644 --- a/SPECS/qt5-qttools.spec +++ b/SPECS/qt5-qttools.spec @@ -1,12 +1,11 @@ %global qt_module qttools -%global qdoc 1 %global build_tests 1 Summary: Qt5 - QtTool components Name: qt5-qttools -Version: 5.11.1 -Release: 9%{?dist} +Version: 5.12.5 +Release: 1%{?dist} License: LGPLv3 or LGPLv2 Url: http://www.qt.io @@ -43,11 +42,9 @@ BuildRequires: qt5-qtbase-private-devel BuildRequires: qt5-qtbase-static >= %{version} # libQt5DBus.so.5(Qt_5_PRIVATE_API) %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} -%if 0%{?qdoc} # for qdoc BuildRequires: clang BuildRequires: clang-devel -%endif BuildRequires: qt5-qtdeclarative-static >= %{version} BuildRequires: pkgconfig(Qt5Qml) @@ -196,7 +193,7 @@ export LLVM_INSTALL_DIR=/usr %{qmake_qt5} -make %{?_smp_mflags} +%make_build %if 0%{?build_tests} make sub-tests %{?_smp_mflags} -k ||: @@ -207,22 +204,15 @@ make install INSTALL_ROOT=%{buildroot} %if 0%{?build_tests} # Install tests for gating -pushd tests -make install INSTALL_ROOT=%{buildroot} -popd - -mkdir -p %{buildroot}%{_qt5_libdir}/qt5/tests/tst_{lconvert,qhelpcontentmodel,qhelpenginecore,qhelpgenerator,qhelpindexmodel,qhelpprojectdata}/data -mkdir -p %{buildroot}%{_qt5_libdir}/qt5/tests/tst_{lrelease,lupdate,qtattributionsscanner}/testdata -# FIXME install doesn't seem to work well with directories -cp -r tests/auto/linguist/lconvert/data/* %{buildroot}%{_qt5_libdir}/qt5/tests/tst_lconvert/data -cp -r tests/auto/linguist/lrelease/testdata/* %{buildroot}%{_qt5_libdir}/qt5/tests/tst_lrelease/testdata -cp -r tests/auto/linguist/lupdate/testdata/* %{buildroot}%{_qt5_libdir}/qt5/tests/tst_lupdate/testdata -cp -r tests/auto/qhelpcontentmodel/data/* %{buildroot}%{_qt5_libdir}/qt5/tests/tst_qhelpcontentmodel/data -cp -r tests/auto/qhelpenginecore/data/* %{buildroot}%{_qt5_libdir}/qt5/tests/tst_qhelpenginecore/data -cp -r tests/auto/qhelpgenerator/data/* %{buildroot}%{_qt5_libdir}/qt5/tests/tst_qhelpgenerator/data -cp -r tests/auto/qhelpindexmodel/data/* %{buildroot}%{_qt5_libdir}/qt5/tests/tst_qhelpindexmodel/data -cp -r tests/auto/qhelpprojectdata/data/* %{buildroot}%{_qt5_libdir}/qt5/tests/tst_qhelpprojectdata/data -cp -r tests/auto/qtattributionsscanner/testdata/* %{buildroot}%{_qt5_libdir}/qt5/tests/tst_qtattributionsscanner/testdata +mkdir -p %{buildroot}%{_qt5_libdir}/qt5 +find ./tests -not -path '*/\.*' -type d | while read LINE +do + mkdir -p "%{buildroot}%{_qt5_libdir}/qt5/$LINE" +done +find ./tests -not -path '*/\.*' -not -name 'uic_wrapper.sh' -not -name 'Makefile' -not -name 'target_wrapper.sh' -type f | while read LINE +do + cp -r --parents "$LINE" %{buildroot}%{_qt5_libdir}/qt5/ +done %endif # Add desktop files, --vendor=... helps avoid possible conflicts with qt3/qt4 @@ -363,11 +353,11 @@ fi %endif %files -n qt5-doctools -%if 0%{?qdoc} %{_bindir}/qdoc* %{_qt5_bindir}/qdoc* -%endif +%{_bindir}/qdistancefieldgenerator* %{_bindir}/qhelpgenerator* +%{_qt5_bindir}/qdistancefieldgenerator* %{_qt5_bindir}/qhelpgenerator* %{_bindir}/qtattributionsscanner-qt5 %{_qt5_bindir}/qtattributionsscanner* @@ -457,13 +447,13 @@ fi %files devel %{_bindir}/pixeltool* %{_bindir}/qcollectiongenerator* -%{_bindir}/qhelpconverter* +#%{_bindir}/qhelpconverter* %{_bindir}/qtdiag* %{_bindir}/qtplugininfo* %{_qt5_bindir}/pixeltool* %{_qt5_bindir}/qtdiag* %{_qt5_bindir}/qcollectiongenerator* -%{_qt5_bindir}/qhelpconverter* +#%{_qt5_bindir}/qhelpconverter* %{_qt5_bindir}/qtplugininfo* %{_qt5_headerdir}/QtDesigner/ %{_qt5_headerdir}/QtDesignerComponents/ @@ -473,12 +463,15 @@ fi %{_qt5_libdir}/libQt5Designer*.so %{_qt5_libdir}/libQt5Help.prl %{_qt5_libdir}/libQt5Help.so +%{_qt5_libdir}/Qt5UiPlugin.la +%{_qt5_libdir}/libQt5UiPlugin.prl %{_qt5_libdir}/cmake/Qt5Designer/Qt5DesignerConfig*.cmake %dir %{_qt5_libdir}/cmake/Qt5Help/ %{_qt5_libdir}/cmake/Qt5Help/Qt5HelpConfig*.cmake %{_qt5_libdir}/cmake/Qt5UiPlugin/ %{_qt5_libdir}/pkgconfig/Qt5Designer.pc %{_qt5_libdir}/pkgconfig/Qt5Help.pc +%{_qt5_libdir}/pkgconfig/Qt5UiPlugin.pc %{_qt5_archdatadir}/mkspecs/modules/qt_lib_designer.pri %{_qt5_archdatadir}/mkspecs/modules/qt_lib_designer_private.pri %{_qt5_archdatadir}/mkspecs/modules/qt_lib_designercomponents_private.pri @@ -507,6 +500,10 @@ fi %endif %changelog +* Thu Nov 07 2019 Jan Grulich - 5.12.5-1 +- 5.12.5 + Resolves: bz#1733152 + * Fri Jun 07 2019 Jan Grulich - 5.11.1-9 - Fix unit tests for gating Resolves: bz#1681905