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 new file mode 100644 index 0000000..e320d00 --- /dev/null +++ b/0001-Link-against-libclang-cpp.so-instead-of-the-clang-co.patch @@ -0,0 +1,80 @@ +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 +--- 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 \ ++ CLANG_LIBS += -lclang-cpp \ + -lfindAllSymbols \ + -lLLVMAArch64AsmParser \ + -lLLVMAArch64AsmPrinter \ +-- +2.20.1 + diff --git a/qt5-qttools.spec b/qt5-qttools.spec index 68dd03f..3a7a207 100644 --- a/qt5-qttools.spec +++ b/qt5-qttools.spec @@ -10,7 +10,7 @@ Summary: Qt5 - QtTool components Name: qt5-qttools Version: 5.13.2 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPLv3 or LGPLv2 Url: http://www.qt.io @@ -24,6 +24,10 @@ 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 +# 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 Source20: assistant.desktop @@ -170,6 +174,7 @@ Requires: %{name}-common = %{version}-%{release} %ifarch %{mips32} %patch4 -p1 -b .libatomic %endif +%patch5 -p1 -b .libclang-cpp %build @@ -470,6 +475,10 @@ fi %changelog +* Mon Jan 06 2020 Tom Stellard - 5.13.2-4 +- Link against libclang-cpp.so +- https://fedoraproject.org/wiki/Changes/Stop-Shipping-Individual-Component-Libraries-In-clang-lib-Package + * Wed Dec 18 2019 Jan Grulich - 5.13.2-3 - Use -qt5 suffix for linguist tools