From f238cbfec2a2b0ea311880c22c41986e0496dd35 Mon Sep 17 00:00:00 2001 From: oaken-source Date: Sat, 26 Oct 2019 15:08:28 +0200 Subject: libre/qtcreator: updated --- libre/qtcreator/PKGBUILD | 22 ++++---- libre/qtcreator/libre.patch.new | 35 ------------ libre/qtcreator/qtcreator-clang-9.patch | 12 +++++ libre/qtcreator/qtcreator-clazy-1.5.patch | 45 ---------------- libre/qtcreator/qtcreator-mime-database.patch | 77 --------------------------- 5 files changed, 21 insertions(+), 170 deletions(-) delete mode 100644 libre/qtcreator/libre.patch.new create mode 100644 libre/qtcreator/qtcreator-clang-9.patch delete mode 100644 libre/qtcreator/qtcreator-clazy-1.5.patch delete mode 100644 libre/qtcreator/qtcreator-mime-database.patch (limited to 'libre/qtcreator') diff --git a/libre/qtcreator/PKGBUILD b/libre/qtcreator/PKGBUILD index c5d4d9ccc..7bdbf3d83 100644 --- a/libre/qtcreator/PKGBUILD +++ b/libre/qtcreator/PKGBUILD @@ -13,8 +13,8 @@ pkgname=qtcreator -pkgver=4.9.2 -_clangver=8.0.1 +pkgver=4.10.1 +_clangver=9.0.0 pkgrel=1 pkgrel+=.parabola1 pkgdesc='Lightweight, cross-platform integrated development environment' @@ -23,8 +23,7 @@ arch=(x86_64) arch+=(i686 armv7h) url='https://www.qt.io' license=(LGPL) -depends=(qt5-tools qt5-quickcontrols qt5-quickcontrols2 \ - clang=$_clangver qbs clazy syntax-highlighting desktop-file-utils) +depends=(qt5-tools qt5-quickcontrols qt5-quickcontrols2 clang=$_clangver qbs clazy syntax-highlighting desktop-file-utils) makedepends=(llvm python patchelf) options=(docs) optdepends=('qt5-doc: integrated Qt documentation' @@ -39,14 +38,12 @@ 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-clazy-1.5.patch qtcreator-preload-plugins.patch - qtcreator-mime-database.patch) + qtcreator-clang-9.patch) source+=('libre.patch') -sha256sums=('b7e0c797e7704c6c22eb35351946c0a758502fd082f6beaee043166e1739d3d7' - '1f6998fea92b9a157f42cca783839ce95f70ccc667027078b7881cbb253838f0' +sha256sums=('5098d87027bec3296bd93a7e112588759ccb0511fbfdc5558c1a1e83dff8d2a9' '150c444e76ec969fc8765774b648984037829623300d0ce9d41a915b2afa792d' - '8d64b5c28535dcaab910f32e82b04b425253015ca70f379cbe5e9693526a852a') + '1d66eb008e84459f6570e6e72acedcf80d2f0bb82650df3b733f7ca0a3f08a3d') sha256sums+=('b44b9217770573b16e7bea873b0a0fb1b9f6f59502686eb6136d78bebc671ddb') prepare() { @@ -58,13 +55,12 @@ prepare() { sed -e 's|libexec|lib|g' -i src/tools/tools.pro # use system qbs rm -r src/shared/qbs - # Adapt to clazy 1.5 plugin rename - patch -p1 -i ../qtcreator-clazy-1.5.patch # Preload analyzer plugins, since upstream clang doesn't link to all plugins # see http://code.qt.io/cgit/clang/clang.git/commit/?id=7f349701d3ea0c47be3a43e265699dddd3fd55cf # and https://bugs.archlinux.org/task/59492 patch -p1 -i ../qtcreator-preload-plugins.patch - patch -p1 -i ../qtcreator-mime-database.patch # Use system shared-mime-info + # Fix build with clang 9 (Fedora) + patch -p1 -i ../qtcreator-clang-9.patch # remove qt5-webengine support patch -Np1 -i "$srcdir"/libre.patch @@ -91,6 +87,6 @@ package() { install -Dm644 "$srcdir"/qt-creator-opensource-src-$pkgver/LICENSE.GPL3-EXCEPT "$pkgdir"/usr/share/licenses/qtcreator/LICENSE.GPL3-EXCEPT - # Link clazy plugin explicitely +# Link clazy plugin explicitely patchelf --add-needed ClazyPlugin.so "$pkgdir"/usr/lib/qtcreator/clangbackend } diff --git a/libre/qtcreator/libre.patch.new b/libre/qtcreator/libre.patch.new deleted file mode 100644 index 03c40136f..000000000 --- a/libre/qtcreator/libre.patch.new +++ /dev/null @@ -1,35 +0,0 @@ -diff -rupN qt-creator-opensource-src-4.8.2/src/plugins/help/help.pro qt-creator-opensource-src-4.8.2.new/src/plugins/help/help.pro ---- qt-creator-opensource-src-4.8.2/src/plugins/help/help.pro 2019-02-28 12:11:27.000000000 +0100 -+++ qt-creator-opensource-src-4.8.2.new/src/plugins/help/help.pro 2019-03-21 18:56:01.591134301 +0100 -@@ -60,13 +60,6 @@ FORMS += docsettingspage.ui \ - generalsettingspage.ui \ - remotehelpfilter.ui - --!isEmpty(QT.webenginewidgets.name) { -- QT += webenginewidgets -- HEADERS += webenginehelpviewer.h -- SOURCES += webenginehelpviewer.cpp -- DEFINES += QTC_WEBENGINE_HELPVIEWER --} -- - osx { - DEFINES += QTC_MAC_NATIVE_HELPVIEWER - QT += macextras -diff -rupN qt-creator-opensource-src-4.8.2/src/plugins/qmakeprojectmanager/qtmodulesinfo.cpp qt-creator-opensource-src-4.8.2.new/src/plugins/qmakeprojectmanager/qtmodulesinfo.cpp ---- qt-creator-opensource-src-4.8.2/src/plugins/qmakeprojectmanager/qtmodulesinfo.cpp 2019-02-28 12:11:27.000000000 +0100 -+++ qt-creator-opensource-src-4.8.2.new/src/plugins/qmakeprojectmanager/qtmodulesinfo.cpp 2019-03-21 18:56:01.591134301 +0100 -@@ -93,14 +93,6 @@ static inline QVector itemV - QLatin1String("QtSvg"), - QCoreApplication::translate("QtModulesInfo", "Classes for displaying the contents of SVG files"), - false}, -- {"webengine", -- QLatin1String("QtWebEngine"), -- QCoreApplication::translate("QtModulesInfo", "Classes for displaying and editing Web content using Chromium backend"), -- false}, -- {"webenginewidgets", -- QLatin1String("QtWebEngineWidgets"), -- QCoreApplication::translate("QtModulesInfo", "WebEngine and QWidget-based classes using Chromium backend"), -- false}, - {"webkit", - QLatin1String("QtWebKit"), - QCoreApplication::translate("QtModulesInfo", "Classes for displaying and editing Web content"), diff --git a/libre/qtcreator/qtcreator-clang-9.patch b/libre/qtcreator/qtcreator-clang-9.patch new file mode 100644 index 000000000..0fc9418e0 --- /dev/null +++ b/libre/qtcreator/qtcreator-clang-9.patch @@ -0,0 +1,12 @@ +diff -rupN qt-creator-opensource-src-4.10.0/src/plugins/clangformat/clangformatutils.cpp qt-creator-opensource-src-4.10.0-new/src/plugins/clangformat/clangformatutils.cpp +--- qt-creator-opensource-src-4.10.0/src/plugins/clangformat/clangformatutils.cpp 2019-09-03 16:36:38.000000000 +0200 ++++ qt-creator-opensource-src-4.10.0-new/src/plugins/clangformat/clangformatutils.cpp 2019-09-25 13:33:27.230835047 +0200 +@@ -60,7 +60,7 @@ static clang::format::FormatStyle qtcSty + style.AllowShortBlocksOnASingleLine = false; + style.AllowShortCaseLabelsOnASingleLine = false; + style.AllowShortFunctionsOnASingleLine = FormatStyle::SFS_Inline; +- style.AllowShortIfStatementsOnASingleLine = false; ++ style.AllowShortIfStatementsOnASingleLine = FormatStyle::SIS_Never; + style.AllowShortLoopsOnASingleLine = false; + style.AlwaysBreakAfterReturnType = FormatStyle::RTBS_None; + style.AlwaysBreakBeforeMultilineStrings = false; diff --git a/libre/qtcreator/qtcreator-clazy-1.5.patch b/libre/qtcreator/qtcreator-clazy-1.5.patch deleted file mode 100644 index ce9d2cc0e..000000000 --- a/libre/qtcreator/qtcreator-clazy-1.5.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff --git a/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp b/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp -index 706c5101a3..dbfaeb8457 100644 ---- a/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp -+++ b/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp -@@ -527,14 +528,14 @@ private: - return; - - m_options.append(CppTools::XclangArgs({"-add-plugin", -- "clang-lazy", -- "-plugin-arg-clang-lazy", -+ "clazy", -+ "-plugin-arg-clazy", - "enable-all-fixits", -- "-plugin-arg-clang-lazy", -+ "-plugin-arg-clazy", - "no-autowrite-fixits", -- "-plugin-arg-clang-lazy", -+ "-plugin-arg-clazy", - checks, -- "-plugin-arg-clang-lazy", -+ "-plugin-arg-clazy", - "ignore-included-files"})); - } - -diff --git a/src/plugins/clangtools/clangtidyclazyrunner.cpp b/src/plugins/clangtools/clangtidyclazyrunner.cpp -index a580704243..7a8740a5cc 100644 ---- a/src/plugins/clangtools/clangtidyclazyrunner.cpp -+++ b/src/plugins/clangtools/clangtidyclazyrunner.cpp -@@ -86,12 +87,12 @@ QStringList ClangTidyClazyRunner::constructCommandLineArguments(const QStringLis - const QString clazyChecks = m_diagnosticConfig.clazyChecks(); - if (!clazyChecks.isEmpty()) { - arguments << XclangArgs({"-add-plugin", -- "clang-lazy", -- "-plugin-arg-clang-lazy", -+ "clazy", -+ "-plugin-arg-clazy", - "enable-all-fixits", -- "-plugin-arg-clang-lazy", -+ "-plugin-arg-clazy", - "no-autowrite-fixits", -- "-plugin-arg-clang-lazy", -+ "-plugin-arg-clazy", - m_diagnosticConfig.clazyChecks()}); - } - diff --git a/libre/qtcreator/qtcreator-mime-database.patch b/libre/qtcreator/qtcreator-mime-database.patch deleted file mode 100644 index 65ce334f6..000000000 --- a/libre/qtcreator/qtcreator-mime-database.patch +++ /dev/null @@ -1,77 +0,0 @@ -From e7ef1ad0ba526dd2fc47602e4d45d62adbdbe5db Mon Sep 17 00:00:00 2001 -From: Thiago Macieira -Date: Fri, 28 Jun 2019 22:46:20 -0700 -Subject: [PATCH] Re-fix QtCore resource path changing and prepare for Qt 5.13 - -Commit 9cf8ab3b3d44ac50a1f8d4893d8f70b8aedb18b0 added the #ifdef, but -that of course only works if you don't upgrade Qt compared to what Qt -Creator was compiled with. Instead, attempt both paths and only do that -if the system copy is not found. - -Searching the system copy is required to address Qt 5.13's configure -option -no-mimetype-database (used by Linux distributions because the -system copy is always present). - -This code will still need work to deal with Qt 5.14 changes. - -Task-number: QTCREATORBUG-19600 -Task-number: QTCREATORBUG-22636 -Change-Id: I6aed4df6a12e43c3ac8efffd15ac952a6e9d4770 ---- - -diff --git a/src/libs/utils/mimetypes/mimeprovider.cpp b/src/libs/utils/mimetypes/mimeprovider.cpp -index d444aa8..ce94215 100644 ---- a/src/libs/utils/mimetypes/mimeprovider.cpp -+++ b/src/libs/utils/mimetypes/mimeprovider.cpp -@@ -784,32 +784,25 @@ - { - if (!m_loaded /*|| shouldCheck()*/) { - m_loaded = true; --// bool fdoXmlFound = false; -- QStringList allFiles; -+ QStringList allFiles = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, -+ QStringLiteral("mime/packages/freedesktop.org.xml"), -+ QStandardPaths::LocateFile); - --// const QStringList packageDirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QLatin1String("mime/packages"), QStandardPaths::LocateDirectory); --// //qDebug() << "packageDirs=" << packageDirs; --// for (const QString &packageDir : packageDirs) { --// QDir dir(packageDir); --// const QStringList files = dir.entryList(QDir::Files | QDir::NoDotAndDotDot); --// //qDebug() << static_cast(this) << packageDir << files; --// if (!fdoXmlFound) --// fdoXmlFound = files.contains(QLatin1String("freedesktop.org.xml")); --// QStringList::const_iterator endIt(files.constEnd()); --// for (QStringList::const_iterator it(files.constBegin()); it != endIt; ++it) { --// allFiles.append(packageDir + QLatin1Char('/') + *it); --// } --// } -- --// if (!fdoXmlFound) { --// // We could instead install the file as part of installing Qt? --#if (QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)) -- const char freedesktopOrgXml[] = ":/qt-project.org/qmime/packages/freedesktop.org.xml"; --#else -- const char freedesktopOrgXml[] = ":/qt-project.org/qmime/freedesktop.org.xml"; --#endif -- allFiles.prepend(QLatin1String(freedesktopOrgXml)); --// } -+ if (allFiles.isEmpty()) { -+ // System freedsktop.org.xml file not found, try to use the one in QtCore. -+ // This is private API and has changed in the past: -+ // - Qt 5.11 added "package" subdir in 7a5644d6481a3c1a7416772998ca4e60c977bfbd -+ // - Qt 5.13 added an option to not bundle it at all -+ const QString fdoXml5_11 = QStringLiteral(":/qt-project.org/qmime/packages/freedesktop.org.xml"); -+ const QString fdoXmlPre5_11 = QStringLiteral(":/qt-project.org/qmime/freedesktop.org.xml"); -+ if (QFile::exists(fdoXml5_11)) -+ allFiles << fdoXml5_11; -+ else if (QFile::exists(fdoXmlPre5_11)) -+ allFiles << fdoXmlPre5_11; -+ else -+ qFatal("Utils::MimeXMLProvider: could not find the system freedesktop.org.xml file " -+ "and QtCore does not have an accessible copy."); -+ } - - m_nameMimeTypeMap.clear(); - m_aliases.clear(); - -- cgit v1.2.3