diff --git a/mingw-w64-qtcreator/PKGBUILD b/mingw-w64-qtcreator/PKGBUILD index 324936a693..37f00acb0b 100644 --- a/mingw-w64-qtcreator/PKGBUILD +++ b/mingw-w64-qtcreator/PKGBUILD @@ -5,9 +5,9 @@ _realname=qt-creator pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" __pre= -_base_ver=4.2.0 +_base_ver=4.2.1 pkgver=${_base_ver}${_pre} -pkgrel=2 +pkgrel=1 pkgdesc='Cross-platform IDE (mingw-w64)' url='https://www.qt.io/' install=qt-creator-${CARCH}.install @@ -39,7 +39,7 @@ 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=('0e05783bbc3a38aa935dd1b17191bcbc2af3cf6f7197865ee089fe094d0cf27b' +sha256sums=('2537c2fcd127136241d0bf3bf9e1f03cf35be1a24414479d5502a7539ca25a38' 'b4eba129997fef75b811d0ba3ef573db23ba13e43f9dbdb0c27164ee551ba08d' '96c14f54577bf6cadf5c12018745666a9e99cd8d6a876c29a28b13599a8cb368' '24f93d9d888027915ce3eb387d2d52123fd625ae1b3cd31adb6500952bc6e192' @@ -86,7 +86,7 @@ build() { _config_variant=release fi ${MINGW_PREFIX}/bin/qmake.exe ../${_pkgfqn}/qtcreator.pro CONFIG+=${_config_variant} - make ${_config_variant} + make ${_config_variant} -j1 make docs } diff --git a/mingw-w64-qtcreator/qt-creator-i686.install b/mingw-w64-qtcreator/qt-creator-i686.install index 2732dc32a9..fa5d88b0b4 100644 --- a/mingw-w64-qtcreator/qt-creator-i686.install +++ b/mingw-w64-qtcreator/qt-creator-i686.install @@ -27,7 +27,7 @@ post_install() { ./sdktool.exe addTC \ "--id" "ProjectExplorer.ToolChain.Mingw:M2_MSYS2_x86_64_C" \ "--language" "1" \ - "--name" "MSYS2 64bit (MSYS2)" \ + "--name" "MSYS2 64bit GCC (MSYS2)" \ "--path" "/usr/bin/gcc.exe" \ "--abi" "x86-windows-msys-pe-64bit" \ "--supportedAbis" "x86-windows-msys-pe-64bit" @@ -35,7 +35,7 @@ post_install() { ./sdktool.exe addTC \ "--id" "ProjectExplorer.ToolChain.Mingw:M2_MSYS2_x86_64_CXX" \ "--language" "2" \ - "--name" "MSYS2 64bit (MSYS2)" \ + "--name" "MSYS2 64bit G++ (MSYS2)" \ "--path" "/usr/bin/g++.exe" \ "--abi" "x86-windows-msys-pe-64bit" \ "--supportedAbis" "x86-windows-msys-pe-64bit" @@ -47,7 +47,7 @@ post_install() { ./sdktool.exe addTC \ "--id" "ProjectExplorer.ToolChain.Mingw:M2_MSYS2_i686_C" \ "--language" "1" \ - "--name" "MSYS2 32bit (MSYS2)" \ + "--name" "MSYS2 32bit GCC (MSYS2)" \ "--path" "/usr/bin/gcc.exe" \ "--abi" "x86-windows-msys-pe-32bit" \ "--supportedAbis" "x86-windows-msys-pe-32bit" @@ -55,7 +55,7 @@ post_install() { ./sdktool.exe addTC \ "--id" "ProjectExplorer.ToolChain.Mingw:M2_MSYS2_i686_CXX" \ "--language" "2" \ - "--name" "MSYS2 32bit (MSYS2)" \ + "--name" "MSYS2 32bit G++ (MSYS2)" \ "--path" "/usr/bin/g++.exe" \ "--abi" "x86-windows-msys-pe-32bit" \ "--supportedAbis" "x86-windows-msys-pe-32bit" @@ -71,7 +71,7 @@ post_install() { ./sdktool.exe addTC \ "--id" "ProjectExplorer.ToolChain.Mingw:M2_MinGW-w64_x86_64_C" \ "--language" "1" \ - "--name" "MinGW-w64 64bit (MSYS2)" \ + "--name" "MinGW-w64 64bit GCC (MSYS2)" \ "--path" "/mingw64/bin/gcc.exe" \ "--abi" "x86-windows-msys-pe-64bit" \ "--supportedAbis" "x86-windows-msys-pe-64bit" @@ -79,7 +79,7 @@ post_install() { ./sdktool.exe addTC \ "--id" "ProjectExplorer.ToolChain.Mingw:M2_MinGW-w64_x86_64_CXX" \ "--language" "2" \ - "--name" "MinGW-w64 64bit (MSYS2)" \ + "--name" "MinGW-w64 64bit G++ (MSYS2)" \ "--path" "/mingw64/bin/g++.exe" \ "--abi" "x86-windows-msys-pe-64bit" \ "--supportedAbis" "x86-windows-msys-pe-64bit" @@ -91,7 +91,7 @@ post_install() { ./sdktool.exe addTC \ "--id" "ProjectExplorer.ToolChain.Mingw:M2_MinGW-w64_i686_C" \ "--language" "1" \ - "--name" "MinGW-w64 32bit (MSYS2)" \ + "--name" "MinGW-w64 32bit GCC (MSYS2)" \ "--path" "/mingw32/bin/gcc.exe" \ "--abi" "x86-windows-msys-pe-32bit" \ "--supportedAbis" "x86-windows-msys-pe-32bit" @@ -99,7 +99,7 @@ post_install() { ./sdktool.exe addTC \ "--id" "ProjectExplorer.ToolChain.Mingw:M2_MinGW-w64_i686_CXX" \ "--language" "2" \ - "--name" "MinGW-w64 32bit (MSYS2)" \ + "--name" "MinGW-w64 32bit G++ (MSYS2)" \ "--path" "/mingw32/bin/g++.exe" \ "--abi" "x86-windows-msys-pe-32bit" \ "--supportedAbis" "x86-windows-msys-pe-32bit" diff --git a/mingw-w64-qtcreator/qt-creator-x86_64.install b/mingw-w64-qtcreator/qt-creator-x86_64.install index e1ca5916c0..af401ce08e 100644 --- a/mingw-w64-qtcreator/qt-creator-x86_64.install +++ b/mingw-w64-qtcreator/qt-creator-x86_64.install @@ -27,7 +27,7 @@ post_install() { ./sdktool.exe addTC \ "--id" "ProjectExplorer.ToolChain.Mingw:M2_MSYS2_x86_64_C" \ "--language" "1" \ - "--name" "MSYS2 64bit (MSYS2)" \ + "--name" "MSYS2 64bit GCC (MSYS2)" \ "--path" "/usr/bin/gcc.exe" \ "--abi" "x86-windows-msys-pe-64bit" \ "--supportedAbis" "x86-windows-msys-pe-64bit" @@ -35,7 +35,7 @@ post_install() { ./sdktool.exe addTC \ "--id" "ProjectExplorer.ToolChain.Mingw:M2_MSYS2_x86_64_CXX" \ "--language" "2" \ - "--name" "MSYS2 64bit (MSYS2)" \ + "--name" "MSYS2 64bit G++ (MSYS2)" \ "--path" "/usr/bin/g++.exe" \ "--abi" "x86-windows-msys-pe-64bit" \ "--supportedAbis" "x86-windows-msys-pe-64bit" @@ -47,7 +47,7 @@ post_install() { ./sdktool.exe addTC \ "--id" "ProjectExplorer.ToolChain.Mingw:M2_MSYS2_i686_C" \ "--language" "1" \ - "--name" "MSYS2 32bit (MSYS2)" \ + "--name" "MSYS2 32bit GCC (MSYS2)" \ "--path" "/usr/bin/gcc.exe" \ "--abi" "x86-windows-msys-pe-32bit" \ "--supportedAbis" "x86-windows-msys-pe-32bit" @@ -55,7 +55,7 @@ post_install() { ./sdktool.exe addTC \ "--id" "ProjectExplorer.ToolChain.Mingw:M2_MSYS2_i686_CXX" \ "--language" "2" \ - "--name" "MSYS2 32bit (MSYS2)" \ + "--name" "MSYS2 32bit G++ (MSYS2)" \ "--path" "/usr/bin/g++.exe" \ "--abi" "x86-windows-msys-pe-32bit" \ "--supportedAbis" "x86-windows-msys-pe-32bit" @@ -71,7 +71,7 @@ post_install() { ./sdktool.exe addTC \ "--id" "ProjectExplorer.ToolChain.Mingw:M2_MinGW-w64_x86_64_C" \ "--language" "1" \ - "--name" "MinGW-w64 64bit (MSYS2)" \ + "--name" "MinGW-w64 64bit GCC (MSYS2)" \ "--path" "/mingw64/bin/gcc.exe" \ "--abi" "x86-windows-msys-pe-64bit" \ "--supportedAbis" "x86-windows-msys-pe-64bit" @@ -79,7 +79,7 @@ post_install() { ./sdktool.exe addTC \ "--id" "ProjectExplorer.ToolChain.Mingw:M2_MinGW-w64_x86_64_CXX" \ "--language" "2" \ - "--name" "MinGW-w64 64bit (MSYS2)" \ + "--name" "MinGW-w64 64bit G++ (MSYS2)" \ "--path" "/mingw64/bin/g++.exe" \ "--abi" "x86-windows-msys-pe-64bit" \ "--supportedAbis" "x86-windows-msys-pe-64bit" @@ -91,7 +91,7 @@ post_install() { ./sdktool.exe addTC \ "--id" "ProjectExplorer.ToolChain.Mingw:M2_MinGW-w64_i686_C" \ "--language" "1" \ - "--name" "MinGW-w64 32bit (MSYS2)" \ + "--name" "MinGW-w64 32bit GCC (MSYS2)" \ "--path" "/mingw32/bin/gcc.exe" \ "--abi" "x86-windows-msys-pe-32bit" \ "--supportedAbis" "x86-windows-msys-pe-32bit" @@ -99,7 +99,7 @@ post_install() { ./sdktool.exe addTC \ "--id" "ProjectExplorer.ToolChain.Mingw:M2_MinGW-w64_i686_CXX" \ "--language" "2" \ - "--name" "MinGW-w64 32bit (MSYS2)" \ + "--name" "MinGW-w64 32bit G++ (MSYS2)" \ "--path" "/mingw32/bin/g++.exe" \ "--abi" "x86-windows-msys-pe-32bit" \ "--supportedAbis" "x86-windows-msys-pe-32bit"