From 9bbc3eb4fcdbf4445923fa3e7b31b74d6e6ae3a3 Mon Sep 17 00:00:00 2001 From: Alexey Pavlov Date: Mon, 12 Jun 2017 11:09:37 +0300 Subject: [PATCH] qt-creator: Update to 4.3.0 --- mingw-w64-qtcreator/PKGBUILD | 17 +++++++++-------- ...YS2-autotools-run-shell-scripts-via-sh.patch | 8 ++++---- ...IG-add-qbs_enable_project_file_updates.patch | 13 ------------- ...IG-add-qbs_enable_project_file_updates.patch | 15 +++++++++++++++ 4 files changed, 28 insertions(+), 25 deletions(-) delete mode 100644 mingw-w64-qtcreator/qt-creator-3.2.0-qbs-CONFIG-add-qbs_enable_project_file_updates.patch create mode 100644 mingw-w64-qtcreator/qt-creator-4.3.0-qbs-CONFIG-add-qbs_enable_project_file_updates.patch diff --git a/mingw-w64-qtcreator/PKGBUILD b/mingw-w64-qtcreator/PKGBUILD index c04c098cc3..96e0cef87e 100644 --- a/mingw-w64-qtcreator/PKGBUILD +++ b/mingw-w64-qtcreator/PKGBUILD @@ -5,7 +5,7 @@ _realname=qt-creator pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" __pre= -_base_ver=4.2.2 +_base_ver=4.3.0 pkgver=${_base_ver}${_pre} pkgrel=1 pkgdesc='Cross-platform IDE (mingw-w64)' @@ -33,23 +33,23 @@ source=(#http://download.qt-project.org/development_releases/qtcreator/${_base_v qt-creator-3.2.0-Allow-static-clang-via-LLVM_STATIC-env-var.patch qt-creator-3.2.0-Allow-iOS-plugin-on-any-platform.patch qt-creator-3.2.0-Define-QBS_INSTALL_DIR-as-relative-path.patch - qt-creator-3.2.0-qbs-CONFIG-add-qbs_enable_project_file_updates.patch qt-creator-3.2.0-MSYS2-autotools-run-shell-scripts-via-sh.patch qt-creator-3.2.0-autotools-allow-non-Automake-Makefile-in-projects.patch qt-creator-3.5.0-shellquote-declspec-dllexport-for-unix-shell.patch qt-creator-3.5.0-Hacky-fix-for-__GNUC_PREREQ-usage.patch - qt-creator-3.5.1-Use-systemEnvironment-For-Start-and-Debug-External-Application.patch) + qt-creator-3.5.1-Use-systemEnvironment-For-Start-and-Debug-External-Application.patch + qt-creator-4.3.0-qbs-CONFIG-add-qbs_enable_project_file_updates.patch) noextract=(${_pkgfqn}.tar.gz) -sha256sums=('0402f0e33bf3c8ee7f89c673f25fcf75fef03ba4262e077d9d9f42454d1e799b' +sha256sums=('b7ee67d93e14287f14e2c1b376516e843c82520384fbe764ef3d5e77ff4d9646' 'b4eba129997fef75b811d0ba3ef573db23ba13e43f9dbdb0c27164ee551ba08d' '96c14f54577bf6cadf5c12018745666a9e99cd8d6a876c29a28b13599a8cb368' '24f93d9d888027915ce3eb387d2d52123fd625ae1b3cd31adb6500952bc6e192' - '1a1738379b0413484fd1ff3521b6bc85d034f5f964311d963dd044b4966b274b' - 'd82239710c32fa2a9c3396145187454a3c58e4a6d404e911d20bdd286176a91b' + 'ff08877855fe7f2efaf78d4b7731ab740cd6e049c5f67400a0184baf112ad63d' '0b0bba8bda0fd8247563e3827f58fe73baed17b09b9de6ea28375b7f1afa3ee1' 'e95ab2c936ff3e4fd09e044ff119829d72037a40de4bc6c93e90c52eb14a75fc' '5989243f07e4f72f33bf66ab67534b21e2e9d96993fc1814b96b2c6c80afbacf' - 'bf6472c3b6a65e6fd0e0e822d25b5f4e849262ab3586f8ac16e7767d2bd641eb') + 'bf6472c3b6a65e6fd0e0e822d25b5f4e849262ab3586f8ac16e7767d2bd641eb' + '3939880a0d3a092ca18cf7a4bdf8873f6bf2a4602940297381002f1dc9d83999') prepare() { [[ -d ${srcdir}/${_pkgfqn} ]] && rm -rf ${srcdir}/${_pkgfqn} @@ -60,7 +60,6 @@ prepare() { #patch -p1 -i "${srcdir}"/qt-creator-3.2.0-Allow-static-clang-via-LLVM_STATIC-env-var.patch patch -p1 -i "${srcdir}"/qt-creator-3.2.0-Allow-iOS-plugin-on-any-platform.patch patch -p1 -i "${srcdir}"/qt-creator-3.2.0-Define-QBS_INSTALL_DIR-as-relative-path.patch - patch -p1 -i "${srcdir}"/qt-creator-3.2.0-qbs-CONFIG-add-qbs_enable_project_file_updates.patch patch -p1 -i "${srcdir}"/qt-creator-3.2.0-MSYS2-autotools-run-shell-scripts-via-sh.patch patch -p1 -i "${srcdir}"/qt-creator-3.2.0-autotools-allow-non-Automake-Makefile-in-projects.patch @@ -71,6 +70,8 @@ prepare() { #patch -p1 -i "${srcdir}"/qt-creator-3.5.0-Hacky-fix-for-__GNUC_PREREQ-usage.patch patch -p1 -i "${srcdir}"/qt-creator-3.5.1-Use-systemEnvironment-For-Start-and-Debug-External-Application.patch + patch -p1 -i "${srcdir}"/qt-creator-4.3.0-qbs-CONFIG-add-qbs_enable_project_file_updates.patch + # Use system installed qbs rm -rf src/shared/qbs } diff --git a/mingw-w64-qtcreator/qt-creator-3.2.0-MSYS2-autotools-run-shell-scripts-via-sh.patch b/mingw-w64-qtcreator/qt-creator-3.2.0-MSYS2-autotools-run-shell-scripts-via-sh.patch index 860e630957..a17ea9e986 100644 --- a/mingw-w64-qtcreator/qt-creator-3.2.0-MSYS2-autotools-run-shell-scripts-via-sh.patch +++ b/mingw-w64-qtcreator/qt-creator-3.2.0-MSYS2-autotools-run-shell-scripts-via-sh.patch @@ -167,7 +167,7 @@ diff -urN qt-creator-opensource-src-3.3.2.orig/src/plugins/autotoolsprojectmanag #include #include -@@ -188,10 +189,8 @@ +@@ -138,10 +139,8 @@ pp->setMacroExpander(bc->macroExpander()); Utils::Environment env = bc->environment(); Utils::Environment::setupEnglishOutput(&env); @@ -179,10 +179,10 @@ diff -urN qt-creator-opensource-src-3.3.2.orig/src/plugins/autotoolsprojectmanag pp->resolveAll(); setOutputParser(new GnuMakeParser()); -@@ -312,10 +311,8 @@ +@@ -262,10 +265,8 @@ ProcessParameters param; - param.setMacroExpander(bc->macroExpander()); + param.setMacroExpander(m_makeStep->macroExpander()); - param.setEnvironment(bc->environment()); param.setWorkingDirectory(bc->buildDirectory().toString()); - param.setCommand(tcList.at(0)->makeCommand(bc->environment())); @@ -190,7 +190,7 @@ diff -urN qt-creator-opensource-src-3.3.2.orig/src/plugins/autotoolsprojectmanag + ShellScriptProcessParametersSetMakeCommandAndArguments(¶m, bc->environment(), tcList.at(0), bc, arguments); m_summaryText = param.summary(displayName()); } else { - m_summaryText = QLatin1String("") + ProjectExplorer::ToolChainKitInformation::msgNoToolChainInTarget() + QLatin1String(""); + m_summaryText = QLatin1String("") + ToolChainKitInformation::msgNoToolChainInTarget() + QLatin1String(""); diff -urN qt-creator-opensource-src-3.3.2.orig/src/plugins/autotoolsprojectmanager/shellprocessparameters.cpp qt-creator-opensource-src-3.3.2/src/plugins/autotoolsprojectmanager/shellprocessparameters.cpp --- qt-creator-opensource-src-3.3.2.orig/src/plugins/autotoolsprojectmanager/shellprocessparameters.cpp 1970-01-01 01:00:00.000000000 +0100 +++ qt-creator-opensource-src-3.3.2/src/plugins/autotoolsprojectmanager/shellprocessparameters.cpp 2015-04-14 20:04:01.013682100 +0100 diff --git a/mingw-w64-qtcreator/qt-creator-3.2.0-qbs-CONFIG-add-qbs_enable_project_file_updates.patch b/mingw-w64-qtcreator/qt-creator-3.2.0-qbs-CONFIG-add-qbs_enable_project_file_updates.patch deleted file mode 100644 index 7de1f1b230..0000000000 --- a/mingw-w64-qtcreator/qt-creator-3.2.0-qbs-CONFIG-add-qbs_enable_project_file_updates.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -urN qt-creator-opensource-src-3.2.0.orig/qtcreator.pro qt-creator-opensource-src-3.2.0/qtcreator.pro ---- qt-creator-opensource-src-3.2.0.orig/qtcreator.pro 2014-08-19 12:50:07.594530300 +0100 -+++ qt-creator-opensource-src-3.2.0/qtcreator.pro 2014-08-19 13:27:40.638530300 +0100 -@@ -69,6 +69,9 @@ - QBS_CONFIG_ADDITION = qbs_no_dev_install qbs_enable_project_file_updates - cache(CONFIG, add, QBS_CONFIG_ADDITION) - } -+} else:minQtVersion(5, 0, 0):!qbs_no_dev_install { -+ QBS_CONFIG_ADDITION = qbs_enable_project_file_updates -+ cache(CONFIG, add, QBS_CONFIG_ADDITION) - } - - contains(QT_ARCH, i386): ARCHITECTURE = x86 diff --git a/mingw-w64-qtcreator/qt-creator-4.3.0-qbs-CONFIG-add-qbs_enable_project_file_updates.patch b/mingw-w64-qtcreator/qt-creator-4.3.0-qbs-CONFIG-add-qbs_enable_project_file_updates.patch new file mode 100644 index 0000000000..e003919a83 --- /dev/null +++ b/mingw-w64-qtcreator/qt-creator-4.3.0-qbs-CONFIG-add-qbs_enable_project_file_updates.patch @@ -0,0 +1,15 @@ +diff -urN qt-creator-opensource-src-4.3.0.orig/qtcreator.pro qt-creator-opensource-src-4.3.0/qtcreator.pro +--- qt-creator-opensource-src-4.3.0.orig/qtcreator.pro 2017-06-11 12:50:07.594530300 +0100 ++++ qt-creator-opensource-src-4.3.0/qtcreator.pro 2017-06-11 13:27:40.638530300 +0100 +@@ -89,7 +89,10 @@ + } + unset(DOC_FILES) + unset(DOC_TARGET_PREFIX) +-} ++ } else:minQtVersion(5, 0, 0):!qbs_no_dev_install { ++ QBS_CONFIG_ADDITION = qbs_enable_project_file_updates ++ cache(CONFIG, add, QBS_CONFIG_ADDITION) ++ } + + contains(QT_ARCH, i386): ARCHITECTURE = x86 + else: ARCHITECTURE = $$QT_ARCH