diff --git a/.gitignore b/.gitignore index f8c6a12..5bca863 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/qttools-everywhere-opensource-src-5.15.9.tar.xz +SOURCES/qttools-everywhere-opensource-src-5.15.15.tar.xz diff --git a/.qt5-qttools.metadata b/.qt5-qttools.metadata index 90036e8..d98518b 100644 --- a/.qt5-qttools.metadata +++ b/.qt5-qttools.metadata @@ -1 +1 @@ -f2252757e6eadbdb34995bbef404db12ff76c62c SOURCES/qttools-everywhere-opensource-src-5.15.9.tar.xz +5d4718c0f11d3f4924fa5827dc8e631f7fe579cf SOURCES/qttools-everywhere-opensource-src-5.15.15.tar.xz diff --git a/SOURCES/qttools-fix-data-files-path-for-tests.patch b/SOURCES/qttools-fix-data-files-path-for-tests.patch deleted file mode 100644 index ebe75bb..0000000 --- a/SOURCES/qttools-fix-data-files-path-for-tests.patch +++ /dev/null @@ -1,213 +0,0 @@ -diff --git a/tests/auto/qhelpcontentmodel/tst_qhelpcontentmodel.cpp b/tests/auto/qhelpcontentmodel/tst_qhelpcontentmodel.cpp -index 039ea2f..514578a 100644 ---- a/tests/auto/qhelpcontentmodel/tst_qhelpcontentmodel.cpp -+++ b/tests/auto/qhelpcontentmodel/tst_qhelpcontentmodel.cpp -@@ -84,12 +84,12 @@ private: - void tst_QHelpContentModel::init() - { - // defined in profile -- QString path = QLatin1String(SRCDIR); -+ QString path = QFINDTESTDATA("data/"); - -- m_colFile = path + QLatin1String("/data/col.qhc"); -+ m_colFile = path + QLatin1String("col.qhc"); - if (QFile::exists(m_colFile)) - QDir::current().remove(m_colFile); -- if (!QFile::copy(path + "/data/collection.qhc", m_colFile)) -+ if (!QFile::copy(path + "collection.qhc", m_colFile)) - QFAIL("Cannot copy file!"); - 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 ba2b153..7f42a8e 100644 ---- a/tests/auto/qhelpenginecore/tst_qhelpenginecore.cpp -+++ b/tests/auto/qhelpenginecore/tst_qhelpenginecore.cpp -@@ -81,14 +81,14 @@ private: - void tst_QHelpEngineCore::init() - { - // defined in profile -- m_path = QLatin1String(SRCDIR); -+ m_path = QFINDTESTDATA("data/"); - - m_path = QFileInfo(m_path).absoluteFilePath(); - -- m_colFile = m_path + QLatin1String("/data/col.qhc"); -+ m_colFile = m_path + QLatin1String("col.qhc"); - if (QFile::exists(m_colFile)) - QDir::current().remove(m_colFile); -- if (!QFile::copy(m_path + "/data/collection.qhc", m_colFile)) -+ if (!QFile::copy(m_path + "collection.qhc", m_colFile)) - QFAIL("Cannot copy file!"); - QFile f(m_colFile); - f.setPermissions(QFile::WriteUser|QFile::ReadUser); -@@ -111,7 +111,7 @@ void tst_QHelpEngineCore::setCollectionFile() - QHelpEngineCore help(m_colFile, 0); - QCOMPARE(help.collectionFile(), QFileInfo(m_colFile).absoluteFilePath()); - -- QString col1File = m_path + QLatin1String("/data/collection1.qhc"); -+ QString col1File = m_path + QLatin1String("collection1.qhc"); - help.setCollectionFile(col1File); - QCOMPARE(help.collectionFile(), QFileInfo(col1File).absoluteFilePath()); - -@@ -125,7 +125,7 @@ void tst_QHelpEngineCore::copyCollectionFile() - QHelpEngineCore help(m_colFile, 0); - QCOMPARE(help.collectionFile(), QFileInfo(m_colFile).absoluteFilePath()); - -- QString copiedFile = m_path + QLatin1String("/collectionCopy.qhc"); -+ QString copiedFile = m_path + QLatin1String("collectionCopy.qhc"); - if (QFile::exists(copiedFile)) - QDir::current().remove(copiedFile); - -@@ -165,7 +165,7 @@ void tst_QHelpEngineCore::copyCollectionFile() - while (m_query->next()) { - if (i == 0) { - QCOMPARE(m_query->value(0).toString(), QString("trolltech.com.3-3-8.qmake")); -- QCOMPARE(m_query->value(1).toString(), QString("data/qmake-3.3.8.qch")); -+ QCOMPARE(m_query->value(1).toString(), QString("qmake-3.3.8.qch")); - } - ++i; - } -@@ -179,9 +179,9 @@ void tst_QHelpEngineCore::copyCollectionFile() - - void tst_QHelpEngineCore::namespaceName() - { -- QCOMPARE(QHelpEngineCore::namespaceName(m_path + "/data/qmake-3.3.8.qch"), -+ QCOMPARE(QHelpEngineCore::namespaceName(m_path + "qmake-3.3.8.qch"), - QString("trolltech.com.3-3-8.qmake")); -- QCOMPARE(QHelpEngineCore::namespaceName(m_path + "/data/linguist-3.3.8.qch"), -+ QCOMPARE(QHelpEngineCore::namespaceName(m_path + "linguist-3.3.8.qch"), - QString("trolltech.com.3-3-8.linguist")); - } - -@@ -206,11 +206,11 @@ void tst_QHelpEngineCore::registerDocumentation() - { - QHelpEngineCore c(m_colFile); - QCOMPARE(c.setupData(), true); -- c.registerDocumentation(m_path + "/data/qmake-3.3.8.qch"); -+ c.registerDocumentation(m_path + "qmake-3.3.8.qch"); - QCOMPARE(c.registeredDocumentations().count(), 1); -- c.registerDocumentation(m_path + "/data/qmake-3.3.8.qch"); -+ c.registerDocumentation(m_path + "qmake-3.3.8.qch"); - QCOMPARE(c.registeredDocumentations().count(), 1); -- c.registerDocumentation(m_path + "/data/linguist-3.3.8.qch"); -+ c.registerDocumentation(m_path + "linguist-3.3.8.qch"); - QCOMPARE(c.registeredDocumentations().count(), 2); - } - -@@ -248,9 +248,9 @@ void tst_QHelpEngineCore::documentationFileName() - QHelpEngineCore c(m_colFile); - QCOMPARE(c.setupData(), true); - 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")), -- QString(m_path + "/data/test.qch")); -+ QString(m_path + "test.qch")); - QCOMPARE(c.documentationFileName(QLatin1String("trolltech.com.empty")), - QString()); - } -@@ -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")); - QTextStream s(ba, QIODevice::ReadOnly|QIODevice::Text); -- QFile f(m_path + "/data/test.html"); -+ QFile f(m_path + "test.html"); - if (!f.open(QIODevice::ReadOnly|QIODevice::Text)) - QFAIL("Cannot open original file!"); - QTextStream ts(&f); -@@ -433,9 +433,9 @@ void tst_QHelpEngineCore::setAutoSaveFilter() - - void tst_QHelpEngineCore::metaData() - { -- QCOMPARE(QHelpEngineCore::metaData(m_path + "/data/test.qch", "author").toString(), -+ QCOMPARE(QHelpEngineCore::metaData(m_path + "test.qch", "author").toString(), - QString("Digia Plc and/or its subsidiary(-ies)")); -- QCOMPARE(QHelpEngineCore::metaData(m_path + "/data/test.qch", "notExisting").isValid(), -+ QCOMPARE(QHelpEngineCore::metaData(m_path + "test.qch", "notExisting").isValid(), - false); - } - -diff --git a/tests/auto/qhelpgenerator/tst_qhelpgenerator.cpp b/tests/auto/qhelpgenerator/tst_qhelpgenerator.cpp -index 47a879d..99f4615 100644 ---- a/tests/auto/qhelpgenerator/tst_qhelpgenerator.cpp -+++ b/tests/auto/qhelpgenerator/tst_qhelpgenerator.cpp -@@ -57,8 +57,8 @@ private: - - void tst_QHelpGenerator::initTestCase() - { -- QString path = QLatin1String(SRCDIR); -- m_outputFile = path + QLatin1String("/data/test.qch"); -+ QString path = QFINDTESTDATA("data/"); -+ m_outputFile = path + QLatin1String("test.qch"); - if (QFile::exists(m_outputFile)) { - QDir d; - if (!d.remove(m_outputFile)) -@@ -69,9 +69,9 @@ void tst_QHelpGenerator::initTestCase() - void tst_QHelpGenerator::generateHelp() - { - // defined in profile -- QString path = QLatin1String(SRCDIR); -+ QString path = QFINDTESTDATA("data/"); - -- QString inputFile(path + "/data/test.qhp"); -+ QString inputFile(path + "test.qhp"); - QHelpProjectData data; - if (!data.readData(inputFile)) - QFAIL("Cannot read qthp file!"); -@@ -194,17 +194,17 @@ void tst_QHelpGenerator::checkMetaData() - void tst_QHelpGenerator::generateTwice() - { - // defined in profile -- QString path = QLatin1String(SRCDIR); -+ QString path = QFINDTESTDATA("data/"); - -- QString inputFile(path + "/data/test.qhp"); -+ QString inputFile(path + "test.qhp"); - QHelpProjectData data; - if (!data.readData(inputFile)) - QFAIL("Cannot read qhp file!"); - - HelpGenerator generator1; - HelpGenerator generator2; -- QString outputFile1 = path + QLatin1String("/data/test1.qch"); -- QString outputFile2 = path + QLatin1String("/data/test2.qch"); -+ QString outputFile1 = path + QLatin1String("test1.qch"); -+ QString outputFile2 = path + QLatin1String("test2.qch"); - QCOMPARE(generator1.generate(&data, outputFile1), true); - QCOMPARE(generator2.generate(&data, outputFile2), true); - -diff --git a/tests/auto/qhelpindexmodel/tst_qhelpindexmodel.cpp b/tests/auto/qhelpindexmodel/tst_qhelpindexmodel.cpp -index 713c229..65ee62f 100644 ---- a/tests/auto/qhelpindexmodel/tst_qhelpindexmodel.cpp -+++ b/tests/auto/qhelpindexmodel/tst_qhelpindexmodel.cpp -@@ -84,12 +84,12 @@ private: - - void tst_QHelpIndexModel::init() - { -- QString path = QLatin1String(SRCDIR); -+ QString path = QFINDTESTDATA("data/"); - -- m_colFile = path + QLatin1String("/data/col.qhc"); -+ m_colFile = path + QLatin1String("col.qhc"); - if (QFile::exists(m_colFile)) - QDir::current().remove(m_colFile); -- if (!QFile::copy(path + "/data/collection.qhc", m_colFile)) -+ if (!QFile::copy(path + "collection.qhc", m_colFile)) - QFAIL("Cannot copy file!"); - 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 a09135d..d59a3fc 100644 ---- a/tests/auto/qhelpprojectdata/tst_qhelpprojectdata.cpp -+++ b/tests/auto/qhelpprojectdata/tst_qhelpprojectdata.cpp -@@ -52,8 +52,8 @@ private: - - void tst_QHelpProjectData::initTestCase() - { -- const QString path = QLatin1String(SRCDIR); -- m_inputFile = path + QLatin1String("/data/test.qhp"); -+ const QString path = QFINDTESTDATA("data/"); -+ m_inputFile = path + QLatin1String("test.qhp"); - } - - void tst_QHelpProjectData::readData() diff --git a/SPECS/qt5-qttools.spec b/SPECS/qt5-qttools.spec index c88d7a3..67784a1 100644 --- a/SPECS/qt5-qttools.spec +++ b/SPECS/qt5-qttools.spec @@ -1,6 +1,7 @@ %global qt_module qttools -%global build_tests 1 +# Disable automatic .la file removal +%global __brp_remove_la_files %nil #global bootstrap 1 @@ -11,10 +12,10 @@ Summary: Qt5 - QtTool components Name: qt5-qttools -Version: 5.15.9 -Release: 3%{?dist} +Version: 5.15.15 +Release: 1%{?dist} -License: LGPLv3 or LGPLv2 +License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0 Url: http://www.qt.io %global majmin %(echo %{version} | cut -d. -f1-2) Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodules/%{qt_module}-everywhere-opensource-src-%{version}.tar.xz @@ -30,10 +31,6 @@ Patch4: qttools-opensource-src-5.7-add-libatomic.patch # https://fedoraproject.org/wiki/Changes/Stop-Shipping-Individual-Component-Libraries-In-clang-lib-Package Patch5: 0001-Link-against-libclang-cpp.so-instead-of-the-clang-co.patch -%if 0%{?build_tests} -Patch100: qttools-fix-data-files-path-for-tests.patch -%endif - ## upstream patches Source20: assistant.desktop @@ -108,9 +105,6 @@ Requires: %{name}-common = %{version}-%{release} %package libs-designercomponents Summary: Qt5 Designer Components runtime library Requires: %{name}-common = %{version}-%{release} -Requires: %{name}-libs-designer%{?_isa} = %{version}-%{release} -Requires: %{name}-libs-designercomponents%{?_isa} = %{version}-%{release} -Requires: %{name}-libs-help%{?_isa} = %{version}-%{release} %description libs-designercomponents %{summary}. @@ -125,7 +119,6 @@ Conflicts: qt5-tools < 5.4.0-0.2 %package -n qt5-assistant Summary: Documentation browser for Qt5 Requires: %{name}-common = %{version}-%{release} -Requires: %{name}-libs-help%{?_isa} = %{version}-%{release} %description -n qt5-assistant %{summary}. @@ -168,68 +161,38 @@ Obsoletes: qt5-qhelpgenerator < 5.8.0 Provides: qt5-qtattributionsscanner = %{version} Obsoletes: qt5-qtattributionsscanner < 5.8.0 Requires: qt5-qtattributionsscanner = %{version} -Requires: %{name}-libs-help%{?_isa} = %{version}-%{release} + %description -n qt5-doctools %{summary}. %package examples Summary: Programming examples for %{name} Requires: %{name}-common = %{version}-%{release} -Requires: %{name}-libs-designer%{?_isa} = %{version}-%{release} -Requires: %{name}-libs-help%{?_isa} = %{version}-%{release} %description examples %{summary}. -%if 0%{?build_tests} -%package tests -Summary: Unit tests for %{name} -Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: %{name}-libs-help%{?_isa} = %{version}-%{release} -%description tests -%{summary}. -%endif - %prep %setup -q -n %{qt_module}-everywhere-src-%{version} -%patch2 -p1 -b ..runqttools-with-qt5-suffix.patch +%patch -P2 -p1 -b ..runqttools-with-qt5-suffix.patch + %ifarch %{mips32} -%patch4 -p1 -b .libatomic +%patch -P4 -p1 -b .libatomic %endif -%patch5 -p1 -b .libclang-cpp +%patch -P5 -p1 -b .libclang-cpp -%if 0%{?build_tests} -%patch100 -p1 -b .fix-data-files-path-for-tests -%endif %build %{qmake_qt5} \ + CONFIG+=disable_external_rpath \ %{?no_examples} %make_build -%if 0%{?build_tests} -%qt5_build_tests -%endif %install make install INSTALL_ROOT=%{buildroot} -%if 0%{?build_tests} -# FIXME: qttools is special case and we cannot use qt5_install_tests macro as -# it skips many data files used by qttools unit tests -#qt5_install_tests -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 desktop-file-install \ --dir=%{buildroot}%{_datadir}/applications \ @@ -284,7 +247,7 @@ sed -i -e 's| Qt5UiPlugin||g' %{buildroot}%{_qt5_libdir}/pkgconfig/Qt5Designer.p %if 0%{?fedora} || 0%{?rhel} > 6 %check # verify validity of Qt5Designer.pc -export PKG_CONFIG_PATH=%{buildroot}%{_libdir}/pkgconfig +export PKG_CONFIG_PATH=%{buildroot}%{_libdir}/pkgconfig:$PKG_CONFIG_PATH pkg-config --print-requires --print-requires-private Qt5Designer export CMAKE_PREFIX_PATH=%{buildroot}%{_qt5_prefix}:%{buildroot}%{_prefix} export PATH=%{buildroot}%{_qt5_bindir}:%{_qt5_bindir}:$PATH @@ -519,63 +482,95 @@ fi %{_qt5_libdir}/cmake/Qt5Designer/Qt5Designer_* %endif -%if 0%{?build_tests} -%files tests -%{_qt5_libdir}/qt5/tests -%endif %changelog -* Mon May 08 2023 Jan Grulich - 5.15.9-3 -- Rebuild (LLVM-16) - Resolves: bz#2192954 +* Wed Dec 25 2024 Arkady L. Shane - 5.15.15-1 +- Rebuilt for MSVSphere 10 + +* Wed Sep 04 2024 Jan Grulich - 5.15.15-1 +- 5.15.15 + +* Fri Jul 19 2024 Fedora Release Engineering - 5.15.14-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Wed May 29 2024 Jan Grulich - 5.15.14-1 +- 5.15.14 + +* Thu Mar 14 2024 Jan Grulich - 5.15.13-1 +- 5.15.13 + +* Thu Feb 29 2024 David Abdurachmanov - 5.15.12-4 +- Set disable_external_rpath to avoid RPATHs in qdoc + +* Fri Jan 26 2024 Fedora Release Engineering - 5.15.12-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Jan 22 2024 Fedora Release Engineering - 5.15.12-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Tue Jan 02 2024 Jan Grulich - 5.15.12-1 +- 5.15.12 -* Tue Apr 25 2023 Jan Grulich - 5.15.9-2 -- Rebuild (elfutils#2188064) - Resolves: bz#2175743 +* Fri Oct 06 2023 Jan Grulich - 5.15.11-1 +- 5.15.11 -* Mon Apr 17 2023 Jan Grulich - 5.15.9-1 +* Fri Jul 21 2023 Fedora Release Engineering - 5.15.10-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sun Jun 25 2023 Kalev Lember - 5.15.10-2 +- Fix self tests when building for flatpak + +* Mon Jun 12 2023 Jan Grulich - 5.15.10-1 +- 5.15.10 + +* Tue Apr 11 2023 Jan Grulich - 5.15.9-1 - 5.15.9 - Resolves: bz#2175743 -* Mon Oct 24 2022 Jan Grulich - 5.15.3-4 -- Rebuild (LLVM-15) - Resolves: bz#2119003 +* Tue Jan 31 2023 Jan Grulich - 5.15.8-3 +- migrated to SPDX license -- Add versioned dependencies between subpackages - Resolves: bz#2088352 +* Fri Jan 20 2023 Fedora Release Engineering - 5.15.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild -* Thu May 19 2022 Jan Grulich - 5.15.3-3 -- Rebuild (LLVM-14) - Resolves: bz#2061054 +* Thu Jan 05 2023 Jan Grulich - 5.15.8-1 +- 5.15.8 -* Wed Apr 20 2022 Jan Grulich - 5.15.3-2 -- Fix unit tests used by gating - Resolves: bz#2061370 +* Mon Oct 31 2022 Jan Grulich - 5.15.7-1 +- 5.15.7 -* Mon Mar 28 2022 Jan Grulich - 5.15.3-1 -- 5.15.3 - Resolves: bz#2061370 +* Tue Sep 20 2022 Jan Grulich - 5.15.6-1 +- 5.15.6 + +* Mon Sep 19 2022 Pete Walter - 5.15.5-3 +- Rebuild for clang 15 -* Fri Dec 17 2021 Jan Grulich - 5.15.2-11 -- Rebuild (LLVM13) - Resolves: bz#2001129 +* Sat Jul 23 2022 Fedora Release Engineering - 5.15.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Wed Jul 13 2022 Jan Grulich - 5.15.5-1 +- 5.15.5 + +* Mon May 16 2022 Jan Grulich - 5.15.4-1 +- 5.15.4 + +* Fri Mar 04 2022 Jan Grulich - 5.15.3-1 +- 5.15.3 -* Tue Aug 10 2021 Mohan Boddu - 5.15.2-10 -- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags - Related: rhbz#1991688 +* Mon Jan 24 2022 Timm Bäeder - 5.15.2-10 +- Disable automatic .la file removal +- https://fedoraproject.org/wiki/Changes/RemoveLaFiles -* Wed Jun 09 2021 Jan Grulich - 5.15.2-9 -- Add gating tests - Resolves: bz#1968475 +* Fri Jan 21 2022 Fedora Release Engineering - 5.15.2-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild -* Thu May 13 2021 Tom Stellard - 5.15.2-8 -- Rebuild for LLVM12 +* Thu Oct 07 2021 Tom Stellard - 5.15.2-8 +- Rebuild for llvm-13.0.0 -* Fri Apr 16 2021 Mohan Boddu - 5.15.2-7 -- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 +* Thu Sep 30 2021 Kalev Lember - 5.15.2-7 +- Rebuild for clang 13.0.0~rc1 -* Mon Feb 08 2021 Jan Grulich - 5.15.2-6 -- Rebuild (clang) +* Fri Jul 23 2021 Fedora Release Engineering - 5.15.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild * Wed Jan 27 2021 Fedora Release Engineering - 5.15.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild