[Dev] Update [libre/qtcreator] to v 4.11
theova
theova at bluewin.ch
Wed Dec 18 17:02:26 GMT 2019
The patch below updates [libre/qtcreator] to version 4.11.0.
Changelog:
- Bumb pkgver and sha256sums
- Update qtcreator-preload-plugins.patch to Arch's version
- Delete unneeded parts in libre.patch (patched file doesn't exist
anymore in new version :-))
I tested the package on x86_64. On i686 the package builds successfully.
However, the build on armv7h failed, see attached log. (Despite of not
up-to-date dependencies I have no clues about the reason.)
-------------- next part --------------
diff --git a/libre/qtcreator/PKGBUILD b/libre/qtcreator/PKGBUILD
index bdbd5bf64..2af9af402 100644
--- a/libre/qtcreator/PKGBUILD
+++ b/libre/qtcreator/PKGBUILD
@@ -13,7 +13,7 @@
pkgname=qtcreator
-pkgver=4.10.2
+pkgver=4.11.0
_clangver=9.0.0
pkgrel=1
pkgrel+=.parabola1
@@ -40,10 +40,9 @@ optdepends=('qt5-doc: integrated Qt documentation'
source=("https://download.qt.io/official_releases/qtcreator/${pkgver%.*}/$pkgver/qt-creator-opensource-src-$pkgver.tar.xz"
qtcreator-preload-plugins.patch)
source+=('libre.patch')
-sha256sums=('9add6bdddfe5726bb02535409c2ed788b1afeee082121f54f887281d0e3c449a'
- '150c444e76ec969fc8765774b648984037829623300d0ce9d41a915b2afa792d')
-sha256sums+=('b44b9217770573b16e7bea873b0a0fb1b9f6f59502686eb6136d78bebc671ddb')
-
+sha256sums=('efebaa1c52526bf9c07b35c43071735c5d0b83b6cd08daab35a21e7ed53a7645'
+ '8053f1fab0037c31d366c9e5d740bf33528766d7f725472b7d38c4df06a0409f')
+sha256sums+=('d98f38db73a25c3e465130a6834c9cc8d39c4e485ac6c6418d3d9f8dfeb4ca9e')
prepare() {
mkdir -p build
diff --git a/libre/qtcreator/libre.patch b/libre/qtcreator/libre.patch
index 323f94239..7ac470a1f 100644
--- a/libre/qtcreator/libre.patch
+++ b/libre/qtcreator/libre.patch
@@ -5,7 +5,7 @@ index ffe71b6f1..a8d0bd72f 100644
@@ -60,13 +60,6 @@ FORMS += docsettingspage.ui \
generalsettingspage.ui \
remotehelpfilter.ui
-
+
-!isEmpty(QT.webenginewidgets.name) {
- QT += webenginewidgets
- HEADERS += webenginehelpviewer.h
@@ -16,22 +16,3 @@ index ffe71b6f1..a8d0bd72f 100644
osx {
DEFINES += QTC_MAC_NATIVE_HELPVIEWER
QT += macextras
-diff --git a/src/plugins/qmakeprojectmanager/qtmodulesinfo.cpp b/src/plugins/qmakeprojectmanager/qtmodulesinfo.cpp
-index a10899a2a..9ce2b463d 100644
---- a/src/plugins/qmakeprojectmanager/qtmodulesinfo.cpp
-+++ b/src/plugins/qmakeprojectmanager/qtmodulesinfo.cpp
-@@ -93,14 +93,6 @@ static inline QVector<const item*> 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-preload-plugins.patch b/libre/qtcreator/qtcreator-preload-plugins.patch
index f4772dd05..330fbc651 100644
--- a/libre/qtcreator/qtcreator-preload-plugins.patch
+++ b/libre/qtcreator/qtcreator-preload-plugins.patch
@@ -2,20 +2,12 @@ diff --git a/src/plugins/clangtools/clangtidyclazyrunner.cpp b/src/plugins/clang
index a580704243..7a8740a5cc 100644
--- a/src/plugins/clangtools/clangtidyclazyrunner.cpp
+++ b/src/plugins/clangtools/clangtidyclazyrunner.cpp
-@@ -76,6 +76,7 @@ QStringList ClangTidyClazyRunner::constructCommandLineArguments(const QStringLis
-
- const ClangDiagnosticConfig::TidyMode tidyMode = m_diagnosticConfig.clangTidyMode();
- if (tidyMode != ClangDiagnosticConfig::TidyMode::Disabled) {
-+ arguments << XclangArgs({"-load", "libclangTidyPlugin.so"});
- arguments << XclangArgs({"-add-plugin", "clang-tidy"});
- if (tidyMode != ClangDiagnosticConfig::TidyMode::File) {
- const QString tidyChecks = m_diagnosticConfig.clangTidyChecks();
-@@ -85,7 +86,7 @@ QStringList ClangTidyClazyRunner::constructCommandLineArguments(const QStringLis
-
- const QString clazyChecks = m_diagnosticConfig.clazyChecks();
+@@ -63,7 +63,7 @@ QStringList ClangTidyClazyRunner::constructCommandLineArguments(const QStringLis
+
+ const QString clazyChecks = diagnosticConfig.clazyChecks();
if (!clazyChecks.isEmpty()) {
- arguments << XclangArgs({"-add-plugin",
+ arguments << XclangArgs({"-load", "ClazyPlugin.so", "-add-plugin",
"clazy",
"-plugin-arg-clazy",
- "enable-all-fixits",
+ diagnosticConfig.clazyChecks()});
-------------- next part --------------
Info: creating stash file /build/qtcreator/src/build/.qmake.stash
cd src/ && ( test -e Makefile || /usr/bin/qmake -o Makefile /build/qtcreator/src/qt-creator-opensource-src-4.11.0/src/src.pro LLVM_INSTALL_DIR=/usr QBS_INSTALL_DIR=/usr KSYNTAXHIGHLIGHTING_LIB_DIR=/usr/lib KSYNTAXHIGHLIGHTING_INCLUDE_DIR=/usr/include/KF5/KSyntaxHighlighting CONFIG+=journald QMAKE_CFLAGS_ISYSTEM=-I DEFINES+=QBS_ENABLE_PROJECT_FILE_UPDATES ) && /usr/bin/make -f Makefile
make[1]: Entering directory '/build/qtcreator/src/build/src'
cd shared/ && ( test -e Makefile || /usr/bin/qmake -o Makefile /build/qtcreator/src/qt-creator-opensource-src-4.11.0/src/shared/shared.pro LLVM_INSTALL_DIR=/usr QBS_INSTALL_DIR=/usr KSYNTAXHIGHLIGHTING_LIB_DIR=/usr/lib KSYNTAXHIGHLIGHTING_INCLUDE_DIR=/usr/include/KF5/KSyntaxHighlighting CONFIG+=journald QMAKE_CFLAGS_ISYSTEM=-I DEFINES+=QBS_ENABLE_PROJECT_FILE_UPDATES ) && /usr/bin/make -f Makefile
make[2]: Entering directory '/build/qtcreator/src/build/src/shared'
make[2]: Nothing to be done for 'first'.
make[2]: Leaving directory '/build/qtcreator/src/build/src/shared'
cd libs/ && ( test -e Makefile || /usr/bin/qmake -o Makefile /build/qtcreator/src/qt-creator-opensource-src-4.11.0/src/libs/libs.pro LLVM_INSTALL_DIR=/usr QBS_INSTALL_DIR=/usr KSYNTAXHIGHLIGHTING_LIB_DIR=/usr/lib KSYNTAXHIGHLIGHTING_INCLUDE_DIR=/usr/include/KF5/KSyntaxHighlighting CONFIG+=journald QMAKE_CFLAGS_ISYSTEM=-I DEFINES+=QBS_ENABLE_PROJECT_FILE_UPDATES ) && /usr/bin/make -f Makefile
Project MESSAGE: Using KSyntaxHighlighting provided at /usr/lib.
make[2]: Entering directory '/build/qtcreator/src/build/src/libs'
cd aggregation/ && ( test -e Makefile || /usr/bin/qmake -o Makefile /build/qtcreator/src/qt-creator-opensource-src-4.11.0/src/libs/aggregation/aggregation.pro LLVM_INSTALL_DIR=/usr QBS_INSTALL_DIR=/usr KSYNTAXHIGHLIGHTING_LIB_DIR=/usr/lib KSYNTAXHIGHLIGHTING_INCLUDE_DIR=/usr/include/KF5/KSyntaxHighlighting CONFIG+=journald QMAKE_CFLAGS_ISYSTEM=-I DEFINES+=QBS_ENABLE_PROJECT_FILE_UPDATES ) && /usr/bin/make -f Makefile
cd utils/ && ( test -e Makefile || /usr/bin/qmake -o Makefile /build/qtcreator/src/qt-creator-opensource-src-4.11.0/src/libs/utils/utils.pro LLVM_INSTALL_DIR=/usr QBS_INSTALL_DIR=/usr KSYNTAXHIGHLIGHTING_LIB_DIR=/usr/lib KSYNTAXHIGHLIGHTING_INCLUDE_DIR=/usr/include/KF5/KSyntaxHighlighting CONFIG+=journald QMAKE_CFLAGS_ISYSTEM=-I DEFINES+=QBS_ENABLE_PROJECT_FILE_UPDATES ) && /usr/bin/make -f Makefile
cd sqlite/ && ( test -e Makefile || /usr/bin/qmake -o Makefile /build/qtcreator/src/qt-creator-opensource-src-4.11.0/src/libs/sqlite/sqlite.pro LLVM_INSTALL_DIR=/usr QBS_INSTALL_DIR=/usr KSYNTAXHIGHLIGHTING_LIB_DIR=/usr/lib KSYNTAXHIGHLIGHTING_INCLUDE_DIR=/usr/include/KF5/KSyntaxHighlighting CONFIG+=journald QMAKE_CFLAGS_ISYSTEM=-I DEFINES+=QBS_ENABLE_PROJECT_FILE_UPDATES ) && /usr/bin/make -f Makefile
cd utils/ && ( test -e Makefile.process_stub || /usr/bin/qmake -o Makefile.process_stub /build/qtcreator/src/qt-creator-opensource-src-4.11.0/src/libs/utils/process_stub.pro LLVM_INSTALL_DIR=/usr QBS_INSTALL_DIR=/usr KSYNTAXHIGHLIGHTING_LIB_DIR=/usr/lib KSYNTAXHIGHLIGHTING_INCLUDE_DIR=/usr/include/KF5/KSyntaxHighlighting CONFIG+=journald QMAKE_CFLAGS_ISYSTEM=-I DEFINES+=QBS_ENABLE_PROJECT_FILE_UPDATES ) && /usr/bin/make -f Makefile.process_stub
Project ERROR: Unknown module(s) in QT: core gui concurrent widgets
Project ERROR: Unknown module(s) in QT: core gui concurrent widgets
make[2]: *** [Makefile:62: sub-aggregation-make_first] Error 3
make[2]: *** Waiting for unfinished jobs....
Project ERROR: Unknown module(s) in QT: core gui concurrent widgets network qml xml
make[2]: *** [Makefile:393: sub-sqlite-make_first] Error 3
make[2]: *** [Makefile:113: sub-utils-make_first] Error 3
make[3]: Entering directory '/build/qtcreator/src/build/src/libs/utils'
gcc -c -pipe -O2 -march=armv7-a -mfloat-abi=hard -mfpu=vfpv3-d16 -O2 -pipe -fstack-protector-strong -fno-plt -Wall -W -fPIC -DQBS_ENABLE_PROJECT_FILE_UPDATES -D'RELATIVE_PLUGIN_PATH="../lib/qtcreator/plugins"' -D'RELATIVE_LIBEXEC_PATH="../lib/qtcreator"' -D'RELATIVE_DATA_PATH="../share/qtcreator"' -D'RELATIVE_DOC_PATH="../share/doc/qtcreator"' -DIDE_LIBRARY_BASENAME=\"lib\" -DQT_CREATOR -DQT_NO_JAVA_STYLE_ITERATORS -DQT_NO_CAST_TO_ASCII -DQT_RESTRICTED_CAST_FROM_ASCII -DQT_DISABLE_DEPRECATED_BEFORE=0x050900 -DQT_USE_FAST_OPERATOR_PLUS -DQT_USE_FAST_CONCATENATION -I../../../src -I../../../../qt-creator-opensource-src-4.11.0/src -I../../../../qt-creator-opensource-src-4.11.0/src/libs -I/build/qtcreator/src/qt-creator-opensource-src-4.11.0/tools -I../../../../qt-creator-opensource-src-4.11.0/src/plugins -I../../../../qt-creator-opensource-src-4.11.0/src/libs -I../../../../qt-creator-opensource-src-4.11.0/src/libs/3rdparty -I/usr/lib/qt/mkspecs/linux-g++ -o .obj/release-shared/process_stub_unix.o ../../../../qt-creator-opensource-src-4.11.0/src/libs/utils/process_stub_unix.c
gcc -Wl,-O1 -Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now -o ../../../lib/qtcreator/qtcreator_process_stub .obj/release-shared/process_stub_unix.o -L/build/qtcreator/src/build/lib/qtcreator
make[3]: Leaving directory '/build/qtcreator/src/build/src/libs/utils'
make[2]: Leaving directory '/build/qtcreator/src/build/src/libs'
make[1]: *** [Makefile:96: sub-libs-make_first-ordered] Error 2
make[1]: Leaving directory '/build/qtcreator/src/build/src'
make: *** [Makefile:49: sub-src-make_first-ordered] Error 2
[1m[31m==> ERROR:(B[m[1m A failure occurred in build().(B[m
[1m Aborting...(B[m
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <https://lists.parabola.nu/pipermail/dev/attachments/20191218/cca1c492/attachment.sig>
More information about the Dev
mailing list