From 19c37c1f0ad9c8575839a2dfe41f9b603472267f Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Mon, 23 Nov 2020 17:32:30 +0000 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/qt5-qttools.git#7095c5d4f762910fe7106c6d1413a2af8b480cd4 --- .gitignore | 1 + ...clang-cpp.so-instead-of-the-clang-co.patch | 146 +++++++++--------- qt5-qttools.spec | 7 +- sources | 2 +- 4 files changed, 77 insertions(+), 79 deletions(-) diff --git a/.gitignore b/.gitignore index 938594f..e1df62b 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /qttools-everywhere-src-5.13.2.tar.xz /qttools-everywhere-src-5.14.2.tar.xz /qttools-everywhere-src-5.15.1.tar.xz +/qttools-everywhere-src-5.15.2.tar.xz diff --git a/0001-Link-against-libclang-cpp.so-instead-of-the-clang-co.patch b/0001-Link-against-libclang-cpp.so-instead-of-the-clang-co.patch index e320d00..cc67686 100644 --- a/0001-Link-against-libclang-cpp.so-instead-of-the-clang-co.patch +++ b/0001-Link-against-libclang-cpp.so-instead-of-the-clang-co.patch @@ -1,80 +1,74 @@ -From 3dfe3b966f3fb069f258991b6a468816aab13908 Mon Sep 17 00:00:00 2001 -From: Tom Stellard -Date: Thu, 12 Dec 2019 22:47:04 +0000 -Subject: [PATCH] Link against libclang-cpp.so instead of the clang component - libraries - ---- - src/qdoc/configure.pri | 56 +----------------------------------------- - 1 file changed, 1 insertion(+), 55 deletions(-) - diff --git a/src/qdoc/configure.pri b/src/qdoc/configure.pri -index e9d7667c..65470129 100644 +index 4f3d776..bcd2aae 100644 --- a/src/qdoc/configure.pri +++ b/src/qdoc/configure.pri -@@ -142,61 +142,7 @@ defineTest(qtConfTest_libclang) { - CLANG_LIBS += -llibclang_static -ladvapi32 -lshell32 -lMincore - } else { - !equals(QMAKE_HOST.os, Darwin): CLANG_LIBS+=-Wl,--start-group -- CLANG_LIBS += -lclangAnalysis \ -- -lclangApplyReplacements \ -- -lclangARCMigrate \ -- -lclangAST \ -- -lclangASTMatchers \ -- -lclangBasic \ -- -lclangChangeNamespace \ -- -lclangCodeGen \ -- -lclangCrossTU \ -- -lclangDaemon \ -- -lclangDriver \ -- -lclangDynamicASTMatchers \ -- -lclangEdit \ -- -lclangFormat \ -- -lclangFrontend \ -- -lclangFrontendTool \ -- -lclangHandleCXX \ -- -lclangIncludeFixer \ -- -lclangIncludeFixerPlugin \ -- -lclangIndex \ -- -lclangLex \ -- -lclangMove \ -- -lclangParse \ -- -lclangQuery \ -- -lclangReorderFields \ -- -lclangRewrite \ -- -lclangRewriteFrontend \ -- -lclangSema \ -- -lclangSerialization \ -- -lclang_static \ -- -lclangStaticAnalyzerCheckers \ -- -lclangStaticAnalyzerCore \ -- -lclangStaticAnalyzerFrontend \ -- -lclangTidy \ -- -lclangTidyAndroidModule \ -- -lclangTidyBoostModule \ -- -lclangTidyBugproneModule \ -- -lclangTidyCERTModule \ -- -lclangTidyCppCoreGuidelinesModule \ -- -lclangTidyFuchsiaModule \ -- -lclangTidyGoogleModule \ -- -lclangTidyHICPPModule \ -- -lclangTidyLLVMModule \ -- -lclangTidyMiscModule \ -- -lclangTidyModernizeModule \ -- -lclangTidyMPIModule \ -- -lclangTidyObjCModule \ -- -lclangTidyPerformanceModule \ -- -lclangTidyPlugin \ -- -lclangTidyReadabilityModule \ -- -lclangTidyUtils \ -- -lclangTooling \ -- -lclangToolingASTDiff \ -- -lclangToolingCore \ -- -lclangToolingRefactor \ +@@ -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 \ - -lLLVMAArch64AsmParser \ - -lLLVMAArch64AsmPrinter \ --- -2.20.1 - + -lfindAllSymbols + } + diff --git a/qt5-qttools.spec b/qt5-qttools.spec index b6f07ca..52a9812 100644 --- a/qt5-qttools.spec +++ b/qt5-qttools.spec @@ -9,8 +9,8 @@ Summary: Qt5 - QtTool components Name: qt5-qttools -Version: 5.15.1 -Release: 3%{?dist} +Version: 5.15.2 +Release: 1%{?dist} License: LGPLv3 or LGPLv2 Url: http://www.qt.io @@ -478,6 +478,9 @@ fi %changelog +* Fri Nov 20 09:30:47 CET 2020 Jan Grulich - 5.15.2-1 +- 5.15.2 + * Tue Oct 27 2020 Leigh Scott - 5.15.1-3 - Bump to fix hash issue on rpmfusion koji diff --git a/sources b/sources index dead023..3da0e5a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qttools-everywhere-src-5.15.1.tar.xz) = 8c7851431de8686a01fc5f85de5dcfa61b6878bd65b53ed78a8a23e57de70f2dcc1a72b4eed9a7219cfd443215a32a59a25fb929d343afcfd498517d6bcfb951 +SHA512 (qttools-everywhere-src-5.15.2.tar.xz) = 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b