rpms/qt5-qttools
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Merged update from upstream sources

Browse Source 
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
This commit is contained in:
DistroBaker 2020-11-23 17:32:30 +00:00
parent a8572b8297
commit 19c37c1f0a
4 changed files with 77 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -10,3 +10,4 @@
/qttools-everywhere-src-5.13.2.tar.xz /qttools-everywhere-src-5.13.2.tar.xz
/qttools-everywhere-src-5.14.2.tar.xz /qttools-everywhere-src-5.14.2.tar.xz
/qttools-everywhere-src-5.15.1.tar.xz /qttools-everywhere-src-5.15.1.tar.xz
/qttools-everywhere-src-5.15.2.tar.xz

146
0001-Link-against-libclang-cpp.so-instead-of-the-clang-co.patch
View File

@ -1,80 +1,74 @@
From 3dfe3b966f3fb069f258991b6a468816aab13908 Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar@redhat.com>
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 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 --- a/src/qdoc/configure.pri
+++ b/src/qdoc/configure.pri +++ b/src/qdoc/configure.pri
@@ -142,61 +142,7 @@ defineTest(qtConfTest_libclang) { @@ -146,33 +146,6 @@ defineTest(qtConfTest_libclang) {
CLANG_LIBS += -llibclang_static -ladvapi32 -lshell32 -lMincore }
} else { }
!equals(QMAKE_HOST.os, Darwin): CLANG_LIBS+=-Wl,--start-group !equals(QMAKE_HOST.os, Darwin):!msvc: CLANG_LIBS+=-Wl,--start-group
- CLANG_LIBS += -lclangAnalysis \ - CLANG_LIBS += -lclangAnalysis \
- -lclangApplyReplacements \ - -lclangARCMigrate \
- -lclangARCMigrate \ - -lclangAST \
- -lclangAST \ - -lclangASTMatchers \
- -lclangASTMatchers \ - -lclangBasic \
- -lclangBasic \ - -lclangCodeGen \
- -lclangChangeNamespace \ - -lclangCrossTU \
- -lclangCodeGen \ - -lclangDriver \
- -lclangCrossTU \ - -lclangDynamicASTMatchers \
- -lclangDaemon \ - -lclangEdit \
- -lclangDriver \ - -lclangFormat \
- -lclangDynamicASTMatchers \ - -lclangFrontend \
- -lclangEdit \ - -lclangFrontendTool \
- -lclangFormat \ - -lclangHandleCXX \
- -lclangFrontend \ - -lclangIndex \
- -lclangFrontendTool \ - -lclangLex \
- -lclangHandleCXX \ - -lclangParse \
- -lclangIncludeFixer \ - -lclangRewrite \
- -lclangIncludeFixerPlugin \ - -lclangRewriteFrontend \
- -lclangIndex \ - -lclangSema \
- -lclangLex \ - -lclangSerialization \
- -lclangMove \ - -lclangStaticAnalyzerCheckers \
- -lclangParse \ - -lclangStaticAnalyzerCore \
- -lclangQuery \ - -lclangStaticAnalyzerFrontend \
- -lclangReorderFields \ - -lclangTooling \
- -lclangRewrite \ - -lclangToolingASTDiff \
- -lclangRewriteFrontend \ - -lclangToolingCore
- -lclangSema \
- -lclangSerialization \ versionIsAtLeast($$CLANG_VERSION, "10.0.0") {
- -lclang_static \ equals(QMAKE_HOST.os, Windows): \
- -lclangStaticAnalyzerCheckers \ @@ -187,34 +160,7 @@ defineTest(qtConfTest_libclang) {
- -lclangStaticAnalyzerCore \ else: \
- -lclangStaticAnalyzerFrontend \ CLANG_LIBS += -lclang_static
- -lclangTidy \
- -lclangTidyAndroidModule \ - CLANG_LIBS += \
- -lclangTidyBoostModule \ - -lclangApplyReplacements \
- -lclangTidyBugproneModule \ - -lclangChangeNamespace \
- -lclangTidyCERTModule \ - -lclangDaemon \
- -lclangTidyCppCoreGuidelinesModule \ - -lclangIncludeFixer \
- -lclangTidyFuchsiaModule \ - -lclangIncludeFixerPlugin \
- -lclangTidyGoogleModule \ - -lclangMove \
- -lclangTidyHICPPModule \ - -lclangQuery \
- -lclangTidyLLVMModule \ - -lclangReorderFields \
- -lclangTidyMiscModule \ - -lclangTidy \
- -lclangTidyModernizeModule \ - -lclangTidyAndroidModule \
- -lclangTidyMPIModule \ - -lclangTidyBoostModule \
- -lclangTidyObjCModule \ - -lclangTidyBugproneModule \
- -lclangTidyPerformanceModule \ - -lclangTidyCERTModule \
- -lclangTidyPlugin \ - -lclangTidyCppCoreGuidelinesModule \
- -lclangTidyReadabilityModule \ - -lclangTidyFuchsiaModule \
- -lclangTidyUtils \ - -lclangTidyGoogleModule \
- -lclangTooling \ - -lclangTidyHICPPModule \
- -lclangToolingASTDiff \ - -lclangTidyLLVMModule \
- -lclangToolingCore \ - -lclangTidyMiscModule \
- -lclangToolingRefactor \ - -lclangTidyModernizeModule \
+ CLANG_LIBS += -lclang-cpp \ - -lclangTidyMPIModule \
-lfindAllSymbols \ - -lclangTidyObjCModule \
-lLLVMAArch64AsmParser \ - -lclangTidyPerformanceModule \
-lLLVMAArch64AsmPrinter \ - -lclangTidyPlugin \
-- - -lclangTidyReadabilityModule \
2.20.1 - -lclangTidyUtils \
- -lclangToolingRefactor \
+ CLANG_LIBS += -lclang-cpp \
-lfindAllSymbols
}

7
qt5-qttools.spec
View File

@ -9,8 +9,8 @@
Summary: Qt5 - QtTool components Summary: Qt5 - QtTool components
Name: qt5-qttools Name: qt5-qttools
Version: 5.15.1 Version: 5.15.2
Release: 3%{?dist} Release: 1%{?dist}
License: LGPLv3 or LGPLv2 License: LGPLv3 or LGPLv2
Url: http://www.qt.io Url: http://www.qt.io
@ -478,6 +478,9 @@ fi
%changelog %changelog
* Fri Nov 20 09:30:47 CET 2020 Jan Grulich <jgrulich@redhat.com> - 5.15.2-1
- 5.15.2
* Tue Oct 27 2020 Leigh Scott <leigh123linux@gmail.com> - 5.15.1-3 * Tue Oct 27 2020 Leigh Scott <leigh123linux@gmail.com> - 5.15.1-3
- Bump to fix hash issue on rpmfusion koji - Bump to fix hash issue on rpmfusion koji

2
sources
View File

@ -1 +1 @@
SHA512 (qttools-everywhere-src-5.15.1.tar.xz) = 8c7851431de8686a01fc5f85de5dcfa61b6878bd65b53ed78a8a23e57de70f2dcc1a72b4eed9a7219cfd443215a32a59a25fb929d343afcfd498517d6bcfb951 SHA512 (qttools-everywhere-src-5.15.2.tar.xz) = 3bd32a302af6e81cd5d4eb07d60c5ef233f1ca7af1aae180c933ac28fafffce28c6c868eb032108747937ea951d6d4f0df5516841bc65d22c529207147533a8b