diff --git a/mingw-w64-qtcreator/PKGBUILD b/mingw-w64-qtcreator/PKGBUILD index ffc082490e..4551fe985c 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.0.3 +_base_ver=4.1.0 pkgver=${_base_ver}${_pre} pkgrel=1 pkgdesc='Cross-platform IDE (mingw-w64)' @@ -39,12 +39,12 @@ source=(#http://download.qt-project.org/development_releases/qtcreator/${_base_v 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) noextract=(${_pkgfqn}.tar.gz) -sha256sums=('a213a9b66e7e0eb906036a1587256fc0f7bac33912d9ae5e6117459231f56449' +sha256sums=('412c0223dbfd86983b39e10e2c7cb42b530995cfe2f3aa3529ea3f1b00ffb403' 'b4eba129997fef75b811d0ba3ef573db23ba13e43f9dbdb0c27164ee551ba08d' '96c14f54577bf6cadf5c12018745666a9e99cd8d6a876c29a28b13599a8cb368' '24f93d9d888027915ce3eb387d2d52123fd625ae1b3cd31adb6500952bc6e192' '1a1738379b0413484fd1ff3521b6bc85d034f5f964311d963dd044b4966b274b' - '2915cd4bf08643057129c26c0ce28caee14586fdf6a164a96e36ce0b37966427' + '4935e26fe84282ea856608519b7253e05b20560927e86783df7e2ff8f83a4b81' '0b0bba8bda0fd8247563e3827f58fe73baed17b09b9de6ea28375b7f1afa3ee1' 'e95ab2c936ff3e4fd09e044ff119829d72037a40de4bc6c93e90c52eb14a75fc' '5989243f07e4f72f33bf66ab67534b21e2e9d96993fc1814b96b2c6c80afbacf' 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 9dde3a7698..34b344f232 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 @@ -168,9 +168,9 @@ diff -urN qt-creator-opensource-src-3.3.2.orig/src/plugins/autotoolsprojectmanag #include #include @@ -188,10 +189,8 @@ - // Force output to english for the parsers. Do this here and not in the toolchain's - // addToEnvironment() to not screw up the users run environment. - env.set(QLatin1String("LC_ALL"), QLatin1String("C")); + pp->setMacroExpander(bc->macroExpander()); + Utils::Environment env = bc->environment(); + Utils::Environment::setupEnglishOutput(&env); - pp->setEnvironment(env); pp->setWorkingDirectory(bc->buildDirectory().toString()); - pp->setCommand(tc ? tc->makeCommand(bc->environment()) : QLatin1String("make"));