Befator-Inc-Firmen-Netzwerk/MINGW-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

qt-creator: Update to 4.3.0

Browse Source
This commit is contained in:
Alexey Pavlov
2017-06-12 11:09:37 +03:00
parent 46ebde75d3
commit 9bbc3eb4fc
4 changed files with 28 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
mingw-w64-qtcreator/PKGBUILD
View File

@@ -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
}

8
mingw-w64-qtcreator/qt-creator-3.2.0-MSYS2-autotools-run-shell-scripts-via-sh.patch
View File

@@ -167,7 +167,7 @@ diff -urN qt-creator-opensource-src-3.3.2.orig/src/plugins/autotoolsprojectmanag
#include <projectexplorer/buildsteplist.h>
#include <projectexplorer/target.h>
@@ -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(&param, bc->environment(), tcList.at(0), bc, arguments);
m_summaryText = param.summary(displayName());
} else {
m_summaryText = QLatin1String("<b>") + ProjectExplorer::ToolChainKitInformation::msgNoToolChainInTarget() + QLatin1String("</b>");
m_summaryText = QLatin1String("<b>") + ToolChainKitInformation::msgNoToolChainInTarget() + QLatin1String("</b>");
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

13
mingw-w64-qtcreator/qt-creator-3.2.0-qbs-CONFIG-add-qbs_enable_project_file_updates.patch
View File

@@ -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

15
mingw-w64-qtcreator/qt-creator-4.3.0-qbs-CONFIG-add-qbs_enable_project_file_updates.patch Normal file
View File

@@ -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