Hi, there are again new updates: * libre/qutebrowser to 1.11.0 * libre/qtcreator to 4.12.0
The patchs are attached. Besides the "commit by commit" patches, I have
also added patches which squash the commits
("Update-libre-{qutebrowser,qtcreator}-squashed-commits.patch).
As always questions and feedback is very welcome!
theova <[email protected]> schrieb am Tue, 21. Apr 20 17:02:
Hello, The attached patches update * libre/qtcreator for clang 10.0.0 * libre/cups-filters to 1.27.4 * libre/qutebrowser to 1.10.2 Please see the respective commit messages. Thanks a lot!
From fad456a111ae923aaa85a5bbd371e0625882719a Mon Sep 17 00:00:00 2001 From: Theo von Arx <[email protected]> Date: Tue, 21 Apr 2020 16:50:14 +0200 Subject: [PATCH] Rebuild libre/qtcreator for clang 10.0.0 Sucessfully built on x86_64, i686. Tested on x86_64. The build for armv7h fails on my machine, but could succeed on others. --- libre/qtcreator/PKGBUILD | 16 +- libre/qtcreator/qtcreator-clang-10.patch | 277 +++++++++++++++++++++ libre/qtcreator/qtcreator-clang-libs.patch | 24 ++ 3 files changed, 313 insertions(+), 4 deletions(-) create mode 100644 libre/qtcreator/qtcreator-clang-10.patch create mode 100644 libre/qtcreator/qtcreator-clang-libs.patch diff --git a/libre/qtcreator/PKGBUILD b/libre/qtcreator/PKGBUILD index 9963e5a5e..290601831 100644 --- a/libre/qtcreator/PKGBUILD +++ b/libre/qtcreator/PKGBUILD @@ -15,8 +15,8 @@ pkgname=qtcreator pkgver=4.11.2 -_clangver=9.0.1 -pkgrel=2 +_clangver=10.0.0 +pkgrel=4 pkgrel+=.parabola1 pkgdesc='Lightweight, cross-platform integrated development environment' pkgdesc+=', without nonfree qt5-webengine help viewer' @@ -39,10 +39,14 @@ optdepends=('qt5-doc: integrated Qt documentation' 'valgrind: analyze support' 'perf: performer analyzer') source=("https://download.qt.io/official_releases/qtcreator/${pkgver%.*}/$pkgver/qt-creator-opensource-src-$pkgver.tar.xz"; - qtcreator-preload-plugins.patch) + qtcreator-preload-plugins.patch + qtcreator-clang-libs.patch + qtcreator-clang-10.patch::"https://code.qt.io/cgit/qt-creator/qt-creator.git/patch?id=44023c8f";) source+=(libre.patch) sha256sums=('8d67e45b66944fdb0f879cbfae341af7e38d6a348cf18332b5cb9f07937aae02' - 'd6f979c820e2294653f4f1853af96942bf25ff9fe9450657d45ff1c7f02bbca7') + 'd6f979c820e2294653f4f1853af96942bf25ff9fe9450657d45ff1c7f02bbca7' + '0f6d0dc41a87aae9ef371b1950f5b9d823db8b5685c6ac04a7a7ac133eb19a3f' + 'cbbaa52f8daf40866c1c7157f168746cf7cb0231200feaeed05a0fb80e78c8ab') sha256sums+=('6aeac164075b7f3f3a2e9aa75865669beeeb7903b9cbb5b6a8700205b285fe64') prepare() { @@ -59,6 +63,10 @@ prepare() { # and https://bugs.archlinux.org/task/59492 patch -p1 -i ../qtcreator-preload-plugins.patch + # Fix build with clang 10 + patch -p1 -i ../qtcreator-clang-10.patch + patch -p1 -i ../qtcreator-clang-libs.patch + # remove qt5-webengine support patch -Np1 -i "$srcdir"/libre.patch rm -rv src/plugins/help/webenginehelpviewer.{cpp,h} diff --git a/libre/qtcreator/qtcreator-clang-10.patch b/libre/qtcreator/qtcreator-clang-10.patch new file mode 100644 index 000000000..553f5c004 --- /dev/null +++ b/libre/qtcreator/qtcreator-clang-10.patch @@ -0,0 +1,277 @@ +From 44023c8f43fd8daf8b7be305ea6d99b8b56fa551 Mon Sep 17 00:00:00 2001 +From: Orgad Shaneh <[email protected]> +Date: Mon, 17 Feb 2020 23:21:17 +0200 +Subject: Clang: Fix build with Clang/LLVM 10 + +Change-Id: I740286c9dcfd325b1c31ab863fb5c91bf9c6ec70 +Reviewed-by: hjk <[email protected]> +--- + src/plugins/clangformat/clangformatutils.cpp | 8 +++++++ + .../source/collectbuilddependencytoolaction.h | 17 ++++++++++++- + .../source/collectusedmacroactionfactory.h | 12 ++++++++++ + .../source/generatepchactionfactory.h | 7 ++++++ + .../clangrefactoringbackend/source/clangquery.cpp | 3 ++- + .../source/collectsymbolsaction.h | 6 ++++- + .../source/indexdataconsumer.cpp | 28 +++++++++++++++------- + .../source/indexdataconsumer.h | 28 +++++++++++++++------- + .../source/symbolscollector.cpp | 4 ++++ + 9 files changed, 92 insertions(+), 21 deletions(-) + +diff --git a/src/plugins/clangformat/clangformatutils.cpp b/src/plugins/clangformat/clangformatutils.cpp +index f087f77a94..0a32d3a929 100644 +--- a/src/plugins/clangformat/clangformatutils.cpp ++++ b/src/plugins/clangformat/clangformatutils.cpp +@@ -57,7 +57,11 @@ static clang::format::FormatStyle qtcStyle() + style.AlignOperands = true; + style.AlignTrailingComments = true; + style.AllowAllParametersOfDeclarationOnNextLine = true; ++#if LLVM_VERSION_MAJOR >= 10 ++ style.AllowShortBlocksOnASingleLine = FormatStyle::SBS_Never; ++#else + style.AllowShortBlocksOnASingleLine = false; ++#endif + style.AllowShortCaseLabelsOnASingleLine = false; + style.AllowShortFunctionsOnASingleLine = FormatStyle::SFS_Inline; + #if LLVM_VERSION_MAJOR >= 9 +@@ -72,7 +76,11 @@ static clang::format::FormatStyle qtcStyle() + style.BinPackArguments = false; + style.BinPackParameters = false; + style.BraceWrapping.AfterClass = true; ++#if LLVM_VERSION_MAJOR >= 10 ++ style.BraceWrapping.AfterControlStatement = FormatStyle::BWACS_Never; ++#else + style.BraceWrapping.AfterControlStatement = false; ++#endif + style.BraceWrapping.AfterEnum = false; + style.BraceWrapping.AfterFunction = true; + style.BraceWrapping.AfterNamespace = false; +diff --git a/src/tools/clangpchmanagerbackend/source/collectbuilddependencytoolaction.h b/src/tools/clangpchmanagerbackend/source/collectbuilddependencytoolaction.h +index 538f2c7d3f..88ed3d2344 100644 +--- a/src/tools/clangpchmanagerbackend/source/collectbuilddependencytoolaction.h ++++ b/src/tools/clangpchmanagerbackend/source/collectbuilddependencytoolaction.h +@@ -60,6 +60,16 @@ public: + diagnosticConsumer); + } + ++#if LLVM_VERSION_MAJOR >= 10 ++ std::unique_ptr<clang::FrontendAction> create() override ++ { ++ return std::make_unique<CollectBuildDependencyAction>( ++ m_buildDependency, ++ m_filePathCache, ++ m_excludedIncludeUIDs, ++ m_alreadyIncludedFileUIDs); ++ } ++#else + clang::FrontendAction *create() override + { + return new CollectBuildDependencyAction(m_buildDependency, +@@ -67,6 +77,7 @@ public: + m_excludedIncludeUIDs, + m_alreadyIncludedFileUIDs); + } ++#endif + + std::vector<uint> generateExcludedIncludeFileUIDs(clang::FileManager &fileManager) const + { +@@ -77,7 +88,11 @@ public: + NativeFilePath nativeFilePath{filePath}; + const clang::FileEntry *file = fileManager.getFile({nativeFilePath.path().data(), + nativeFilePath.path().size()}, +- true); ++ true) ++#if LLVM_VERSION_MAJOR >= 10 ++ .get() ++#endif ++ ; + + if (file) + fileUIDs.push_back(file->getUID()); +diff --git a/src/tools/clangpchmanagerbackend/source/collectusedmacroactionfactory.h b/src/tools/clangpchmanagerbackend/source/collectusedmacroactionfactory.h +index 423d5f8876..473b8e7df8 100644 +--- a/src/tools/clangpchmanagerbackend/source/collectusedmacroactionfactory.h ++++ b/src/tools/clangpchmanagerbackend/source/collectusedmacroactionfactory.h +@@ -61,6 +61,17 @@ public: + diagnosticConsumer); + } + ++#if LLVM_VERSION_MAJOR >= 10 ++ std::unique_ptr<clang::FrontendAction> create() override ++ { ++ return std::make_unique<CollectUsedMacrosAction>( ++ m_usedMacros, ++ m_filePathCache, ++ m_sourceDependencies, ++ m_sourceFiles, ++ m_fileStatuses); ++ } ++#else + clang::FrontendAction *create() override + { + return new CollectUsedMacrosAction(m_usedMacros, +@@ -69,6 +80,7 @@ public: + m_sourceFiles, + m_fileStatuses); + } ++#endif + + private: + UsedMacros &m_usedMacros; +diff --git a/src/tools/clangpchmanagerbackend/source/generatepchactionfactory.h b/src/tools/clangpchmanagerbackend/source/generatepchactionfactory.h +index c4a8cae028..f1e4c74457 100644 +--- a/src/tools/clangpchmanagerbackend/source/generatepchactionfactory.h ++++ b/src/tools/clangpchmanagerbackend/source/generatepchactionfactory.h +@@ -68,10 +68,17 @@ public: + , m_fileContent(fileContent) + {} + ++#if LLVM_VERSION_MAJOR >= 10 ++ std::unique_ptr<clang::FrontendAction> create() override ++ { ++ return std::make_unique<GeneratePCHAction>(m_filePath, m_fileContent); ++ } ++#else + clang::FrontendAction *create() override + { + return new GeneratePCHAction{m_filePath, m_fileContent}; + } ++#endif + + private: + llvm::StringRef m_filePath; +diff --git a/src/tools/clangrefactoringbackend/source/clangquery.cpp b/src/tools/clangrefactoringbackend/source/clangquery.cpp +index 21ebeb8367..78f2350d8d 100644 +--- a/src/tools/clangrefactoringbackend/source/clangquery.cpp ++++ b/src/tools/clangrefactoringbackend/source/clangquery.cpp +@@ -78,7 +78,8 @@ void ClangQuery::findLocations() + std::make_move_iterator(asts.end()), + [&] (std::unique_ptr<clang::ASTUnit> &&ast) { + Diagnostics diagnostics; +- auto optionalMatcher = Parser::parseMatcherExpression({m_query.data(), m_query.size()}, ++ llvm::StringRef query{m_query.data(), m_query.size()}; ++ auto optionalMatcher = Parser::parseMatcherExpression(query, + nullptr, + &diagnostics); + parseDiagnostics(diagnostics); +diff --git a/src/tools/clangrefactoringbackend/source/collectsymbolsaction.h b/src/tools/clangrefactoringbackend/source/collectsymbolsaction.h +index a38f1c4f87..4f36adadf5 100644 +--- a/src/tools/clangrefactoringbackend/source/collectsymbolsaction.h ++++ b/src/tools/clangrefactoringbackend/source/collectsymbolsaction.h +@@ -48,7 +48,11 @@ class CollectSymbolsAction : public clang::WrapperFrontendAction + public: + CollectSymbolsAction(std::shared_ptr<IndexDataConsumer> indexDataConsumer) + : clang::WrapperFrontendAction( +- clang::index::createIndexingAction(indexDataConsumer, createIndexingOptions(), nullptr)) ++ clang::index::createIndexingAction(indexDataConsumer, createIndexingOptions() ++#if LLVM_VERSION_MAJOR < 10 ++ , nullptr ++#endif ++ )) + , m_indexDataConsumer(indexDataConsumer) + {} + +diff --git a/src/tools/clangrefactoringbackend/source/indexdataconsumer.cpp b/src/tools/clangrefactoringbackend/source/indexdataconsumer.cpp +index e287144462..5d21b30b9c 100644 +--- a/src/tools/clangrefactoringbackend/source/indexdataconsumer.cpp ++++ b/src/tools/clangrefactoringbackend/source/indexdataconsumer.cpp +@@ -118,11 +118,16 @@ bool IndexDataConsumer::isAlreadyParsed(clang::FileID fileId, SourcesManager &so + return sourcesManager.alreadyParsed(filePathId(fileEntry), fileEntry->getModificationTime()); + } + +-bool IndexDataConsumer::handleDeclOccurence(const clang::Decl *declaration, +- clang::index::SymbolRoleSet symbolRoles, +- llvm::ArrayRef<clang::index::SymbolRelation> /*symbolRelations*/, +- clang::SourceLocation sourceLocation, +- IndexDataConsumer::ASTNodeInfo /*astNodeInfo*/) ++#if LLVM_VERSION_MAJOR >= 10 ++ bool IndexDataConsumer::handleDeclOccurrence( ++#else ++ bool IndexDataConsumer::handleDeclOccurence( ++#endif ++ const clang::Decl *declaration, ++ clang::index::SymbolRoleSet symbolRoles, ++ llvm::ArrayRef<clang::index::SymbolRelation> /*symbolRelations*/, ++ clang::SourceLocation sourceLocation, ++ IndexDataConsumer::ASTNodeInfo /*astNodeInfo*/) + { + const auto *namedDeclaration = clang::dyn_cast<clang::NamedDecl>(declaration); + if (namedDeclaration) { +@@ -175,10 +180,15 @@ SourceLocationKind macroSymbolType(clang::index::SymbolRoleSet roles) + + } // namespace + +-bool IndexDataConsumer::handleMacroOccurence(const clang::IdentifierInfo *identifierInfo, +- const clang::MacroInfo *macroInfo, +- clang::index::SymbolRoleSet roles, +- clang::SourceLocation sourceLocation) ++#if LLVM_VERSION_MAJOR >= 10 ++bool IndexDataConsumer::handleMacroOccurrence( ++#else ++bool IndexDataConsumer::handleMacroOccurence( ++#endif ++ const clang::IdentifierInfo *identifierInfo, ++ const clang::MacroInfo *macroInfo, ++ clang::index::SymbolRoleSet roles, ++ clang::SourceLocation sourceLocation) + { + if (macroInfo && sourceLocation.isFileID() + && !isAlreadyParsed(m_sourceManager->getFileID(sourceLocation), m_macroSourcesManager) +diff --git a/src/tools/clangrefactoringbackend/source/indexdataconsumer.h b/src/tools/clangrefactoringbackend/source/indexdataconsumer.h +index c80e066b6c..e1d3529806 100644 +--- a/src/tools/clangrefactoringbackend/source/indexdataconsumer.h ++++ b/src/tools/clangrefactoringbackend/source/indexdataconsumer.h +@@ -57,16 +57,26 @@ public: + IndexDataConsumer(const IndexDataConsumer &) = delete; + IndexDataConsumer &operator=(const IndexDataConsumer &) = delete; + +- bool handleDeclOccurence(const clang::Decl *declaration, +- clang::index::SymbolRoleSet symbolRoles, +- llvm::ArrayRef<clang::index::SymbolRelation> symbolRelations, +- clang::SourceLocation sourceLocation, +- ASTNodeInfo astNodeInfo) override; ++#if LLVM_VERSION_MAJOR >= 10 ++ bool handleDeclOccurrence( ++#else ++ bool handleDeclOccurence( ++#endif ++ const clang::Decl *declaration, ++ clang::index::SymbolRoleSet symbolRoles, ++ llvm::ArrayRef<clang::index::SymbolRelation> symbolRelations, ++ clang::SourceLocation sourceLocation, ++ ASTNodeInfo astNodeInfo) override; + +- bool handleMacroOccurence(const clang::IdentifierInfo *identifierInfo, +- const clang::MacroInfo *macroInfo, +- clang::index::SymbolRoleSet roles, +- clang::SourceLocation sourceLocation) override; ++#if LLVM_VERSION_MAJOR >= 10 ++ bool handleMacroOccurrence( ++#else ++ bool handleMacroOccurence( ++#endif ++ const clang::IdentifierInfo *identifierInfo, ++ const clang::MacroInfo *macroInfo, ++ clang::index::SymbolRoleSet roles, ++ clang::SourceLocation sourceLocation) override; + + void finish() override; + +diff --git a/src/tools/clangrefactoringbackend/source/symbolscollector.cpp b/src/tools/clangrefactoringbackend/source/symbolscollector.cpp +index a233f6d8fe..dffd583894 100644 +--- a/src/tools/clangrefactoringbackend/source/symbolscollector.cpp ++++ b/src/tools/clangrefactoringbackend/source/symbolscollector.cpp +@@ -74,7 +74,11 @@ std::unique_ptr<clang::tooling::FrontendActionFactory> newFrontendActionFactory( + : m_action(consumerFactory) + {} + ++#if LLVM_VERSION_MAJOR >= 10 ++ std::unique_ptr<clang::FrontendAction> create() override { return std::make_unique<AdaptorAction>(m_action); } ++#else + clang::FrontendAction *create() override { return new AdaptorAction(m_action); } ++#endif + + private: + class AdaptorAction : public clang::ASTFrontendAction +-- +cgit v1.2.1 + diff --git a/libre/qtcreator/qtcreator-clang-libs.patch b/libre/qtcreator/qtcreator-clang-libs.patch new file mode 100644 index 000000000..a0cc8c547 --- /dev/null +++ b/libre/qtcreator/qtcreator-clang-libs.patch @@ -0,0 +1,24 @@ +diff --git a/src/shared/clang/clang_installation.pri b/src/shared/clang/clang_installation.pri +index 08838838bc..bee3779484 100644 +--- a/src/shared/clang/clang_installation.pri ++++ b/src/shared/clang/clang_installation.pri +@@ -131,9 +131,7 @@ defineReplace(extractWarnings) { + return($$result) + } + +-CLANGTOOLING_LIBS=-lclangTooling -lclangIndex -lclangFrontend -lclangParse -lclangSerialization \ +- -lclangSema -lclangEdit -lclangAnalysis -lclangDriver -lclangDynamicASTMatchers \ +- -lclangASTMatchers -lclangToolingCore -lclangAST -lclangLex -lclangBasic ++CLANGTOOLING_LIBS=-lclang-cpp + win32:CLANGTOOLING_LIBS += -lversion + + BIN_EXTENSION = +@@ -207,7 +205,7 @@ isEmpty(LLVM_VERSION) { + isEmpty(QTC_CLANG_BUILDMODE_MISMATCH)|!equals(QTC_CLANG_BUILDMODE_MISMATCH, 1) { + CLANGFORMAT_MAIN_HEADER = $$LLVM_INCLUDEPATH/clang/Format/Format.h + exists($$CLANGFORMAT_MAIN_HEADER) { +- CLANGFORMAT_LIBS=-lclangFormat -lclangToolingInclusions -lclangToolingCore -lclangRewrite -lclangLex -lclangBasic ++ CLANGFORMAT_LIBS=-lclang-cpp + ALL_CLANG_LIBS=-lclangFormat -lclangToolingInclusions -lclangTooling -lclangToolingCore \ + -lclangRewrite -lclangIndex -lclangFrontend -lclangParse -lclangSerialization \ + -lclangSema -lclangEdit -lclangAnalysis -lclangDriver -lclangDynamicASTMatchers \ -- 2.26.1
From 6e9b59ffc7c7801a3256b06f0b8a7e22cda49010 Mon Sep 17 00:00:00 2001 From: Theo von Arx <[email protected]> Date: Tue, 21 Apr 2020 10:09:48 +0200 Subject: [PATCH] Update libre/cups-filters to 1.27.4 - Built on all three architectures, successfully tested on x86_64 - This update was necessary for me to get the printer working again (seems like a consequence of the update of cups) --- libre/cups-filters/PKGBUILD | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libre/cups-filters/PKGBUILD b/libre/cups-filters/PKGBUILD index c43b01109..4ef447a03 100644 --- a/libre/cups-filters/PKGBUILD +++ b/libre/cups-filters/PKGBUILD @@ -2,9 +2,9 @@ # Maintainer: Omar Vega Ramos <[email protected]> pkgname=cups-filters -pkgver=1.27.0 +pkgver=1.27.4 pkgrel=1 -pkgrel+=.parabola6 +pkgrel+=.parabola1 pkgdesc="OpenPrinting CUPS Filters" pkgdesc+=", without foomatic-db-nonfree recommendation" arch=('x86_64') @@ -23,7 +23,7 @@ optdepends=('ghostscript: for non-PostScript printers to print with CUPS to conv 'antiword: needed to convert MS Word documents (requires also docx2txt)') backup=(etc/cups/cups-browsed.conf) source=(https://www.openprinting.org/download/cups-filters/$pkgname-$pkgver.tar.xz) -sha256sums=('4ae3cb322baac1a873d583834393e42ae5e2790e1f161a59117870b144f63404') +sha256sums=('0bc9df9c4ca0f41685c8d6de56fad40109798f567326fc4167d7edb2600f0b84') build() { cd "$pkgname"-$pkgver @@ -47,12 +47,12 @@ check() { package() { cd "$pkgname"-$pkgver make DESTDIR="$pkgdir/" install - + # add upstream systemd support file install -Dm644 utils/cups-browsed.service "${pkgdir}"/usr/lib/systemd/system/cups-browsed.service sed -i "s|/usr/sbin/cups-browsed|/usr/bin/cups-browsed|" "${pkgdir}"/usr/lib/systemd/system/cups-browsed.service sed -i "s|cups.service|org.cups.cupsd.service|g" "${pkgdir}"/usr/lib/systemd/system/cups-browsed.service - + # use cups group from cups pkg FS#56818 chgrp -R 209 "${pkgdir}"/etc/cups -- 2.26.1
From dda1e07d119353954df7682f0919eceda5570cd1 Mon Sep 17 00:00:00 2001 From: Theo von Arx <[email protected]> Date: Wed, 19 Feb 2020 20:58:05 +0100 Subject: [PATCH 1/3] Update [libre/qutebrowser] to 1.10.1 --- libre/qutebrowser/PKGBUILD | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libre/qutebrowser/PKGBUILD b/libre/qutebrowser/PKGBUILD index c473001bd..874518b1d 100644 --- a/libre/qutebrowser/PKGBUILD +++ b/libre/qutebrowser/PKGBUILD @@ -9,9 +9,9 @@ # - set webkit backend as default pkgname=qutebrowser -_pkgver_armv7h=1.10.0 # this could be an 'any' package -_pkgver_i686=1.10.0 # but our different arches do not always roll at the same speed -_pkgver_x86_64=1.10.0 +_pkgver_armv7h=1.10.1 # this could be an 'any' package +_pkgver_i686=1.10.1 # but our different arches do not always roll at the same speed +_pkgver_x86_64=1.10.1 eval "pkgver=\$_pkgver_${CARCH}" pkgrel=1 pkgrel+=.par1 @@ -34,13 +34,13 @@ source=("https://github.com/qutebrowser/qutebrowser/releases/download/v$pkgver/q "https://github.com/qutebrowser/qutebrowser/releases/download/v$pkgver/qutebrowser-$pkgver.tar.gz.asc"; "webkit-warning.patch") validpgpkeys=("E04E560002401B8EF0E76F0A916EB0C8FD55A072") # Florian Bruhin -_sha256sums_x86_64=('7ecd7a08380b22eb1268fcc4446ba9d4d005601cb9366097779255edd9683bdf' +_sha256sums_x86_64=('a8ed72d40b4b2283b61b939bb358ada2270fe153bccb8ee012e94fb29cb66c19' 'SKIP' '8509032254715a09d807ac5901657e66d0d0780e47bbe2b06f634d7b7c9792d0') -_sha256sums_i686=('7ecd7a08380b22eb1268fcc4446ba9d4d005601cb9366097779255edd9683bdf' +_sha256sums_i686=('a8ed72d40b4b2283b61b939bb358ada2270fe153bccb8ee012e94fb29cb66c19' 'SKIP' '8509032254715a09d807ac5901657e66d0d0780e47bbe2b06f634d7b7c9792d0') -_sha256sums_armv7h=('7ecd7a08380b22eb1268fcc4446ba9d4d005601cb9366097779255edd9683bdf' +_sha256sums_armv7h=('a8ed72d40b4b2283b61b939bb358ada2270fe153bccb8ee012e94fb29cb66c19' 'SKIP' '8509032254715a09d807ac5901657e66d0d0780e47bbe2b06f634d7b7c9792d0') eval "sha256sums=(\${_sha256sums_${CARCH}[@]})" -- 2.26.1
From edb61a3ec39e98d5bdd0bdc19e8066eb1257eb3a Mon Sep 17 00:00:00 2001 From: Theo von Arx <[email protected]> Date: Tue, 31 Mar 2020 16:00:12 +0200 Subject: [PATCH 2/3] libre/qutebrowser: Adapt more to Arch's PKGBUILD --- libre/qutebrowser/PKGBUILD | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libre/qutebrowser/PKGBUILD b/libre/qutebrowser/PKGBUILD index 874518b1d..1303eec83 100644 --- a/libre/qutebrowser/PKGBUILD +++ b/libre/qutebrowser/PKGBUILD @@ -1,4 +1,5 @@ # Maintainer (Arch): Morten Linderud <[email protected]> +# Maintainer (Arch): Lukas Fleischer <[email protected]> # Contributor (Arch): Pierre Neidhardt <[email protected]> # Contributor (Arch): Florian Bruhin (The Compiler) <[email protected]> # Maintainer: Omar Vega Ramos <[email protected]> @@ -33,7 +34,7 @@ options=(!emptydirs) source=("https://github.com/qutebrowser/qutebrowser/releases/download/v$pkgver/qutebrowser-$pkgver.tar.gz"; "https://github.com/qutebrowser/qutebrowser/releases/download/v$pkgver/qutebrowser-$pkgver.tar.gz.asc"; "webkit-warning.patch") -validpgpkeys=("E04E560002401B8EF0E76F0A916EB0C8FD55A072") # Florian Bruhin +validpgpkeys=("E04E560002401B8EF0E76F0A916EB0C8FD55A072") _sha256sums_x86_64=('a8ed72d40b4b2283b61b939bb358ada2270fe153bccb8ee012e94fb29cb66c19' 'SKIP' '8509032254715a09d807ac5901657e66d0d0780e47bbe2b06f634d7b7c9792d0') -- 2.26.1
From c4b0433d02a3effdb856fab136fdbae508265071 Mon Sep 17 00:00:00 2001 From: Theo von Arx <[email protected]> Date: Sat, 18 Apr 2020 09:01:07 +0200 Subject: [PATCH 3/3] Update libre/qutebrowser to v1.10.2 - Built for a all three architectures, tested on x86_64 --- libre/qutebrowser/PKGBUILD | 20 ++++++++++---------- libre/qutebrowser/webkit-warning.patch | 18 +++++++++--------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/libre/qutebrowser/PKGBUILD b/libre/qutebrowser/PKGBUILD index 1303eec83..8d7b16286 100644 --- a/libre/qutebrowser/PKGBUILD +++ b/libre/qutebrowser/PKGBUILD @@ -10,9 +10,9 @@ # - set webkit backend as default pkgname=qutebrowser -_pkgver_armv7h=1.10.1 # this could be an 'any' package -_pkgver_i686=1.10.1 # but our different arches do not always roll at the same speed -_pkgver_x86_64=1.10.1 +_pkgver_armv7h=1.10.2 # this could be an 'any' package +_pkgver_i686=1.10.2 # but our different arches do not always roll at the same speed +_pkgver_x86_64=1.10.2 eval "pkgver=\$_pkgver_${CARCH}" pkgrel=1 pkgrel+=.par1 @@ -35,15 +35,15 @@ source=("https://github.com/qutebrowser/qutebrowser/releases/download/v$pkgver/q "https://github.com/qutebrowser/qutebrowser/releases/download/v$pkgver/qutebrowser-$pkgver.tar.gz.asc"; "webkit-warning.patch") validpgpkeys=("E04E560002401B8EF0E76F0A916EB0C8FD55A072") -_sha256sums_x86_64=('a8ed72d40b4b2283b61b939bb358ada2270fe153bccb8ee012e94fb29cb66c19' +_sha256sums_x86_64=('fb457cb58ab6ade66e854a3558670acf9141018f6e436ab623908f372919396a' 'SKIP' - '8509032254715a09d807ac5901657e66d0d0780e47bbe2b06f634d7b7c9792d0') -_sha256sums_i686=('a8ed72d40b4b2283b61b939bb358ada2270fe153bccb8ee012e94fb29cb66c19' + 'a4d385524f75f7378eb3f44bb1d8a7c4c3213ee1a42ceed7f5f208eac06dec8f') +_sha256sums_i686=('fb457cb58ab6ade66e854a3558670acf9141018f6e436ab623908f372919396a' 'SKIP' - '8509032254715a09d807ac5901657e66d0d0780e47bbe2b06f634d7b7c9792d0') -_sha256sums_armv7h=('a8ed72d40b4b2283b61b939bb358ada2270fe153bccb8ee012e94fb29cb66c19' - 'SKIP' - '8509032254715a09d807ac5901657e66d0d0780e47bbe2b06f634d7b7c9792d0') + 'a4d385524f75f7378eb3f44bb1d8a7c4c3213ee1a42ceed7f5f208eac06dec8f') +_sha256sums_armv7h=('fb457cb58ab6ade66e854a3558670acf9141018f6e436ab623908f372919396a' + 'SKIP' + 'a4d385524f75f7378eb3f44bb1d8a7c4c3213ee1a42ceed7f5f208eac06dec8f') eval "sha256sums=(\${_sha256sums_${CARCH}[@]})" diff --git a/libre/qutebrowser/webkit-warning.patch b/libre/qutebrowser/webkit-warning.patch index 97994870c..237232ede 100644 --- a/libre/qutebrowser/webkit-warning.patch +++ b/libre/qutebrowser/webkit-warning.patch @@ -1,20 +1,20 @@ diff --git a/qutebrowser/html/warning-webkit.html b/qutebrowser/html/warning-webkit.html -index e87597b..ada806f 100644 +index 7fc22903a..ada806f87 100644 --- a/qutebrowser/html/warning-webkit.html +++ b/qutebrowser/html/warning-webkit.html @@ -2,8 +2,6 @@ - + {% block content %} <h1>{{ title }}</h1> -<span class="note">Note this warning will only appear once. Use <span class="mono">:open -qute://warning/webkit</span> to show it again at a later time.</span> - + <p>You're using qutebrowser with the QtWebKit backend.</p> - + @@ -17,66 +15,6 @@ unpatched vulnerabilities. Please use it carefully and avoid visiting untrusted websites and using it for transmission of sensitive data. Wait for new release from qtwebkit-dev branch to use it with untrusted content.</blockquote> - + -<p>It's recommended that you use QtWebEngine instead.</p> - -<h2>(Outdated) reasons to use QtWebKit</h2> @@ -68,10 +68,10 @@ index e87597b..ada806f 100644 -<p><b>QtWebEngine being unavailable on Parabola</b>: Claims of Parabola -developers about QtWebEngine being "non-free" have repeatedly been disputed, -and so far nobody came up with solid evidence about that being the case. Also, --note that their qutebrowser package was often outdated in the past (even --qutebrowser security fixes took months to arrive there). You might be better --off chosing an <a href="https://qutebrowser.org/doc/install.html#tox";> --alternative install method</a>.</p> +-note that their qutebrowser package is usually very outdated (even qutebrowser +-security fixes took months to arrive there). You might be better off chosing an +-<a href="https://qutebrowser.org/doc/install.html#tox";> alternative install +-method</a>.</p> - -<p><b>White flashing between loads with a custom stylesheet</b>: This doesn't -seem to happen with <span class="mono">qt.process_model = single-process</span> -- 2.26.1
_______________________________________________ Dev mailing list [email protected] https://lists.parabola.nu/mailman/listinfo/dev
From b602e389d95d99e6ace642d8c7695e1e68d1dd81 Mon Sep 17 00:00:00 2001 From: Theo von Arx <[email protected]> Date: Tue, 21 Apr 2020 16:50:14 +0200 Subject: [PATCH 1/2] Rebuild libre/qtcreator for clang 10.0.0 Sucessfully built on x86_64, i686. Tested on x86_64. The build for armv7h fails on my machine, but could succeed on others. --- libre/qtcreator/PKGBUILD | 16 +- libre/qtcreator/qtcreator-clang-10.patch | 277 +++++++++++++++++++++ libre/qtcreator/qtcreator-clang-libs.patch | 24 ++ 3 files changed, 313 insertions(+), 4 deletions(-) create mode 100644 libre/qtcreator/qtcreator-clang-10.patch create mode 100644 libre/qtcreator/qtcreator-clang-libs.patch diff --git a/libre/qtcreator/PKGBUILD b/libre/qtcreator/PKGBUILD index 9963e5a5e..290601831 100644 --- a/libre/qtcreator/PKGBUILD +++ b/libre/qtcreator/PKGBUILD @@ -15,8 +15,8 @@ pkgname=qtcreator pkgver=4.11.2 -_clangver=9.0.1 -pkgrel=2 +_clangver=10.0.0 +pkgrel=4 pkgrel+=.parabola1 pkgdesc='Lightweight, cross-platform integrated development environment' pkgdesc+=', without nonfree qt5-webengine help viewer' @@ -39,10 +39,14 @@ optdepends=('qt5-doc: integrated Qt documentation' 'valgrind: analyze support' 'perf: performer analyzer') source=("https://download.qt.io/official_releases/qtcreator/${pkgver%.*}/$pkgver/qt-creator-opensource-src-$pkgver.tar.xz"; - qtcreator-preload-plugins.patch) + qtcreator-preload-plugins.patch + qtcreator-clang-libs.patch + qtcreator-clang-10.patch::"https://code.qt.io/cgit/qt-creator/qt-creator.git/patch?id=44023c8f";) source+=(libre.patch) sha256sums=('8d67e45b66944fdb0f879cbfae341af7e38d6a348cf18332b5cb9f07937aae02' - 'd6f979c820e2294653f4f1853af96942bf25ff9fe9450657d45ff1c7f02bbca7') + 'd6f979c820e2294653f4f1853af96942bf25ff9fe9450657d45ff1c7f02bbca7' + '0f6d0dc41a87aae9ef371b1950f5b9d823db8b5685c6ac04a7a7ac133eb19a3f' + 'cbbaa52f8daf40866c1c7157f168746cf7cb0231200feaeed05a0fb80e78c8ab') sha256sums+=('6aeac164075b7f3f3a2e9aa75865669beeeb7903b9cbb5b6a8700205b285fe64') prepare() { @@ -59,6 +63,10 @@ prepare() { # and https://bugs.archlinux.org/task/59492 patch -p1 -i ../qtcreator-preload-plugins.patch + # Fix build with clang 10 + patch -p1 -i ../qtcreator-clang-10.patch + patch -p1 -i ../qtcreator-clang-libs.patch + # remove qt5-webengine support patch -Np1 -i "$srcdir"/libre.patch rm -rv src/plugins/help/webenginehelpviewer.{cpp,h} diff --git a/libre/qtcreator/qtcreator-clang-10.patch b/libre/qtcreator/qtcreator-clang-10.patch new file mode 100644 index 000000000..553f5c004 --- /dev/null +++ b/libre/qtcreator/qtcreator-clang-10.patch @@ -0,0 +1,277 @@ +From 44023c8f43fd8daf8b7be305ea6d99b8b56fa551 Mon Sep 17 00:00:00 2001 +From: Orgad Shaneh <[email protected]> +Date: Mon, 17 Feb 2020 23:21:17 +0200 +Subject: Clang: Fix build with Clang/LLVM 10 + +Change-Id: I740286c9dcfd325b1c31ab863fb5c91bf9c6ec70 +Reviewed-by: hjk <[email protected]> +--- + src/plugins/clangformat/clangformatutils.cpp | 8 +++++++ + .../source/collectbuilddependencytoolaction.h | 17 ++++++++++++- + .../source/collectusedmacroactionfactory.h | 12 ++++++++++ + .../source/generatepchactionfactory.h | 7 ++++++ + .../clangrefactoringbackend/source/clangquery.cpp | 3 ++- + .../source/collectsymbolsaction.h | 6 ++++- + .../source/indexdataconsumer.cpp | 28 +++++++++++++++------- + .../source/indexdataconsumer.h | 28 +++++++++++++++------- + .../source/symbolscollector.cpp | 4 ++++ + 9 files changed, 92 insertions(+), 21 deletions(-) + +diff --git a/src/plugins/clangformat/clangformatutils.cpp b/src/plugins/clangformat/clangformatutils.cpp +index f087f77a94..0a32d3a929 100644 +--- a/src/plugins/clangformat/clangformatutils.cpp ++++ b/src/plugins/clangformat/clangformatutils.cpp +@@ -57,7 +57,11 @@ static clang::format::FormatStyle qtcStyle() + style.AlignOperands = true; + style.AlignTrailingComments = true; + style.AllowAllParametersOfDeclarationOnNextLine = true; ++#if LLVM_VERSION_MAJOR >= 10 ++ style.AllowShortBlocksOnASingleLine = FormatStyle::SBS_Never; ++#else + style.AllowShortBlocksOnASingleLine = false; ++#endif + style.AllowShortCaseLabelsOnASingleLine = false; + style.AllowShortFunctionsOnASingleLine = FormatStyle::SFS_Inline; + #if LLVM_VERSION_MAJOR >= 9 +@@ -72,7 +76,11 @@ static clang::format::FormatStyle qtcStyle() + style.BinPackArguments = false; + style.BinPackParameters = false; + style.BraceWrapping.AfterClass = true; ++#if LLVM_VERSION_MAJOR >= 10 ++ style.BraceWrapping.AfterControlStatement = FormatStyle::BWACS_Never; ++#else + style.BraceWrapping.AfterControlStatement = false; ++#endif + style.BraceWrapping.AfterEnum = false; + style.BraceWrapping.AfterFunction = true; + style.BraceWrapping.AfterNamespace = false; +diff --git a/src/tools/clangpchmanagerbackend/source/collectbuilddependencytoolaction.h b/src/tools/clangpchmanagerbackend/source/collectbuilddependencytoolaction.h +index 538f2c7d3f..88ed3d2344 100644 +--- a/src/tools/clangpchmanagerbackend/source/collectbuilddependencytoolaction.h ++++ b/src/tools/clangpchmanagerbackend/source/collectbuilddependencytoolaction.h +@@ -60,6 +60,16 @@ public: + diagnosticConsumer); + } + ++#if LLVM_VERSION_MAJOR >= 10 ++ std::unique_ptr<clang::FrontendAction> create() override ++ { ++ return std::make_unique<CollectBuildDependencyAction>( ++ m_buildDependency, ++ m_filePathCache, ++ m_excludedIncludeUIDs, ++ m_alreadyIncludedFileUIDs); ++ } ++#else + clang::FrontendAction *create() override + { + return new CollectBuildDependencyAction(m_buildDependency, +@@ -67,6 +77,7 @@ public: + m_excludedIncludeUIDs, + m_alreadyIncludedFileUIDs); + } ++#endif + + std::vector<uint> generateExcludedIncludeFileUIDs(clang::FileManager &fileManager) const + { +@@ -77,7 +88,11 @@ public: + NativeFilePath nativeFilePath{filePath}; + const clang::FileEntry *file = fileManager.getFile({nativeFilePath.path().data(), + nativeFilePath.path().size()}, +- true); ++ true) ++#if LLVM_VERSION_MAJOR >= 10 ++ .get() ++#endif ++ ; + + if (file) + fileUIDs.push_back(file->getUID()); +diff --git a/src/tools/clangpchmanagerbackend/source/collectusedmacroactionfactory.h b/src/tools/clangpchmanagerbackend/source/collectusedmacroactionfactory.h +index 423d5f8876..473b8e7df8 100644 +--- a/src/tools/clangpchmanagerbackend/source/collectusedmacroactionfactory.h ++++ b/src/tools/clangpchmanagerbackend/source/collectusedmacroactionfactory.h +@@ -61,6 +61,17 @@ public: + diagnosticConsumer); + } + ++#if LLVM_VERSION_MAJOR >= 10 ++ std::unique_ptr<clang::FrontendAction> create() override ++ { ++ return std::make_unique<CollectUsedMacrosAction>( ++ m_usedMacros, ++ m_filePathCache, ++ m_sourceDependencies, ++ m_sourceFiles, ++ m_fileStatuses); ++ } ++#else + clang::FrontendAction *create() override + { + return new CollectUsedMacrosAction(m_usedMacros, +@@ -69,6 +80,7 @@ public: + m_sourceFiles, + m_fileStatuses); + } ++#endif + + private: + UsedMacros &m_usedMacros; +diff --git a/src/tools/clangpchmanagerbackend/source/generatepchactionfactory.h b/src/tools/clangpchmanagerbackend/source/generatepchactionfactory.h +index c4a8cae028..f1e4c74457 100644 +--- a/src/tools/clangpchmanagerbackend/source/generatepchactionfactory.h ++++ b/src/tools/clangpchmanagerbackend/source/generatepchactionfactory.h +@@ -68,10 +68,17 @@ public: + , m_fileContent(fileContent) + {} + ++#if LLVM_VERSION_MAJOR >= 10 ++ std::unique_ptr<clang::FrontendAction> create() override ++ { ++ return std::make_unique<GeneratePCHAction>(m_filePath, m_fileContent); ++ } ++#else + clang::FrontendAction *create() override + { + return new GeneratePCHAction{m_filePath, m_fileContent}; + } ++#endif + + private: + llvm::StringRef m_filePath; +diff --git a/src/tools/clangrefactoringbackend/source/clangquery.cpp b/src/tools/clangrefactoringbackend/source/clangquery.cpp +index 21ebeb8367..78f2350d8d 100644 +--- a/src/tools/clangrefactoringbackend/source/clangquery.cpp ++++ b/src/tools/clangrefactoringbackend/source/clangquery.cpp +@@ -78,7 +78,8 @@ void ClangQuery::findLocations() + std::make_move_iterator(asts.end()), + [&] (std::unique_ptr<clang::ASTUnit> &&ast) { + Diagnostics diagnostics; +- auto optionalMatcher = Parser::parseMatcherExpression({m_query.data(), m_query.size()}, ++ llvm::StringRef query{m_query.data(), m_query.size()}; ++ auto optionalMatcher = Parser::parseMatcherExpression(query, + nullptr, + &diagnostics); + parseDiagnostics(diagnostics); +diff --git a/src/tools/clangrefactoringbackend/source/collectsymbolsaction.h b/src/tools/clangrefactoringbackend/source/collectsymbolsaction.h +index a38f1c4f87..4f36adadf5 100644 +--- a/src/tools/clangrefactoringbackend/source/collectsymbolsaction.h ++++ b/src/tools/clangrefactoringbackend/source/collectsymbolsaction.h +@@ -48,7 +48,11 @@ class CollectSymbolsAction : public clang::WrapperFrontendAction + public: + CollectSymbolsAction(std::shared_ptr<IndexDataConsumer> indexDataConsumer) + : clang::WrapperFrontendAction( +- clang::index::createIndexingAction(indexDataConsumer, createIndexingOptions(), nullptr)) ++ clang::index::createIndexingAction(indexDataConsumer, createIndexingOptions() ++#if LLVM_VERSION_MAJOR < 10 ++ , nullptr ++#endif ++ )) + , m_indexDataConsumer(indexDataConsumer) + {} + +diff --git a/src/tools/clangrefactoringbackend/source/indexdataconsumer.cpp b/src/tools/clangrefactoringbackend/source/indexdataconsumer.cpp +index e287144462..5d21b30b9c 100644 +--- a/src/tools/clangrefactoringbackend/source/indexdataconsumer.cpp ++++ b/src/tools/clangrefactoringbackend/source/indexdataconsumer.cpp +@@ -118,11 +118,16 @@ bool IndexDataConsumer::isAlreadyParsed(clang::FileID fileId, SourcesManager &so + return sourcesManager.alreadyParsed(filePathId(fileEntry), fileEntry->getModificationTime()); + } + +-bool IndexDataConsumer::handleDeclOccurence(const clang::Decl *declaration, +- clang::index::SymbolRoleSet symbolRoles, +- llvm::ArrayRef<clang::index::SymbolRelation> /*symbolRelations*/, +- clang::SourceLocation sourceLocation, +- IndexDataConsumer::ASTNodeInfo /*astNodeInfo*/) ++#if LLVM_VERSION_MAJOR >= 10 ++ bool IndexDataConsumer::handleDeclOccurrence( ++#else ++ bool IndexDataConsumer::handleDeclOccurence( ++#endif ++ const clang::Decl *declaration, ++ clang::index::SymbolRoleSet symbolRoles, ++ llvm::ArrayRef<clang::index::SymbolRelation> /*symbolRelations*/, ++ clang::SourceLocation sourceLocation, ++ IndexDataConsumer::ASTNodeInfo /*astNodeInfo*/) + { + const auto *namedDeclaration = clang::dyn_cast<clang::NamedDecl>(declaration); + if (namedDeclaration) { +@@ -175,10 +180,15 @@ SourceLocationKind macroSymbolType(clang::index::SymbolRoleSet roles) + + } // namespace + +-bool IndexDataConsumer::handleMacroOccurence(const clang::IdentifierInfo *identifierInfo, +- const clang::MacroInfo *macroInfo, +- clang::index::SymbolRoleSet roles, +- clang::SourceLocation sourceLocation) ++#if LLVM_VERSION_MAJOR >= 10 ++bool IndexDataConsumer::handleMacroOccurrence( ++#else ++bool IndexDataConsumer::handleMacroOccurence( ++#endif ++ const clang::IdentifierInfo *identifierInfo, ++ const clang::MacroInfo *macroInfo, ++ clang::index::SymbolRoleSet roles, ++ clang::SourceLocation sourceLocation) + { + if (macroInfo && sourceLocation.isFileID() + && !isAlreadyParsed(m_sourceManager->getFileID(sourceLocation), m_macroSourcesManager) +diff --git a/src/tools/clangrefactoringbackend/source/indexdataconsumer.h b/src/tools/clangrefactoringbackend/source/indexdataconsumer.h +index c80e066b6c..e1d3529806 100644 +--- a/src/tools/clangrefactoringbackend/source/indexdataconsumer.h ++++ b/src/tools/clangrefactoringbackend/source/indexdataconsumer.h +@@ -57,16 +57,26 @@ public: + IndexDataConsumer(const IndexDataConsumer &) = delete; + IndexDataConsumer &operator=(const IndexDataConsumer &) = delete; + +- bool handleDeclOccurence(const clang::Decl *declaration, +- clang::index::SymbolRoleSet symbolRoles, +- llvm::ArrayRef<clang::index::SymbolRelation> symbolRelations, +- clang::SourceLocation sourceLocation, +- ASTNodeInfo astNodeInfo) override; ++#if LLVM_VERSION_MAJOR >= 10 ++ bool handleDeclOccurrence( ++#else ++ bool handleDeclOccurence( ++#endif ++ const clang::Decl *declaration, ++ clang::index::SymbolRoleSet symbolRoles, ++ llvm::ArrayRef<clang::index::SymbolRelation> symbolRelations, ++ clang::SourceLocation sourceLocation, ++ ASTNodeInfo astNodeInfo) override; + +- bool handleMacroOccurence(const clang::IdentifierInfo *identifierInfo, +- const clang::MacroInfo *macroInfo, +- clang::index::SymbolRoleSet roles, +- clang::SourceLocation sourceLocation) override; ++#if LLVM_VERSION_MAJOR >= 10 ++ bool handleMacroOccurrence( ++#else ++ bool handleMacroOccurence( ++#endif ++ const clang::IdentifierInfo *identifierInfo, ++ const clang::MacroInfo *macroInfo, ++ clang::index::SymbolRoleSet roles, ++ clang::SourceLocation sourceLocation) override; + + void finish() override; + +diff --git a/src/tools/clangrefactoringbackend/source/symbolscollector.cpp b/src/tools/clangrefactoringbackend/source/symbolscollector.cpp +index a233f6d8fe..dffd583894 100644 +--- a/src/tools/clangrefactoringbackend/source/symbolscollector.cpp ++++ b/src/tools/clangrefactoringbackend/source/symbolscollector.cpp +@@ -74,7 +74,11 @@ std::unique_ptr<clang::tooling::FrontendActionFactory> newFrontendActionFactory( + : m_action(consumerFactory) + {} + ++#if LLVM_VERSION_MAJOR >= 10 ++ std::unique_ptr<clang::FrontendAction> create() override { return std::make_unique<AdaptorAction>(m_action); } ++#else + clang::FrontendAction *create() override { return new AdaptorAction(m_action); } ++#endif + + private: + class AdaptorAction : public clang::ASTFrontendAction +-- +cgit v1.2.1 + diff --git a/libre/qtcreator/qtcreator-clang-libs.patch b/libre/qtcreator/qtcreator-clang-libs.patch new file mode 100644 index 000000000..a0cc8c547 --- /dev/null +++ b/libre/qtcreator/qtcreator-clang-libs.patch @@ -0,0 +1,24 @@ +diff --git a/src/shared/clang/clang_installation.pri b/src/shared/clang/clang_installation.pri +index 08838838bc..bee3779484 100644 +--- a/src/shared/clang/clang_installation.pri ++++ b/src/shared/clang/clang_installation.pri +@@ -131,9 +131,7 @@ defineReplace(extractWarnings) { + return($$result) + } + +-CLANGTOOLING_LIBS=-lclangTooling -lclangIndex -lclangFrontend -lclangParse -lclangSerialization \ +- -lclangSema -lclangEdit -lclangAnalysis -lclangDriver -lclangDynamicASTMatchers \ +- -lclangASTMatchers -lclangToolingCore -lclangAST -lclangLex -lclangBasic ++CLANGTOOLING_LIBS=-lclang-cpp + win32:CLANGTOOLING_LIBS += -lversion + + BIN_EXTENSION = +@@ -207,7 +205,7 @@ isEmpty(LLVM_VERSION) { + isEmpty(QTC_CLANG_BUILDMODE_MISMATCH)|!equals(QTC_CLANG_BUILDMODE_MISMATCH, 1) { + CLANGFORMAT_MAIN_HEADER = $$LLVM_INCLUDEPATH/clang/Format/Format.h + exists($$CLANGFORMAT_MAIN_HEADER) { +- CLANGFORMAT_LIBS=-lclangFormat -lclangToolingInclusions -lclangToolingCore -lclangRewrite -lclangLex -lclangBasic ++ CLANGFORMAT_LIBS=-lclang-cpp + ALL_CLANG_LIBS=-lclangFormat -lclangToolingInclusions -lclangTooling -lclangToolingCore \ + -lclangRewrite -lclangIndex -lclangFrontend -lclangParse -lclangSerialization \ + -lclangSema -lclangEdit -lclangAnalysis -lclangDriver -lclangDynamicASTMatchers \ -- 2.26.2
From 73da0109c86887986d8ded83debcd84d0397df3a Mon Sep 17 00:00:00 2001 From: Theo von Arx <[email protected]> Date: Wed, 19 Feb 2020 20:58:05 +0100 Subject: [PATCH 1/4] Update [libre/qutebrowser] to 1.10.1 --- libre/qutebrowser/PKGBUILD | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libre/qutebrowser/PKGBUILD b/libre/qutebrowser/PKGBUILD index c473001bd..874518b1d 100644 --- a/libre/qutebrowser/PKGBUILD +++ b/libre/qutebrowser/PKGBUILD @@ -9,9 +9,9 @@ # - set webkit backend as default pkgname=qutebrowser -_pkgver_armv7h=1.10.0 # this could be an 'any' package -_pkgver_i686=1.10.0 # but our different arches do not always roll at the same speed -_pkgver_x86_64=1.10.0 +_pkgver_armv7h=1.10.1 # this could be an 'any' package +_pkgver_i686=1.10.1 # but our different arches do not always roll at the same speed +_pkgver_x86_64=1.10.1 eval "pkgver=\$_pkgver_${CARCH}" pkgrel=1 pkgrel+=.par1 @@ -34,13 +34,13 @@ source=("https://github.com/qutebrowser/qutebrowser/releases/download/v$pkgver/q "https://github.com/qutebrowser/qutebrowser/releases/download/v$pkgver/qutebrowser-$pkgver.tar.gz.asc"; "webkit-warning.patch") validpgpkeys=("E04E560002401B8EF0E76F0A916EB0C8FD55A072") # Florian Bruhin -_sha256sums_x86_64=('7ecd7a08380b22eb1268fcc4446ba9d4d005601cb9366097779255edd9683bdf' +_sha256sums_x86_64=('a8ed72d40b4b2283b61b939bb358ada2270fe153bccb8ee012e94fb29cb66c19' 'SKIP' '8509032254715a09d807ac5901657e66d0d0780e47bbe2b06f634d7b7c9792d0') -_sha256sums_i686=('7ecd7a08380b22eb1268fcc4446ba9d4d005601cb9366097779255edd9683bdf' +_sha256sums_i686=('a8ed72d40b4b2283b61b939bb358ada2270fe153bccb8ee012e94fb29cb66c19' 'SKIP' '8509032254715a09d807ac5901657e66d0d0780e47bbe2b06f634d7b7c9792d0') -_sha256sums_armv7h=('7ecd7a08380b22eb1268fcc4446ba9d4d005601cb9366097779255edd9683bdf' +_sha256sums_armv7h=('a8ed72d40b4b2283b61b939bb358ada2270fe153bccb8ee012e94fb29cb66c19' 'SKIP' '8509032254715a09d807ac5901657e66d0d0780e47bbe2b06f634d7b7c9792d0') eval "sha256sums=(\${_sha256sums_${CARCH}[@]})" -- 2.26.2
From eb2e4ddb0988c6d71577b85143a9b77a411b5c47 Mon Sep 17 00:00:00 2001 From: Theo von Arx <[email protected]> Date: Tue, 31 Mar 2020 16:00:12 +0200 Subject: [PATCH 2/4] libre/qutebrowser: Adapt more to Arch's PKGBUILD --- libre/qutebrowser/PKGBUILD | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libre/qutebrowser/PKGBUILD b/libre/qutebrowser/PKGBUILD index 874518b1d..1303eec83 100644 --- a/libre/qutebrowser/PKGBUILD +++ b/libre/qutebrowser/PKGBUILD @@ -1,4 +1,5 @@ # Maintainer (Arch): Morten Linderud <[email protected]> +# Maintainer (Arch): Lukas Fleischer <[email protected]> # Contributor (Arch): Pierre Neidhardt <[email protected]> # Contributor (Arch): Florian Bruhin (The Compiler) <[email protected]> # Maintainer: Omar Vega Ramos <[email protected]> @@ -33,7 +34,7 @@ options=(!emptydirs) source=("https://github.com/qutebrowser/qutebrowser/releases/download/v$pkgver/qutebrowser-$pkgver.tar.gz"; "https://github.com/qutebrowser/qutebrowser/releases/download/v$pkgver/qutebrowser-$pkgver.tar.gz.asc"; "webkit-warning.patch") -validpgpkeys=("E04E560002401B8EF0E76F0A916EB0C8FD55A072") # Florian Bruhin +validpgpkeys=("E04E560002401B8EF0E76F0A916EB0C8FD55A072") _sha256sums_x86_64=('a8ed72d40b4b2283b61b939bb358ada2270fe153bccb8ee012e94fb29cb66c19' 'SKIP' '8509032254715a09d807ac5901657e66d0d0780e47bbe2b06f634d7b7c9792d0') -- 2.26.2
From 1cac84515db96a79e037694e3dc66a6a94223fa6 Mon Sep 17 00:00:00 2001 From: Theo von Arx <[email protected]> Date: Fri, 1 May 2020 10:29:59 +0200 Subject: [PATCH 2/2] Update libre/qtcreator to 4.12.0 --- libre/qtcreator/PKGBUILD | 17 +- libre/qtcreator/libre.patch | 71 +++-- libre/qtcreator/qtcreator-clang-10.patch | 277 ------------------ .../qtcreator/qtcreator-preload-plugins.patch | 18 +- 4 files changed, 51 insertions(+), 332 deletions(-) delete mode 100644 libre/qtcreator/qtcreator-clang-10.patch diff --git a/libre/qtcreator/PKGBUILD b/libre/qtcreator/PKGBUILD index 290601831..cf1baba33 100644 --- a/libre/qtcreator/PKGBUILD +++ b/libre/qtcreator/PKGBUILD @@ -14,9 +14,9 @@ # - removed support for qt5-webengine pkgname=qtcreator -pkgver=4.11.2 +pkgver=4.12.0 _clangver=10.0.0 -pkgrel=4 +pkgrel=2 pkgrel+=.parabola1 pkgdesc='Lightweight, cross-platform integrated development environment' pkgdesc+=', without nonfree qt5-webengine help viewer' @@ -40,14 +40,12 @@ optdepends=('qt5-doc: integrated Qt documentation' 'perf: performer analyzer') source=("https://download.qt.io/official_releases/qtcreator/${pkgver%.*}/$pkgver/qt-creator-opensource-src-$pkgver.tar.xz"; qtcreator-preload-plugins.patch - qtcreator-clang-libs.patch - qtcreator-clang-10.patch::"https://code.qt.io/cgit/qt-creator/qt-creator.git/patch?id=44023c8f";) + qtcreator-clang-libs.patch) source+=(libre.patch) -sha256sums=('8d67e45b66944fdb0f879cbfae341af7e38d6a348cf18332b5cb9f07937aae02' - 'd6f979c820e2294653f4f1853af96942bf25ff9fe9450657d45ff1c7f02bbca7' - '0f6d0dc41a87aae9ef371b1950f5b9d823db8b5685c6ac04a7a7ac133eb19a3f' - 'cbbaa52f8daf40866c1c7157f168746cf7cb0231200feaeed05a0fb80e78c8ab') -sha256sums+=('6aeac164075b7f3f3a2e9aa75865669beeeb7903b9cbb5b6a8700205b285fe64') +sha256sums=('d76655799ad2af81fb15f85d412d74583659fb1b4cf27b758ad8aae73675948b' + 'b40e222b30c355d1230160a4e933dbd161b8748125662e3bde312ea52296457a' + '0f6d0dc41a87aae9ef371b1950f5b9d823db8b5685c6ac04a7a7ac133eb19a3f') +sha256sums+=('fb3bda8aca0637fb36122706ee06ba051dcda29a2f480ff3053b4ced1c009cc4') prepare() { mkdir -p build @@ -64,7 +62,6 @@ prepare() { patch -p1 -i ../qtcreator-preload-plugins.patch # Fix build with clang 10 - patch -p1 -i ../qtcreator-clang-10.patch patch -p1 -i ../qtcreator-clang-libs.patch # remove qt5-webengine support diff --git a/libre/qtcreator/libre.patch b/libre/qtcreator/libre.patch index ac04ccbf1..6b6a869e8 100644 --- a/libre/qtcreator/libre.patch +++ b/libre/qtcreator/libre.patch @@ -1,8 +1,8 @@ diff --git a/src/plugins/help/CMakeLists.txt b/src/plugins/help/CMakeLists.txt -index ac70c823..f6c34f3f 100644 +index a6711862..0eeea39c 100644 --- a/src/plugins/help/CMakeLists.txt +++ b/src/plugins/help/CMakeLists.txt -@@ -37,17 +37,6 @@ extend_qtc_plugin(Help +@@ -36,17 +36,6 @@ extend_qtc_plugin(Help macwebkithelpviewer.mm ) @@ -21,12 +21,12 @@ index ac70c823..f6c34f3f 100644 add_subdirectory(qlitehtml) else() diff --git a/src/plugins/help/help.pro b/src/plugins/help/help.pro -index f4786112..8d20a4bc 100644 +index 7b58578e..c1627e89 100644 --- a/src/plugins/help/help.pro +++ b/src/plugins/help/help.pro -@@ -56,13 +56,6 @@ FORMS += docsettingspage.ui \ - generalsettingspage.ui \ - remotehelpfilter.ui +@@ -53,13 +53,6 @@ FORMS += docsettingspage.ui \ + filtersettingspage.ui \ + generalsettingspage.ui -!isEmpty(QT.webenginewidgets.name) { - QT += webenginewidgets @@ -39,43 +39,42 @@ index f4786112..8d20a4bc 100644 DEFINES += QTC_MAC_NATIVE_HELPVIEWER HEADERS += macwebkithelpviewer.h diff --git a/src/plugins/help/help.qbs b/src/plugins/help/help.qbs -index d1458d84..da915e52 100644 +index e1268e72..0abaa91f 100644 --- a/src/plugins/help/help.qbs +++ b/src/plugins/help/help.qbs -@@ -5,7 +5,6 @@ QtcPlugin { +@@ -10,7 +10,6 @@ Project { - Depends { name: "Qt"; submodules: ["help", "network", "sql"]; } - Depends { name: "Qt.printsupport" } -- Depends { name: "Qt.webenginewidgets"; required: false } + Depends { name: "Qt"; submodules: ["help", "network", "sql"]; } + Depends { name: "Qt.printsupport" } +- Depends { name: "Qt.webenginewidgets"; required: false } - Depends { name: "Aggregation" } - Depends { name: "Utils" } -@@ -17,8 +16,6 @@ QtcPlugin { + Depends { name: "Aggregation" } + Depends { name: "Utils" } +@@ -24,8 +23,6 @@ Project { - cpp.defines: { - var defines = base.concat(["QT_CLUCENE_SUPPORT"]); -- if (Qt.webenginewidgets.present) -- defines.push("QTC_WEBENGINE_HELPVIEWER"); - return defines; - } + cpp.defines: { + var defines = base.concat(["QT_CLUCENE_SUPPORT"]); +- if (Qt.webenginewidgets.present) +- defines.push("QTC_WEBENGINE_HELPVIEWER"); + if (qlitehtml.present) + defines.push("QTC_LITEHTML_HELPVIEWER") + return defines; +@@ -60,13 +57,6 @@ Project { + ] + } -@@ -52,14 +49,6 @@ QtcPlugin { - ] - } +- Group { +- name: "WebEngine Sources" +- condition: Qt.webenginewidgets.present +- files: [ +- "webenginehelpviewer.cpp", "webenginehelpviewer.h" +- ] +- } -- Group { -- name: "WebEngine Sources" -- condition: Qt.webenginewidgets.present -- files: [ -- "webenginehelpviewer.cpp", "webenginehelpviewer.h" -- ] -- } -- - Group { - id: sharedSources - name: "Shared Sources" + Group { + name: "litehtml-specific sources" diff --git a/src/plugins/help/localhelpmanager.cpp b/src/plugins/help/localhelpmanager.cpp -index 8af763f4..cec1134e 100644 +index f8a02eb7..f993a192 100644 --- a/src/plugins/help/localhelpmanager.cpp +++ b/src/plugins/help/localhelpmanager.cpp @@ -31,12 +31,6 @@ @@ -99,7 +98,7 @@ index 8af763f4..cec1134e 100644 static const char kTextBrowserBackend[] = "textbrowser"; static const int kDefaultFallbackFontSize = 14; -@@ -315,29 +308,13 @@ HelpViewerFactory LocalHelpManager::defaultViewerBackend() +@@ -318,29 +311,13 @@ HelpViewerFactory LocalHelpManager::defaultViewerBackend() return *factory; } if (!backend.isEmpty()) diff --git a/libre/qtcreator/qtcreator-clang-10.patch b/libre/qtcreator/qtcreator-clang-10.patch deleted file mode 100644 index 553f5c004..000000000 --- a/libre/qtcreator/qtcreator-clang-10.patch +++ /dev/null @@ -1,277 +0,0 @@ -From 44023c8f43fd8daf8b7be305ea6d99b8b56fa551 Mon Sep 17 00:00:00 2001 -From: Orgad Shaneh <[email protected]> -Date: Mon, 17 Feb 2020 23:21:17 +0200 -Subject: Clang: Fix build with Clang/LLVM 10 - -Change-Id: I740286c9dcfd325b1c31ab863fb5c91bf9c6ec70 -Reviewed-by: hjk <[email protected]> ---- - src/plugins/clangformat/clangformatutils.cpp | 8 +++++++ - .../source/collectbuilddependencytoolaction.h | 17 ++++++++++++- - .../source/collectusedmacroactionfactory.h | 12 ++++++++++ - .../source/generatepchactionfactory.h | 7 ++++++ - .../clangrefactoringbackend/source/clangquery.cpp | 3 ++- - .../source/collectsymbolsaction.h | 6 ++++- - .../source/indexdataconsumer.cpp | 28 +++++++++++++++------- - .../source/indexdataconsumer.h | 28 +++++++++++++++------- - .../source/symbolscollector.cpp | 4 ++++ - 9 files changed, 92 insertions(+), 21 deletions(-) - -diff --git a/src/plugins/clangformat/clangformatutils.cpp b/src/plugins/clangformat/clangformatutils.cpp -index f087f77a94..0a32d3a929 100644 ---- a/src/plugins/clangformat/clangformatutils.cpp -+++ b/src/plugins/clangformat/clangformatutils.cpp -@@ -57,7 +57,11 @@ static clang::format::FormatStyle qtcStyle() - style.AlignOperands = true; - style.AlignTrailingComments = true; - style.AllowAllParametersOfDeclarationOnNextLine = true; -+#if LLVM_VERSION_MAJOR >= 10 -+ style.AllowShortBlocksOnASingleLine = FormatStyle::SBS_Never; -+#else - style.AllowShortBlocksOnASingleLine = false; -+#endif - style.AllowShortCaseLabelsOnASingleLine = false; - style.AllowShortFunctionsOnASingleLine = FormatStyle::SFS_Inline; - #if LLVM_VERSION_MAJOR >= 9 -@@ -72,7 +76,11 @@ static clang::format::FormatStyle qtcStyle() - style.BinPackArguments = false; - style.BinPackParameters = false; - style.BraceWrapping.AfterClass = true; -+#if LLVM_VERSION_MAJOR >= 10 -+ style.BraceWrapping.AfterControlStatement = FormatStyle::BWACS_Never; -+#else - style.BraceWrapping.AfterControlStatement = false; -+#endif - style.BraceWrapping.AfterEnum = false; - style.BraceWrapping.AfterFunction = true; - style.BraceWrapping.AfterNamespace = false; -diff --git a/src/tools/clangpchmanagerbackend/source/collectbuilddependencytoolaction.h b/src/tools/clangpchmanagerbackend/source/collectbuilddependencytoolaction.h -index 538f2c7d3f..88ed3d2344 100644 ---- a/src/tools/clangpchmanagerbackend/source/collectbuilddependencytoolaction.h -+++ b/src/tools/clangpchmanagerbackend/source/collectbuilddependencytoolaction.h -@@ -60,6 +60,16 @@ public: - diagnosticConsumer); - } - -+#if LLVM_VERSION_MAJOR >= 10 -+ std::unique_ptr<clang::FrontendAction> create() override -+ { -+ return std::make_unique<CollectBuildDependencyAction>( -+ m_buildDependency, -+ m_filePathCache, -+ m_excludedIncludeUIDs, -+ m_alreadyIncludedFileUIDs); -+ } -+#else - clang::FrontendAction *create() override - { - return new CollectBuildDependencyAction(m_buildDependency, -@@ -67,6 +77,7 @@ public: - m_excludedIncludeUIDs, - m_alreadyIncludedFileUIDs); - } -+#endif - - std::vector<uint> generateExcludedIncludeFileUIDs(clang::FileManager &fileManager) const - { -@@ -77,7 +88,11 @@ public: - NativeFilePath nativeFilePath{filePath}; - const clang::FileEntry *file = fileManager.getFile({nativeFilePath.path().data(), - nativeFilePath.path().size()}, -- true); -+ true) -+#if LLVM_VERSION_MAJOR >= 10 -+ .get() -+#endif -+ ; - - if (file) - fileUIDs.push_back(file->getUID()); -diff --git a/src/tools/clangpchmanagerbackend/source/collectusedmacroactionfactory.h b/src/tools/clangpchmanagerbackend/source/collectusedmacroactionfactory.h -index 423d5f8876..473b8e7df8 100644 ---- a/src/tools/clangpchmanagerbackend/source/collectusedmacroactionfactory.h -+++ b/src/tools/clangpchmanagerbackend/source/collectusedmacroactionfactory.h -@@ -61,6 +61,17 @@ public: - diagnosticConsumer); - } - -+#if LLVM_VERSION_MAJOR >= 10 -+ std::unique_ptr<clang::FrontendAction> create() override -+ { -+ return std::make_unique<CollectUsedMacrosAction>( -+ m_usedMacros, -+ m_filePathCache, -+ m_sourceDependencies, -+ m_sourceFiles, -+ m_fileStatuses); -+ } -+#else - clang::FrontendAction *create() override - { - return new CollectUsedMacrosAction(m_usedMacros, -@@ -69,6 +80,7 @@ public: - m_sourceFiles, - m_fileStatuses); - } -+#endif - - private: - UsedMacros &m_usedMacros; -diff --git a/src/tools/clangpchmanagerbackend/source/generatepchactionfactory.h b/src/tools/clangpchmanagerbackend/source/generatepchactionfactory.h -index c4a8cae028..f1e4c74457 100644 ---- a/src/tools/clangpchmanagerbackend/source/generatepchactionfactory.h -+++ b/src/tools/clangpchmanagerbackend/source/generatepchactionfactory.h -@@ -68,10 +68,17 @@ public: - , m_fileContent(fileContent) - {} - -+#if LLVM_VERSION_MAJOR >= 10 -+ std::unique_ptr<clang::FrontendAction> create() override -+ { -+ return std::make_unique<GeneratePCHAction>(m_filePath, m_fileContent); -+ } -+#else - clang::FrontendAction *create() override - { - return new GeneratePCHAction{m_filePath, m_fileContent}; - } -+#endif - - private: - llvm::StringRef m_filePath; -diff --git a/src/tools/clangrefactoringbackend/source/clangquery.cpp b/src/tools/clangrefactoringbackend/source/clangquery.cpp -index 21ebeb8367..78f2350d8d 100644 ---- a/src/tools/clangrefactoringbackend/source/clangquery.cpp -+++ b/src/tools/clangrefactoringbackend/source/clangquery.cpp -@@ -78,7 +78,8 @@ void ClangQuery::findLocations() - std::make_move_iterator(asts.end()), - [&] (std::unique_ptr<clang::ASTUnit> &&ast) { - Diagnostics diagnostics; -- auto optionalMatcher = Parser::parseMatcherExpression({m_query.data(), m_query.size()}, -+ llvm::StringRef query{m_query.data(), m_query.size()}; -+ auto optionalMatcher = Parser::parseMatcherExpression(query, - nullptr, - &diagnostics); - parseDiagnostics(diagnostics); -diff --git a/src/tools/clangrefactoringbackend/source/collectsymbolsaction.h b/src/tools/clangrefactoringbackend/source/collectsymbolsaction.h -index a38f1c4f87..4f36adadf5 100644 ---- a/src/tools/clangrefactoringbackend/source/collectsymbolsaction.h -+++ b/src/tools/clangrefactoringbackend/source/collectsymbolsaction.h -@@ -48,7 +48,11 @@ class CollectSymbolsAction : public clang::WrapperFrontendAction - public: - CollectSymbolsAction(std::shared_ptr<IndexDataConsumer> indexDataConsumer) - : clang::WrapperFrontendAction( -- clang::index::createIndexingAction(indexDataConsumer, createIndexingOptions(), nullptr)) -+ clang::index::createIndexingAction(indexDataConsumer, createIndexingOptions() -+#if LLVM_VERSION_MAJOR < 10 -+ , nullptr -+#endif -+ )) - , m_indexDataConsumer(indexDataConsumer) - {} - -diff --git a/src/tools/clangrefactoringbackend/source/indexdataconsumer.cpp b/src/tools/clangrefactoringbackend/source/indexdataconsumer.cpp -index e287144462..5d21b30b9c 100644 ---- a/src/tools/clangrefactoringbackend/source/indexdataconsumer.cpp -+++ b/src/tools/clangrefactoringbackend/source/indexdataconsumer.cpp -@@ -118,11 +118,16 @@ bool IndexDataConsumer::isAlreadyParsed(clang::FileID fileId, SourcesManager &so - return sourcesManager.alreadyParsed(filePathId(fileEntry), fileEntry->getModificationTime()); - } - --bool IndexDataConsumer::handleDeclOccurence(const clang::Decl *declaration, -- clang::index::SymbolRoleSet symbolRoles, -- llvm::ArrayRef<clang::index::SymbolRelation> /*symbolRelations*/, -- clang::SourceLocation sourceLocation, -- IndexDataConsumer::ASTNodeInfo /*astNodeInfo*/) -+#if LLVM_VERSION_MAJOR >= 10 -+ bool IndexDataConsumer::handleDeclOccurrence( -+#else -+ bool IndexDataConsumer::handleDeclOccurence( -+#endif -+ const clang::Decl *declaration, -+ clang::index::SymbolRoleSet symbolRoles, -+ llvm::ArrayRef<clang::index::SymbolRelation> /*symbolRelations*/, -+ clang::SourceLocation sourceLocation, -+ IndexDataConsumer::ASTNodeInfo /*astNodeInfo*/) - { - const auto *namedDeclaration = clang::dyn_cast<clang::NamedDecl>(declaration); - if (namedDeclaration) { -@@ -175,10 +180,15 @@ SourceLocationKind macroSymbolType(clang::index::SymbolRoleSet roles) - - } // namespace - --bool IndexDataConsumer::handleMacroOccurence(const clang::IdentifierInfo *identifierInfo, -- const clang::MacroInfo *macroInfo, -- clang::index::SymbolRoleSet roles, -- clang::SourceLocation sourceLocation) -+#if LLVM_VERSION_MAJOR >= 10 -+bool IndexDataConsumer::handleMacroOccurrence( -+#else -+bool IndexDataConsumer::handleMacroOccurence( -+#endif -+ const clang::IdentifierInfo *identifierInfo, -+ const clang::MacroInfo *macroInfo, -+ clang::index::SymbolRoleSet roles, -+ clang::SourceLocation sourceLocation) - { - if (macroInfo && sourceLocation.isFileID() - && !isAlreadyParsed(m_sourceManager->getFileID(sourceLocation), m_macroSourcesManager) -diff --git a/src/tools/clangrefactoringbackend/source/indexdataconsumer.h b/src/tools/clangrefactoringbackend/source/indexdataconsumer.h -index c80e066b6c..e1d3529806 100644 ---- a/src/tools/clangrefactoringbackend/source/indexdataconsumer.h -+++ b/src/tools/clangrefactoringbackend/source/indexdataconsumer.h -@@ -57,16 +57,26 @@ public: - IndexDataConsumer(const IndexDataConsumer &) = delete; - IndexDataConsumer &operator=(const IndexDataConsumer &) = delete; - -- bool handleDeclOccurence(const clang::Decl *declaration, -- clang::index::SymbolRoleSet symbolRoles, -- llvm::ArrayRef<clang::index::SymbolRelation> symbolRelations, -- clang::SourceLocation sourceLocation, -- ASTNodeInfo astNodeInfo) override; -+#if LLVM_VERSION_MAJOR >= 10 -+ bool handleDeclOccurrence( -+#else -+ bool handleDeclOccurence( -+#endif -+ const clang::Decl *declaration, -+ clang::index::SymbolRoleSet symbolRoles, -+ llvm::ArrayRef<clang::index::SymbolRelation> symbolRelations, -+ clang::SourceLocation sourceLocation, -+ ASTNodeInfo astNodeInfo) override; - -- bool handleMacroOccurence(const clang::IdentifierInfo *identifierInfo, -- const clang::MacroInfo *macroInfo, -- clang::index::SymbolRoleSet roles, -- clang::SourceLocation sourceLocation) override; -+#if LLVM_VERSION_MAJOR >= 10 -+ bool handleMacroOccurrence( -+#else -+ bool handleMacroOccurence( -+#endif -+ const clang::IdentifierInfo *identifierInfo, -+ const clang::MacroInfo *macroInfo, -+ clang::index::SymbolRoleSet roles, -+ clang::SourceLocation sourceLocation) override; - - void finish() override; - -diff --git a/src/tools/clangrefactoringbackend/source/symbolscollector.cpp b/src/tools/clangrefactoringbackend/source/symbolscollector.cpp -index a233f6d8fe..dffd583894 100644 ---- a/src/tools/clangrefactoringbackend/source/symbolscollector.cpp -+++ b/src/tools/clangrefactoringbackend/source/symbolscollector.cpp -@@ -74,7 +74,11 @@ std::unique_ptr<clang::tooling::FrontendActionFactory> newFrontendActionFactory( - : m_action(consumerFactory) - {} - -+#if LLVM_VERSION_MAJOR >= 10 -+ std::unique_ptr<clang::FrontendAction> create() override { return std::make_unique<AdaptorAction>(m_action); } -+#else - clang::FrontendAction *create() override { return new AdaptorAction(m_action); } -+#endif - - private: - class AdaptorAction : public clang::ASTFrontendAction --- -cgit v1.2.1 - diff --git a/libre/qtcreator/qtcreator-preload-plugins.patch b/libre/qtcreator/qtcreator-preload-plugins.patch index 23b2dfa3f..d4ec515fe 100644 --- a/libre/qtcreator/qtcreator-preload-plugins.patch +++ b/libre/qtcreator/qtcreator-preload-plugins.patch @@ -1,13 +1,13 @@ diff --git a/src/plugins/clangtools/clangtidyclazyrunner.cpp b/src/plugins/clangtools/clangtidyclazyrunner.cpp -index a580704243..7a8740a5cc 100644 +index 166d1c94e0..de0b9cc67b 100644 --- a/src/plugins/clangtools/clangtidyclazyrunner.cpp +++ b/src/plugins/clangtools/clangtidyclazyrunner.cpp -@@ -63,7 +63,7 @@ QStringList ClangTidyClazyRunner::constructCommandLineArguments(const QStringLis +@@ -67,7 +67,7 @@ static QStringList clazyPluginArguments(const ClangDiagnosticConfig diagnosticCo + QStringList arguments; - const QString clazyChecks = diagnosticConfig.clazyChecks(); - if (!clazyChecks.isEmpty()) { -- arguments << XclangArgs({"-add-plugin", -+ arguments << XclangArgs({"-load", "ClazyPlugin.so", "-add-plugin", - "clazy", - "-plugin-arg-clazy", - diagnosticConfig.clazyChecks()}); + if (diagnosticConfig.isClazyEnabled()) { +- arguments << XclangArgs({"-add-plugin", "clazy"}); ++ arguments << XclangArgs({"-load", "ClazyPlugin.so", "-add-plugin", "clazy"}); + if (!diagnosticConfig.clazyChecks().isEmpty()) + arguments << XclangArgs({"-plugin-arg-clazy", diagnosticConfig.clazyChecks()}); + } -- 2.26.2
From b4b95b323e9285b3a07791be07dc3d1c3d9ae021 Mon Sep 17 00:00:00 2001 From: Theo von Arx <[email protected]> Date: Sat, 18 Apr 2020 09:01:07 +0200 Subject: [PATCH 3/4] Update libre/qutebrowser to v1.10.2 - Built for a all three architectures, tested on x86_64 --- libre/qutebrowser/PKGBUILD | 20 ++++++++++---------- libre/qutebrowser/webkit-warning.patch | 18 +++++++++--------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/libre/qutebrowser/PKGBUILD b/libre/qutebrowser/PKGBUILD index 1303eec83..8d7b16286 100644 --- a/libre/qutebrowser/PKGBUILD +++ b/libre/qutebrowser/PKGBUILD @@ -10,9 +10,9 @@ # - set webkit backend as default pkgname=qutebrowser -_pkgver_armv7h=1.10.1 # this could be an 'any' package -_pkgver_i686=1.10.1 # but our different arches do not always roll at the same speed -_pkgver_x86_64=1.10.1 +_pkgver_armv7h=1.10.2 # this could be an 'any' package +_pkgver_i686=1.10.2 # but our different arches do not always roll at the same speed +_pkgver_x86_64=1.10.2 eval "pkgver=\$_pkgver_${CARCH}" pkgrel=1 pkgrel+=.par1 @@ -35,15 +35,15 @@ source=("https://github.com/qutebrowser/qutebrowser/releases/download/v$pkgver/q "https://github.com/qutebrowser/qutebrowser/releases/download/v$pkgver/qutebrowser-$pkgver.tar.gz.asc"; "webkit-warning.patch") validpgpkeys=("E04E560002401B8EF0E76F0A916EB0C8FD55A072") -_sha256sums_x86_64=('a8ed72d40b4b2283b61b939bb358ada2270fe153bccb8ee012e94fb29cb66c19' +_sha256sums_x86_64=('fb457cb58ab6ade66e854a3558670acf9141018f6e436ab623908f372919396a' 'SKIP' - '8509032254715a09d807ac5901657e66d0d0780e47bbe2b06f634d7b7c9792d0') -_sha256sums_i686=('a8ed72d40b4b2283b61b939bb358ada2270fe153bccb8ee012e94fb29cb66c19' + 'a4d385524f75f7378eb3f44bb1d8a7c4c3213ee1a42ceed7f5f208eac06dec8f') +_sha256sums_i686=('fb457cb58ab6ade66e854a3558670acf9141018f6e436ab623908f372919396a' 'SKIP' - '8509032254715a09d807ac5901657e66d0d0780e47bbe2b06f634d7b7c9792d0') -_sha256sums_armv7h=('a8ed72d40b4b2283b61b939bb358ada2270fe153bccb8ee012e94fb29cb66c19' - 'SKIP' - '8509032254715a09d807ac5901657e66d0d0780e47bbe2b06f634d7b7c9792d0') + 'a4d385524f75f7378eb3f44bb1d8a7c4c3213ee1a42ceed7f5f208eac06dec8f') +_sha256sums_armv7h=('fb457cb58ab6ade66e854a3558670acf9141018f6e436ab623908f372919396a' + 'SKIP' + 'a4d385524f75f7378eb3f44bb1d8a7c4c3213ee1a42ceed7f5f208eac06dec8f') eval "sha256sums=(\${_sha256sums_${CARCH}[@]})" diff --git a/libre/qutebrowser/webkit-warning.patch b/libre/qutebrowser/webkit-warning.patch index 97994870c..237232ede 100644 --- a/libre/qutebrowser/webkit-warning.patch +++ b/libre/qutebrowser/webkit-warning.patch @@ -1,20 +1,20 @@ diff --git a/qutebrowser/html/warning-webkit.html b/qutebrowser/html/warning-webkit.html -index e87597b..ada806f 100644 +index 7fc22903a..ada806f87 100644 --- a/qutebrowser/html/warning-webkit.html +++ b/qutebrowser/html/warning-webkit.html @@ -2,8 +2,6 @@ - + {% block content %} <h1>{{ title }}</h1> -<span class="note">Note this warning will only appear once. Use <span class="mono">:open -qute://warning/webkit</span> to show it again at a later time.</span> - + <p>You're using qutebrowser with the QtWebKit backend.</p> - + @@ -17,66 +15,6 @@ unpatched vulnerabilities. Please use it carefully and avoid visiting untrusted websites and using it for transmission of sensitive data. Wait for new release from qtwebkit-dev branch to use it with untrusted content.</blockquote> - + -<p>It's recommended that you use QtWebEngine instead.</p> - -<h2>(Outdated) reasons to use QtWebKit</h2> @@ -68,10 +68,10 @@ index e87597b..ada806f 100644 -<p><b>QtWebEngine being unavailable on Parabola</b>: Claims of Parabola -developers about QtWebEngine being "non-free" have repeatedly been disputed, -and so far nobody came up with solid evidence about that being the case. Also, --note that their qutebrowser package was often outdated in the past (even --qutebrowser security fixes took months to arrive there). You might be better --off chosing an <a href="https://qutebrowser.org/doc/install.html#tox";> --alternative install method</a>.</p> +-note that their qutebrowser package is usually very outdated (even qutebrowser +-security fixes took months to arrive there). You might be better off chosing an +-<a href="https://qutebrowser.org/doc/install.html#tox";> alternative install +-method</a>.</p> - -<p><b>White flashing between loads with a custom stylesheet</b>: This doesn't -seem to happen with <span class="mono">qt.process_model = single-process</span> -- 2.26.2
From e4008ceef6b139625b19db0dabf7576b2fd58000 Mon Sep 17 00:00:00 2001 From: Theo von Arx <[email protected]> Date: Mon, 27 Apr 2020 21:55:41 +0200 Subject: [PATCH 4/4] Update libre/qutebrowser to 1.11.0 Built on all three architectures, successfully tested on x86_64. --- libre/qutebrowser/PKGBUILD | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libre/qutebrowser/PKGBUILD b/libre/qutebrowser/PKGBUILD index 8d7b16286..0373cb6cb 100644 --- a/libre/qutebrowser/PKGBUILD +++ b/libre/qutebrowser/PKGBUILD @@ -10,9 +10,9 @@ # - set webkit backend as default pkgname=qutebrowser -_pkgver_armv7h=1.10.2 # this could be an 'any' package -_pkgver_i686=1.10.2 # but our different arches do not always roll at the same speed -_pkgver_x86_64=1.10.2 +_pkgver_armv7h=1.11.0 # this could be an 'any' package +_pkgver_i686=1.11.0 # but our different arches do not always roll at the same speed +_pkgver_x86_64=1.11.0 eval "pkgver=\$_pkgver_${CARCH}" pkgrel=1 pkgrel+=.par1 @@ -35,13 +35,13 @@ source=("https://github.com/qutebrowser/qutebrowser/releases/download/v$pkgver/q "https://github.com/qutebrowser/qutebrowser/releases/download/v$pkgver/qutebrowser-$pkgver.tar.gz.asc"; "webkit-warning.patch") validpgpkeys=("E04E560002401B8EF0E76F0A916EB0C8FD55A072") -_sha256sums_x86_64=('fb457cb58ab6ade66e854a3558670acf9141018f6e436ab623908f372919396a' +_sha256sums_x86_64=('e2ed9d56aa5db8a0865f7a18d5d0d796d48db161d9c04c03a935dd95e2a4182c' 'SKIP' 'a4d385524f75f7378eb3f44bb1d8a7c4c3213ee1a42ceed7f5f208eac06dec8f') -_sha256sums_i686=('fb457cb58ab6ade66e854a3558670acf9141018f6e436ab623908f372919396a' +_sha256sums_i686=('e2ed9d56aa5db8a0865f7a18d5d0d796d48db161d9c04c03a935dd95e2a4182c' 'SKIP' 'a4d385524f75f7378eb3f44bb1d8a7c4c3213ee1a42ceed7f5f208eac06dec8f') -_sha256sums_armv7h=('fb457cb58ab6ade66e854a3558670acf9141018f6e436ab623908f372919396a' +_sha256sums_armv7h=('e2ed9d56aa5db8a0865f7a18d5d0d796d48db161d9c04c03a935dd95e2a4182c' 'SKIP' 'a4d385524f75f7378eb3f44bb1d8a7c4c3213ee1a42ceed7f5f208eac06dec8f') eval "sha256sums=(\${_sha256sums_${CARCH}[@]})" -- 2.26.2
From 83205d0ea47f9cb2f749c72faa022cac69713d0d Mon Sep 17 00:00:00 2001 From: Theo von Arx <[email protected]> Date: Tue, 21 Apr 2020 16:50:14 +0200 Subject: [PATCH] Update libre/qtcreator to 4.12.0 Sucessfully built on x86_64, i686. Tested on x86_64. The build for armv7h fails on my machine, but could succeed on others. --- libre/qtcreator/PKGBUILD | 17 +++-- libre/qtcreator/libre.patch | 71 +++++++++---------- libre/qtcreator/qtcreator-clang-libs.patch | 24 +++++++ .../qtcreator/qtcreator-preload-plugins.patch | 18 ++--- 4 files changed, 79 insertions(+), 51 deletions(-) create mode 100644 libre/qtcreator/qtcreator-clang-libs.patch diff --git a/libre/qtcreator/PKGBUILD b/libre/qtcreator/PKGBUILD index 9963e5a5e..cf1baba33 100644 --- a/libre/qtcreator/PKGBUILD +++ b/libre/qtcreator/PKGBUILD @@ -14,8 +14,8 @@ # - removed support for qt5-webengine pkgname=qtcreator -pkgver=4.11.2 -_clangver=9.0.1 +pkgver=4.12.0 +_clangver=10.0.0 pkgrel=2 pkgrel+=.parabola1 pkgdesc='Lightweight, cross-platform integrated development environment' @@ -39,11 +39,13 @@ optdepends=('qt5-doc: integrated Qt documentation' 'valgrind: analyze support' 'perf: performer analyzer') source=("https://download.qt.io/official_releases/qtcreator/${pkgver%.*}/$pkgver/qt-creator-opensource-src-$pkgver.tar.xz"; - qtcreator-preload-plugins.patch) + qtcreator-preload-plugins.patch + qtcreator-clang-libs.patch) source+=(libre.patch) -sha256sums=('8d67e45b66944fdb0f879cbfae341af7e38d6a348cf18332b5cb9f07937aae02' - 'd6f979c820e2294653f4f1853af96942bf25ff9fe9450657d45ff1c7f02bbca7') -sha256sums+=('6aeac164075b7f3f3a2e9aa75865669beeeb7903b9cbb5b6a8700205b285fe64') +sha256sums=('d76655799ad2af81fb15f85d412d74583659fb1b4cf27b758ad8aae73675948b' + 'b40e222b30c355d1230160a4e933dbd161b8748125662e3bde312ea52296457a' + '0f6d0dc41a87aae9ef371b1950f5b9d823db8b5685c6ac04a7a7ac133eb19a3f') +sha256sums+=('fb3bda8aca0637fb36122706ee06ba051dcda29a2f480ff3053b4ced1c009cc4') prepare() { mkdir -p build @@ -59,6 +61,9 @@ prepare() { # and https://bugs.archlinux.org/task/59492 patch -p1 -i ../qtcreator-preload-plugins.patch + # Fix build with clang 10 + patch -p1 -i ../qtcreator-clang-libs.patch + # remove qt5-webengine support patch -Np1 -i "$srcdir"/libre.patch rm -rv src/plugins/help/webenginehelpviewer.{cpp,h} diff --git a/libre/qtcreator/libre.patch b/libre/qtcreator/libre.patch index ac04ccbf1..6b6a869e8 100644 --- a/libre/qtcreator/libre.patch +++ b/libre/qtcreator/libre.patch @@ -1,8 +1,8 @@ diff --git a/src/plugins/help/CMakeLists.txt b/src/plugins/help/CMakeLists.txt -index ac70c823..f6c34f3f 100644 +index a6711862..0eeea39c 100644 --- a/src/plugins/help/CMakeLists.txt +++ b/src/plugins/help/CMakeLists.txt -@@ -37,17 +37,6 @@ extend_qtc_plugin(Help +@@ -36,17 +36,6 @@ extend_qtc_plugin(Help macwebkithelpviewer.mm ) @@ -21,12 +21,12 @@ index ac70c823..f6c34f3f 100644 add_subdirectory(qlitehtml) else() diff --git a/src/plugins/help/help.pro b/src/plugins/help/help.pro -index f4786112..8d20a4bc 100644 +index 7b58578e..c1627e89 100644 --- a/src/plugins/help/help.pro +++ b/src/plugins/help/help.pro -@@ -56,13 +56,6 @@ FORMS += docsettingspage.ui \ - generalsettingspage.ui \ - remotehelpfilter.ui +@@ -53,13 +53,6 @@ FORMS += docsettingspage.ui \ + filtersettingspage.ui \ + generalsettingspage.ui -!isEmpty(QT.webenginewidgets.name) { - QT += webenginewidgets @@ -39,43 +39,42 @@ index f4786112..8d20a4bc 100644 DEFINES += QTC_MAC_NATIVE_HELPVIEWER HEADERS += macwebkithelpviewer.h diff --git a/src/plugins/help/help.qbs b/src/plugins/help/help.qbs -index d1458d84..da915e52 100644 +index e1268e72..0abaa91f 100644 --- a/src/plugins/help/help.qbs +++ b/src/plugins/help/help.qbs -@@ -5,7 +5,6 @@ QtcPlugin { +@@ -10,7 +10,6 @@ Project { - Depends { name: "Qt"; submodules: ["help", "network", "sql"]; } - Depends { name: "Qt.printsupport" } -- Depends { name: "Qt.webenginewidgets"; required: false } + Depends { name: "Qt"; submodules: ["help", "network", "sql"]; } + Depends { name: "Qt.printsupport" } +- Depends { name: "Qt.webenginewidgets"; required: false } - Depends { name: "Aggregation" } - Depends { name: "Utils" } -@@ -17,8 +16,6 @@ QtcPlugin { + Depends { name: "Aggregation" } + Depends { name: "Utils" } +@@ -24,8 +23,6 @@ Project { - cpp.defines: { - var defines = base.concat(["QT_CLUCENE_SUPPORT"]); -- if (Qt.webenginewidgets.present) -- defines.push("QTC_WEBENGINE_HELPVIEWER"); - return defines; - } + cpp.defines: { + var defines = base.concat(["QT_CLUCENE_SUPPORT"]); +- if (Qt.webenginewidgets.present) +- defines.push("QTC_WEBENGINE_HELPVIEWER"); + if (qlitehtml.present) + defines.push("QTC_LITEHTML_HELPVIEWER") + return defines; +@@ -60,13 +57,6 @@ Project { + ] + } -@@ -52,14 +49,6 @@ QtcPlugin { - ] - } +- Group { +- name: "WebEngine Sources" +- condition: Qt.webenginewidgets.present +- files: [ +- "webenginehelpviewer.cpp", "webenginehelpviewer.h" +- ] +- } -- Group { -- name: "WebEngine Sources" -- condition: Qt.webenginewidgets.present -- files: [ -- "webenginehelpviewer.cpp", "webenginehelpviewer.h" -- ] -- } -- - Group { - id: sharedSources - name: "Shared Sources" + Group { + name: "litehtml-specific sources" diff --git a/src/plugins/help/localhelpmanager.cpp b/src/plugins/help/localhelpmanager.cpp -index 8af763f4..cec1134e 100644 +index f8a02eb7..f993a192 100644 --- a/src/plugins/help/localhelpmanager.cpp +++ b/src/plugins/help/localhelpmanager.cpp @@ -31,12 +31,6 @@ @@ -99,7 +98,7 @@ index 8af763f4..cec1134e 100644 static const char kTextBrowserBackend[] = "textbrowser"; static const int kDefaultFallbackFontSize = 14; -@@ -315,29 +308,13 @@ HelpViewerFactory LocalHelpManager::defaultViewerBackend() +@@ -318,29 +311,13 @@ HelpViewerFactory LocalHelpManager::defaultViewerBackend() return *factory; } if (!backend.isEmpty()) diff --git a/libre/qtcreator/qtcreator-clang-libs.patch b/libre/qtcreator/qtcreator-clang-libs.patch new file mode 100644 index 000000000..a0cc8c547 --- /dev/null +++ b/libre/qtcreator/qtcreator-clang-libs.patch @@ -0,0 +1,24 @@ +diff --git a/src/shared/clang/clang_installation.pri b/src/shared/clang/clang_installation.pri +index 08838838bc..bee3779484 100644 +--- a/src/shared/clang/clang_installation.pri ++++ b/src/shared/clang/clang_installation.pri +@@ -131,9 +131,7 @@ defineReplace(extractWarnings) { + return($$result) + } + +-CLANGTOOLING_LIBS=-lclangTooling -lclangIndex -lclangFrontend -lclangParse -lclangSerialization \ +- -lclangSema -lclangEdit -lclangAnalysis -lclangDriver -lclangDynamicASTMatchers \ +- -lclangASTMatchers -lclangToolingCore -lclangAST -lclangLex -lclangBasic ++CLANGTOOLING_LIBS=-lclang-cpp + win32:CLANGTOOLING_LIBS += -lversion + + BIN_EXTENSION = +@@ -207,7 +205,7 @@ isEmpty(LLVM_VERSION) { + isEmpty(QTC_CLANG_BUILDMODE_MISMATCH)|!equals(QTC_CLANG_BUILDMODE_MISMATCH, 1) { + CLANGFORMAT_MAIN_HEADER = $$LLVM_INCLUDEPATH/clang/Format/Format.h + exists($$CLANGFORMAT_MAIN_HEADER) { +- CLANGFORMAT_LIBS=-lclangFormat -lclangToolingInclusions -lclangToolingCore -lclangRewrite -lclangLex -lclangBasic ++ CLANGFORMAT_LIBS=-lclang-cpp + ALL_CLANG_LIBS=-lclangFormat -lclangToolingInclusions -lclangTooling -lclangToolingCore \ + -lclangRewrite -lclangIndex -lclangFrontend -lclangParse -lclangSerialization \ + -lclangSema -lclangEdit -lclangAnalysis -lclangDriver -lclangDynamicASTMatchers \ diff --git a/libre/qtcreator/qtcreator-preload-plugins.patch b/libre/qtcreator/qtcreator-preload-plugins.patch index 23b2dfa3f..d4ec515fe 100644 --- a/libre/qtcreator/qtcreator-preload-plugins.patch +++ b/libre/qtcreator/qtcreator-preload-plugins.patch @@ -1,13 +1,13 @@ diff --git a/src/plugins/clangtools/clangtidyclazyrunner.cpp b/src/plugins/clangtools/clangtidyclazyrunner.cpp -index a580704243..7a8740a5cc 100644 +index 166d1c94e0..de0b9cc67b 100644 --- a/src/plugins/clangtools/clangtidyclazyrunner.cpp +++ b/src/plugins/clangtools/clangtidyclazyrunner.cpp -@@ -63,7 +63,7 @@ QStringList ClangTidyClazyRunner::constructCommandLineArguments(const QStringLis +@@ -67,7 +67,7 @@ static QStringList clazyPluginArguments(const ClangDiagnosticConfig diagnosticCo + QStringList arguments; - const QString clazyChecks = diagnosticConfig.clazyChecks(); - if (!clazyChecks.isEmpty()) { -- arguments << XclangArgs({"-add-plugin", -+ arguments << XclangArgs({"-load", "ClazyPlugin.so", "-add-plugin", - "clazy", - "-plugin-arg-clazy", - diagnosticConfig.clazyChecks()}); + if (diagnosticConfig.isClazyEnabled()) { +- arguments << XclangArgs({"-add-plugin", "clazy"}); ++ arguments << XclangArgs({"-load", "ClazyPlugin.so", "-add-plugin", "clazy"}); + if (!diagnosticConfig.clazyChecks().isEmpty()) + arguments << XclangArgs({"-plugin-arg-clazy", diagnosticConfig.clazyChecks()}); + } -- 2.26.2
From 886ba99084e920759e947f88a1458618b210b693 Mon Sep 17 00:00:00 2001 From: Theo von Arx <[email protected]> Date: Wed, 19 Feb 2020 20:58:05 +0100 Subject: [PATCH] Update libre/qutebrowser to 1.11.0 Built on all three architectures, successfully tested on x86_64. --- libre/qutebrowser/PKGBUILD | 23 ++++++++++++----------- libre/qutebrowser/webkit-warning.patch | 18 +++++++++--------- 2 files changed, 21 insertions(+), 20 deletions(-) diff --git a/libre/qutebrowser/PKGBUILD b/libre/qutebrowser/PKGBUILD index c473001bd..0373cb6cb 100644 --- a/libre/qutebrowser/PKGBUILD +++ b/libre/qutebrowser/PKGBUILD @@ -1,4 +1,5 @@ # Maintainer (Arch): Morten Linderud <[email protected]> +# Maintainer (Arch): Lukas Fleischer <[email protected]> # Contributor (Arch): Pierre Neidhardt <[email protected]> # Contributor (Arch): Florian Bruhin (The Compiler) <[email protected]> # Maintainer: Omar Vega Ramos <[email protected]> @@ -9,9 +10,9 @@ # - set webkit backend as default pkgname=qutebrowser -_pkgver_armv7h=1.10.0 # this could be an 'any' package -_pkgver_i686=1.10.0 # but our different arches do not always roll at the same speed -_pkgver_x86_64=1.10.0 +_pkgver_armv7h=1.11.0 # this could be an 'any' package +_pkgver_i686=1.11.0 # but our different arches do not always roll at the same speed +_pkgver_x86_64=1.11.0 eval "pkgver=\$_pkgver_${CARCH}" pkgrel=1 pkgrel+=.par1 @@ -33,16 +34,16 @@ options=(!emptydirs) source=("https://github.com/qutebrowser/qutebrowser/releases/download/v$pkgver/qutebrowser-$pkgver.tar.gz"; "https://github.com/qutebrowser/qutebrowser/releases/download/v$pkgver/qutebrowser-$pkgver.tar.gz.asc"; "webkit-warning.patch") -validpgpkeys=("E04E560002401B8EF0E76F0A916EB0C8FD55A072") # Florian Bruhin -_sha256sums_x86_64=('7ecd7a08380b22eb1268fcc4446ba9d4d005601cb9366097779255edd9683bdf' +validpgpkeys=("E04E560002401B8EF0E76F0A916EB0C8FD55A072") +_sha256sums_x86_64=('e2ed9d56aa5db8a0865f7a18d5d0d796d48db161d9c04c03a935dd95e2a4182c' 'SKIP' - '8509032254715a09d807ac5901657e66d0d0780e47bbe2b06f634d7b7c9792d0') -_sha256sums_i686=('7ecd7a08380b22eb1268fcc4446ba9d4d005601cb9366097779255edd9683bdf' + 'a4d385524f75f7378eb3f44bb1d8a7c4c3213ee1a42ceed7f5f208eac06dec8f') +_sha256sums_i686=('e2ed9d56aa5db8a0865f7a18d5d0d796d48db161d9c04c03a935dd95e2a4182c' 'SKIP' - '8509032254715a09d807ac5901657e66d0d0780e47bbe2b06f634d7b7c9792d0') -_sha256sums_armv7h=('7ecd7a08380b22eb1268fcc4446ba9d4d005601cb9366097779255edd9683bdf' - 'SKIP' - '8509032254715a09d807ac5901657e66d0d0780e47bbe2b06f634d7b7c9792d0') + 'a4d385524f75f7378eb3f44bb1d8a7c4c3213ee1a42ceed7f5f208eac06dec8f') +_sha256sums_armv7h=('e2ed9d56aa5db8a0865f7a18d5d0d796d48db161d9c04c03a935dd95e2a4182c' + 'SKIP' + 'a4d385524f75f7378eb3f44bb1d8a7c4c3213ee1a42ceed7f5f208eac06dec8f') eval "sha256sums=(\${_sha256sums_${CARCH}[@]})" diff --git a/libre/qutebrowser/webkit-warning.patch b/libre/qutebrowser/webkit-warning.patch index 97994870c..237232ede 100644 --- a/libre/qutebrowser/webkit-warning.patch +++ b/libre/qutebrowser/webkit-warning.patch @@ -1,20 +1,20 @@ diff --git a/qutebrowser/html/warning-webkit.html b/qutebrowser/html/warning-webkit.html -index e87597b..ada806f 100644 +index 7fc22903a..ada806f87 100644 --- a/qutebrowser/html/warning-webkit.html +++ b/qutebrowser/html/warning-webkit.html @@ -2,8 +2,6 @@ - + {% block content %} <h1>{{ title }}</h1> -<span class="note">Note this warning will only appear once. Use <span class="mono">:open -qute://warning/webkit</span> to show it again at a later time.</span> - + <p>You're using qutebrowser with the QtWebKit backend.</p> - + @@ -17,66 +15,6 @@ unpatched vulnerabilities. Please use it carefully and avoid visiting untrusted websites and using it for transmission of sensitive data. Wait for new release from qtwebkit-dev branch to use it with untrusted content.</blockquote> - + -<p>It's recommended that you use QtWebEngine instead.</p> - -<h2>(Outdated) reasons to use QtWebKit</h2> @@ -68,10 +68,10 @@ index e87597b..ada806f 100644 -<p><b>QtWebEngine being unavailable on Parabola</b>: Claims of Parabola -developers about QtWebEngine being "non-free" have repeatedly been disputed, -and so far nobody came up with solid evidence about that being the case. Also, --note that their qutebrowser package was often outdated in the past (even --qutebrowser security fixes took months to arrive there). You might be better --off chosing an <a href="https://qutebrowser.org/doc/install.html#tox";> --alternative install method</a>.</p> +-note that their qutebrowser package is usually very outdated (even qutebrowser +-security fixes took months to arrive there). You might be better off chosing an +-<a href="https://qutebrowser.org/doc/install.html#tox";> alternative install +-method</a>.</p> - -<p><b>White flashing between loads with a custom stylesheet</b>: This doesn't -seem to happen with <span class="mono">qt.process_model = single-process</span> -- 2.26.2
signature.asc
Description: PGP signature
_______________________________________________ Dev mailing list [email protected] https://lists.parabola.nu/mailman/listinfo/dev
