diff --git a/.gitignore b/.gitignore index 5f7da26..f2dbb22 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/qttools-everywhere-src-5.12.5.tar.xz +SOURCES/qttools-everywhere-src-5.15.2.tar.xz diff --git a/.qt5-qttools.metadata b/.qt5-qttools.metadata index edb617e..0f6f23c 100644 --- a/.qt5-qttools.metadata +++ b/.qt5-qttools.metadata @@ -1 +1 @@ -dddc9b21ebfafc60eb6ae1c567d57e86b855d80b SOURCES/qttools-everywhere-src-5.12.5.tar.xz +ae92f651b1b029bd6f55fc8888134d73d8ad19be SOURCES/qttools-everywhere-src-5.15.2.tar.xz diff --git a/SOURCES/0001-Link-against-libclang-cpp.so-instead-of-the-clang-co.patch b/SOURCES/0001-Link-against-libclang-cpp.so-instead-of-the-clang-co.patch new file mode 100644 index 0000000..cc67686 --- /dev/null +++ b/SOURCES/0001-Link-against-libclang-cpp.so-instead-of-the-clang-co.patch @@ -0,0 +1,74 @@ +diff --git a/src/qdoc/configure.pri b/src/qdoc/configure.pri +index 4f3d776..bcd2aae 100644 +--- a/src/qdoc/configure.pri ++++ b/src/qdoc/configure.pri +@@ -146,33 +146,6 @@ defineTest(qtConfTest_libclang) { + } + } + !equals(QMAKE_HOST.os, Darwin):!msvc: CLANG_LIBS+=-Wl,--start-group +- CLANG_LIBS += -lclangAnalysis \ +- -lclangARCMigrate \ +- -lclangAST \ +- -lclangASTMatchers \ +- -lclangBasic \ +- -lclangCodeGen \ +- -lclangCrossTU \ +- -lclangDriver \ +- -lclangDynamicASTMatchers \ +- -lclangEdit \ +- -lclangFormat \ +- -lclangFrontend \ +- -lclangFrontendTool \ +- -lclangHandleCXX \ +- -lclangIndex \ +- -lclangLex \ +- -lclangParse \ +- -lclangRewrite \ +- -lclangRewriteFrontend \ +- -lclangSema \ +- -lclangSerialization \ +- -lclangStaticAnalyzerCheckers \ +- -lclangStaticAnalyzerCore \ +- -lclangStaticAnalyzerFrontend \ +- -lclangTooling \ +- -lclangToolingASTDiff \ +- -lclangToolingCore + + versionIsAtLeast($$CLANG_VERSION, "10.0.0") { + equals(QMAKE_HOST.os, Windows): \ +@@ -187,34 +160,7 @@ defineTest(qtConfTest_libclang) { + else: \ + CLANG_LIBS += -lclang_static + +- CLANG_LIBS += \ +- -lclangApplyReplacements \ +- -lclangChangeNamespace \ +- -lclangDaemon \ +- -lclangIncludeFixer \ +- -lclangIncludeFixerPlugin \ +- -lclangMove \ +- -lclangQuery \ +- -lclangReorderFields \ +- -lclangTidy \ +- -lclangTidyAndroidModule \ +- -lclangTidyBoostModule \ +- -lclangTidyBugproneModule \ +- -lclangTidyCERTModule \ +- -lclangTidyCppCoreGuidelinesModule \ +- -lclangTidyFuchsiaModule \ +- -lclangTidyGoogleModule \ +- -lclangTidyHICPPModule \ +- -lclangTidyLLVMModule \ +- -lclangTidyMiscModule \ +- -lclangTidyModernizeModule \ +- -lclangTidyMPIModule \ +- -lclangTidyObjCModule \ +- -lclangTidyPerformanceModule \ +- -lclangTidyPlugin \ +- -lclangTidyReadabilityModule \ +- -lclangTidyUtils \ +- -lclangToolingRefactor \ ++ CLANG_LIBS += -lclang-cpp \ + -lfindAllSymbols + } + diff --git a/SOURCES/qttools-find-clang.patch b/SOURCES/qttools-find-clang.patch deleted file mode 100644 index 3b1903a..0000000 --- a/SOURCES/qttools-find-clang.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 { -- CLANG_LIBDIR = $$clangInstallDir/lib -+ CLANG_LIBDIR = $$clangInstallDir/lib64 - CLANG_INCLUDEPATH = $$clangInstallDir/include - CLANG_VERSION = $$findLLVMVersionFromLibDir($$CLANG_LIBDIR) - } diff --git a/SOURCES/qttools-opensource-src-5.13.2-runqttools-with-qt5-suffix.patch b/SOURCES/qttools-opensource-src-5.13.2-runqttools-with-qt5-suffix.patch new file mode 100644 index 0000000..8e6dedf --- /dev/null +++ b/SOURCES/qttools-opensource-src-5.13.2-runqttools-with-qt5-suffix.patch @@ -0,0 +1,49 @@ +diff --git a/src/linguist/lprodump/main.cpp b/src/linguist/lprodump/main.cpp +index 857786b..2a65299 100644 +--- a/src/linguist/lprodump/main.cpp ++++ b/src/linguist/lprodump/main.cpp +@@ -438,7 +438,7 @@ int main(int argc, char **argv) + ProFileGlobals option; + option.qmake_abslocation = QString::fromLocal8Bit(qgetenv("QMAKE")); + if (option.qmake_abslocation.isEmpty()) +- option.qmake_abslocation = app.applicationDirPath() + QLatin1String("/qmake"); ++ option.qmake_abslocation = app.applicationDirPath() + QLatin1String("/qmake-qt5"); + option.debugLevel = proDebug; + option.initProperties(); + option.setCommandLineArguments(QDir::currentPath(), +diff --git a/src/linguist/lrelease-pro/main.cpp b/src/linguist/lrelease-pro/main.cpp +index 9f4ca25..207f401 100644 +--- a/src/linguist/lrelease-pro/main.cpp ++++ b/src/linguist/lrelease-pro/main.cpp +@@ -145,6 +145,6 @@ int main(int argc, char **argv) + projectDescription->setAutoRemove(false); + lreleaseOptions << QStringLiteral("-project") << projectDescription->fileName(); + +- runQtTool(QStringLiteral("lrelease"), lreleaseOptions); ++ runQtTool(QStringLiteral("lrelease-qt5"), lreleaseOptions); + return 0; + } +diff --git a/src/linguist/lupdate-pro/main.cpp b/src/linguist/lupdate-pro/main.cpp +index ab5b7eb..1ce039c 100644 +--- a/src/linguist/lupdate-pro/main.cpp ++++ b/src/linguist/lupdate-pro/main.cpp +@@ -154,6 +154,6 @@ int main(int argc, char **argv) + projectDescription->setAutoRemove(false); + lupdateOptions << QStringLiteral("-project") << projectDescription->fileName(); + +- runQtTool(QStringLiteral("lupdate"), lupdateOptions); ++ runQtTool(QStringLiteral("lupdate-qt5"), lupdateOptions); + return 0; + } +diff --git a/src/linguist/shared/runqttool.cpp b/src/linguist/shared/runqttool.cpp +index e36a3a2..020fe06 100644 +--- a/src/linguist/shared/runqttool.cpp ++++ b/src/linguist/shared/runqttool.cpp +@@ -114,6 +114,6 @@ std::unique_ptr createProjectDescription(QStringList args) + } + file->close(); + args << QStringLiteral("-out") << file->fileName(); +- runQtTool(QStringLiteral("lprodump"), args); ++ runQtTool(QStringLiteral("lprodump-qt5"), args); + return file; + } diff --git a/SOURCES/qttools-opensource-src-5.5.0-qmake-qt5.patch b/SOURCES/qttools-opensource-src-5.5.0-qmake-qt5.patch deleted file mode 100644 index 431d7af..0000000 --- a/SOURCES/qttools-opensource-src-5.5.0-qmake-qt5.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -up qttools-opensource-src-5.5.0/src/linguist/lrelease/main.cpp.qmake-qt5 qttools-opensource-src-5.5.0/src/linguist/lrelease/main.cpp ---- qttools-opensource-src-5.5.0/src/linguist/lrelease/main.cpp.qmake-qt5 2015-06-29 15:13:45.000000000 -0500 -+++ qttools-opensource-src-5.5.0/src/linguist/lrelease/main.cpp 2015-07-16 10:23:49.664773033 -0500 -@@ -310,9 +310,9 @@ int main(int argc, char **argv) - option.qmake_abslocation = QString::fromLocal8Bit(qgetenv("QMAKE")); - if (option.qmake_abslocation.isEmpty()) - #ifdef QT_BOOTSTRAPPED -- option.qmake_abslocation = binDir + QLatin1String("/qmake"); -+ option.qmake_abslocation = binDir + QLatin1String("/qmake-qt5"); - #else -- option.qmake_abslocation = app.applicationDirPath() + QLatin1String("/qmake"); -+ option.qmake_abslocation = app.applicationDirPath() + QLatin1String("/qmake-qt5"); - #endif - option.initProperties(); - QMakeVfs vfs; -diff -up qttools-opensource-src-5.5.0/src/linguist/lupdate/main.cpp.qmake-qt5 qttools-opensource-src-5.5.0/src/linguist/lupdate/main.cpp ---- qttools-opensource-src-5.5.0/src/linguist/lupdate/main.cpp.qmake-qt5 2015-06-29 15:13:46.000000000 -0500 -+++ qttools-opensource-src-5.5.0/src/linguist/lupdate/main.cpp 2015-07-16 10:23:49.665773055 -0500 -@@ -1048,7 +1048,7 @@ int main(int argc, char **argv) - ProFileGlobals option; - option.qmake_abslocation = QString::fromLocal8Bit(qgetenv("QMAKE")); - if (option.qmake_abslocation.isEmpty()) -- option.qmake_abslocation = app.applicationDirPath() + QLatin1String("/qmake"); -+ option.qmake_abslocation = app.applicationDirPath() + QLatin1String("/qmake-qt5"); - option.debugLevel = proDebug; - option.initProperties(); - option.setCommandLineArguments(QDir::currentPath(), diff --git a/SPECS/qt5-qttools.spec b/SPECS/qt5-qttools.spec index b16294f..f7e4223 100644 --- a/SPECS/qt5-qttools.spec +++ b/SPECS/qt5-qttools.spec @@ -4,7 +4,7 @@ Summary: Qt5 - QtTool components Name: qt5-qttools -Version: 5.12.5 +Version: 5.15.2 Release: 3%{?dist} License: LGPLv3 or LGPLv2 @@ -14,12 +14,14 @@ Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submod # help lrelease/lupdate use/prefer qmake-qt5 # https://bugzilla.redhat.com/show_bug.cgi?id=1009893 -Patch2: qttools-opensource-src-5.5.0-qmake-qt5.patch +Patch2: qttools-opensource-src-5.13.2-runqttools-with-qt5-suffix.patch # 32-bit MIPS needs explicit -latomic Patch4: qttools-opensource-src-5.7-add-libatomic.patch -Patch5: qttools-find-clang.patch +# Link against libclang-cpp.so +# 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 ## upstream patches %if 0%{?build_tests} @@ -40,13 +42,12 @@ BuildRequires: /usr/bin/file BuildRequires: qt5-rpm-macros >= %{version} BuildRequires: qt5-qtbase-private-devel BuildRequires: qt5-qtbase-static >= %{version} +BuildRequires: qt5-qtdeclarative-static >= %{version} +BuildRequires: pkgconfig(Qt5Qml) # libQt5DBus.so.5(Qt_5_PRIVATE_API) %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} # for qdoc -BuildRequires: clang -BuildRequires: clang-devel -BuildRequires: qt5-qtdeclarative-static >= %{version} -BuildRequires: pkgconfig(Qt5Qml) +BuildRequires: clang-devel llvm-devel Requires: %{name}-common = %{version}-%{release} @@ -176,13 +177,11 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %prep %setup -q -n %{qt_module}-everywhere-src-%{version} -%patch2 -p1 -b .qmake-qt5 +%patch2 -p1 -b ..runqttools-with-qt5-suffix.patch %ifarch %{mips32} %patch4 -p1 -b .libatomic %endif -%ifarch x86_64 ppc64 ppc64le s390x aarch64 -%patch5 -p1 -b .qttools-find-clang -%endif +%patch5 -p1 -b .libclang-cpp %if 0%{?build_tests} %patch100 -p1 -b .fix-data-files-path-for-tests @@ -238,7 +237,7 @@ mkdir %{buildroot}%{_bindir} pushd %{buildroot}%{_qt5_bindir} for i in * ; do case "${i}" in - assistant|designer|lconvert|linguist|lrelease|lupdate|pixeltool|qcollectiongenerator|qdbus|qdbusviewer|qhelpconverter|qhelpgenerator|qtplugininfo|qtattributionsscanner) + assistant|designer|lconvert|linguist|lrelease|lupdate|lprodump|pixeltool|qcollectiongenerator|qdbus|qdbusviewer|qhelpconverter|qhelpgenerator|qtplugininfo|qtattributionsscanner) ln -v ${i} %{buildroot}%{_bindir}/${i}-qt5 ln -sv ${i} ${i}-qt5 ;; @@ -313,6 +312,7 @@ popd %ldconfig_scriptlets libs-designercomponents %files libs-designercomponents %{_qt5_libdir}/libQt5DesignerComponents.so.5* +%{_qt5_libdir}/cmake/Qt5DesignerComponents/Qt5DesignerComponentsConfig*.cmake %ldconfig_scriptlets libs-help %files libs-help @@ -415,9 +415,11 @@ fi %{_bindir}/lconvert* %{_bindir}/lrelease* %{_bindir}/lupdate* +%{_bindir}/lprodump* %{_qt5_bindir}/lconvert* %{_qt5_bindir}/lrelease* %{_qt5_bindir}/lupdate* +%{_qt5_bindir}/lprodump* # cmake config %dir %{_qt5_libdir}/cmake/Qt5LinguistTools/ %{_qt5_libdir}/cmake/Qt5LinguistTools/Qt5LinguistToolsConfig*.cmake @@ -447,13 +449,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/ @@ -478,6 +480,9 @@ fi %{_qt5_archdatadir}/mkspecs/modules/qt_lib_help.pri %{_qt5_archdatadir}/mkspecs/modules/qt_lib_help_private.pri %{_qt5_archdatadir}/mkspecs/modules/qt_lib_uiplugin.pri +# putting these here for now, new stuff in 5.14, review for accuracy -- rdieter +%{_qt5_libdir}/cmake/Qt5AttributionsScannerTools/ +%{_qt5_libdir}/cmake/Qt5DocTools/ %files static %{_qt5_headerdir}/QtUiTools/ @@ -500,9 +505,17 @@ fi %endif %changelog -* Wed Feb 24 2021 Jan Grulich - 5.12.5-3 -- Rebuild (LLVM-11) - Resolves: bz#1931768 +* Fri Jun 25 2021 Jan Grulich - 5.15.2-3 +- Rebuild (LLVM-12) + Resolves: bz#1930043 + +* Wed Apr 28 2021 Jan Grulich - 5.15.2-2 +- Rebuild (binutils) + Resolves: bz#1930043 + +* Wed Mar 31 2021 Jan Grulich - 5.15.2-1 +- 5.15.2 + Resolves: bz#1930043 * Tue May 12 2020 Jan Grulich - 5.12.5-2 - Rebuild (LLVM-10)