diff --git a/mingw-w64-qtcreator/PKGBUILD b/mingw-w64-qtcreator/PKGBUILD index 78cb8cc2d1..f8640d9554 100644 --- a/mingw-w64-qtcreator/PKGBUILD +++ b/mingw-w64-qtcreator/PKGBUILD @@ -4,7 +4,8 @@ _realname=qt-creator _mingw_suff=mingw-w64-${CARCH} pkgname="${_mingw_suff}-${_realname}" -_pre=rc1 +#_pre=rc1 +#__pre=-rc1 _base_ver=3.1.0 pkgver=${_base_ver}${_pre} pkgrel=1 @@ -12,7 +13,8 @@ pkgdesc='Cross-patform IDE' url='http://qt-project.org' arch=('any') depends=("${_mingw_suff}-qt5" "${_mingw_suff}-gcc" "${_mingw_suff}-make") -options=('docs' '!strip' 'staticlibs') +makedepends=("${_mingw_suff}-clang") +options=('docs' 'staticlibs') # 'debug' '!strip' optdepends=("${_mingw_suff}-gdb: for the debugger" "${_mingw_suff}-cmake: for cmake project support" "${_mingw_suff}-clang: for clang code model" @@ -21,16 +23,17 @@ optdepends=("${_mingw_suff}-gdb: for the debugger" #'mercurial: for mercurial support' #'bzr: for bazaar support' ) -_pkgfqn="${_realname}-opensource-src-${_base_ver}-${_pre}" -source=(#http://download.qt-project.org/official_releases/qtcreator/${pkgver%.*}/${pkgver}/${_pkgfqn}.tar.gz - http://download.qt-project.org/development_releases/qtcreator/${_base_ver%.*}/${_base_ver}-${_pre}/${_pkgfqn}.tar.gz - qt-creator-3.0.0-path-quote.patch - qt-creator-3.1.0-Allow-static-clang-via-LLVM_STATIC-env-var.patch) +_pkgfqn="${_realname}-opensource-src-${_base_ver}${__pre}" +source=(#http://download.qt-project.org/development_releases/qtcreator/${_base_ver%.*}/${_base_ver}-${_pre}/${_pkgfqn}.tar.gz + http://download.qt-project.org/official_releases/qtcreator/${pkgver%.*}/${pkgver}/${_pkgfqn}.tar.gz + qt-creator-3.0.0-path-quote.patch + qt-creator-3.1.0-Allow-static-clang-via-LLVM_STATIC-env-var.patch + qt-creator-3.1.0-Allow-iOS-plugin-on-any-platform.patch) noextract=(${_pkgfqn}.tar.gz) -sha256sums=('b2bda80fbbc4d901a793c57e33dd47ceacd348ca433684909c6e7ee7704e4ce9' +sha256sums=('c8c648f4988b707393e0f1958a8868718f27e59263f05f3b6599fa62290c2bbf' '26f9f487cd609091900a6d900ab5067023b4e4349e06f4477c80debbbd32ec6f' - '606e66eae324312f168c543fd0a3bbfe78b35f4b1f592ad7a11c5b1b7a6c83ae') - + '606e66eae324312f168c543fd0a3bbfe78b35f4b1f592ad7a11c5b1b7a6c83ae' + 'a86fb90fa133be45a4c73e6cdf3f4c2fe726d46c6d00d258e67860e714bdc5ad') prepare() { cd $startdir/ [ -d ${srcdir}/${_pkgfqn} ] && rm -rf ${srcdir}/${_pkgfqn} @@ -39,6 +42,7 @@ prepare() { cd ${srcdir}/${_pkgfqn} patch -p0 -i ${srcdir}/qt-creator-3.0.0-path-quote.patch patch -p1 -i ${srcdir}/qt-creator-3.1.0-Allow-static-clang-via-LLVM_STATIC-env-var.patch + patch -p1 -i ${srcdir}/qt-creator-3.1.0-Allow-iOS-plugin-on-any-platform.patch } build() { @@ -47,7 +51,12 @@ build() { cd ${srcdir}/build-${MINGW_CHOST} export LLVM_INSTALL_DIR=${MINGW_PREFIX} export LLVM_STATIC=1 - ${MINGW_PREFIX}/bin/qmake.exe ../${_pkgfqn}/qtcreator.pro CONFIG+=release + if check_option "debug" "y"; then + _config_variant=debug + else + _config_variant=release + fi + ${MINGW_PREFIX}/bin/qmake.exe ../${_pkgfqn}/qtcreator.pro CONFIG+=${_config_variant} make make docs } diff --git a/mingw-w64-qtcreator/qt-creator-3.1.0-Allow-iOS-plugin-on-any-platform.patch b/mingw-w64-qtcreator/qt-creator-3.1.0-Allow-iOS-plugin-on-any-platform.patch new file mode 100644 index 0000000000..12b9594e4c --- /dev/null +++ b/mingw-w64-qtcreator/qt-creator-3.1.0-Allow-iOS-plugin-on-any-platform.patch @@ -0,0 +1,10 @@ +--- qt-creator-opensource-src-3.1.0-rc1/src/plugins/ios/Ios.pluginspec.in.orig 2014-04-02 13:50:17.000000000 +0000 ++++ qt-creator-opensource-src-3.1.0-rc1/src/plugins/ios/Ios.pluginspec.in 2014-04-14 11:40:11.080427800 +0000 +@@ -1,7 +1,6 @@ + + Digia Plc + (C) 2014 Digia Plc +- Mac OS.* + + Commercial Usage +