version 2.8.1-4

This update adds a cmake-wrapper.sh script which can be used to
make this version of QtCreator accept newer (>3) cmake versions.

4 files changed, 37 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 74bdc111dfe4..b31881973f8c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
-# Generated by makepkg 4.2.1
-# Sat Jun 20 13:56:10 UTC 2015
+# Generated by mksrcinfo v8
+# Wed Jan 27 11:58:42 UTC 2016
 pkgbase = qtcreator28
 	pkgdesc = Lightweight, cross-platform integrated development environment (2.8.x)
 	pkgver = 2.8.1
-	pkgrel = 3
+	pkgrel = 4
 	url = http://qt-project.org
 	install = qtcreator28.install
 	arch = i686
@@ -27,9 +27,11 @@ pkgbase = qtcreator28
 	source = git+https://github.com/qtproject/qt-creator.git#tag=v2.8.1
 	source = git+https://github.com/qtproject/qt-labs-qbs.git
 	source = qtcreator28.desktop
+	source = cmake-wrapper.sh
 	md5sums = SKIP
 	md5sums = SKIP
 	md5sums = 297116239167ff1b2fdbe014688bf140
+	md5sums = f80002d551c3ace26e4e6405519c96c8
 
 pkgname = qtcreator28
 
diff --git a/PKGBUILD b/PKGBUILD
index 1d6e540e475c..a437bc5881b2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,7 +12,7 @@
 pkgname=qtcreator28
 pkgver=2.8.1
 _pkgver=2.8.1
-pkgrel=3
+pkgrel=4
 pkgdesc='Lightweight, cross-platform integrated development environment (2.8.x)'
 arch=('i686' 'x86_64')
 url='http://qt-project.org'
@@ -31,10 +31,12 @@ optdepends=('qt51-doc: for the integrated Qt documentation'
 install=${pkgname}.install
 source=("git+https://github.com/qtproject/qt-creator.git#tag=v${_pkgver}"
         "git+https://github.com/qtproject/qt-labs-qbs.git"
-        "${pkgname}.desktop")
+        "${pkgname}.desktop"
+        "cmake-wrapper.sh")
 md5sums=('SKIP'
          'SKIP'
-         '297116239167ff1b2fdbe014688bf140')
+         '297116239167ff1b2fdbe014688bf140'
+         'f80002d551c3ace26e4e6405519c96c8')
 _install_root="/opt/$pkgname"
 
 prepare() {
@@ -84,4 +86,7 @@ package() {
     install -Dm644 ${pkgdir}/opt/${pkgname}/usr/share/icons/hicolor/${ii}.png ${pkgdir}/usr/share/icons/hicolor/${ii}28.png
   done
   rm -r ${pkgdir}/opt/${pkgname}/usr/share/icons
+
+  # install cmake wrapper
+  install -Dm755 ${srcdir}/cmake-wrapper.sh ${pkgdir}/opt/${pkgname}/usr/bin/cmake-wrapper.sh
 }
diff --git a/cmake-wrapper.sh b/cmake-wrapper.sh
new file mode 100755
index 000000000000..9a25f9464d52
--- /dev/null
+++ b/cmake-wrapper.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+cd $PWD
+
+if [ "${1}" == "--help" ]
+then
+    echo "cmake version 2.8.12.2"
+    cmake --help
+else
+    cmake "${@}"
+fi
diff --git a/qtcreator28.install b/qtcreator28.install
index 4d4a283dba5c..ae6cc136b4a4 100644
--- a/qtcreator28.install
+++ b/qtcreator28.install
@@ -1,6 +1,19 @@
 post_install() {
     update-desktop-database -q
     gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+
+    cat << EOF
+
+This version of QtCreator does not work with cmake > 2.
+To work around this, there is a wrapper script provided in
+
+/opt/qtcreator28/usr/bin/cmake-wrapper.sh
+
+which you can configure to be used as cmake executable in 
+
+Tools > Options > Build & Run > Cmake
+
+EOF
 }
 
 post_upgrade() {