From 170f6fccc7ea4fe9be4053af50f561b3aa72f582 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Thu, 20 Aug 2015 17:11:17 +0200
Subject: [PATCH] qtcreator: update to 3.5.0

+ Fix parallel build issue by sequentially building subdirs first
---
 srcpkgs/qtcreator/template | 24 ++++++++++++++++++++----
 srcpkgs/qtcreator/update   |  1 +
 2 files changed, 21 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/qtcreator/update

diff --git a/srcpkgs/qtcreator/template b/srcpkgs/qtcreator/template
index d55a6a07974..1da0b4d25e0 100644
--- a/srcpkgs/qtcreator/template
+++ b/srcpkgs/qtcreator/template
@@ -1,6 +1,6 @@
 # Template file for 'qtcreator'
 pkgname=qtcreator
-version=3.4.1
+version=3.5.0
 revision=1
 wrksrc=qt-creator-opensource-src-${version}
 build_style=gnu-makefile
@@ -14,12 +14,28 @@ nocross=yes
 short_desc="A cross-platform IDE for Qt developers"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="LGPL-2.1"
-homepage="http://qt.io/download-open-source/"
+homepage="http://wiki.qt.io/Category:Tools::QtCreator"
 distfiles="http://download.qt.io/official_releases/qtcreator/${version%.*}/${version}/${wrksrc}.tar.gz"
-checksum=029e22307e79c4fb3a34be854dedddaa56476c6c6374c312125b9302bcbc0fd9
+checksum=5dc35f81b50d65243a6ae046125061051d03c3d50937a37e29e0669384bb0eb6
+
+# Currently fails with parallel build :/
+# disable_parallel_build=yes
 
 do_configure() {
-	MAKEFLAGS=${makejobs} qmake
+	qmake
+}
+do_build() {
+	# Note: A simple "make ${makejobs}" fails after libs because
+	# of files being removed and symlinked asynchronously.
+	# Fix this parallel build issue by first sequentially making subdirs
+	cd src
+	make ${makejobs} libs
+	make ${makejobs} app
+	make ${makejobs} plugins
+	make ${makejobs} tools
+	cd ..
+	# ... and eventually the main Makefile
+	make ${makejobs}
 }
 post_install() {
 	# Install the desktop file
diff --git a/srcpkgs/qtcreator/update b/srcpkgs/qtcreator/update
new file mode 100644
index 00000000000..3f604d2a3bc
--- /dev/null
+++ b/srcpkgs/qtcreator/update
@@ -0,0 +1 @@
+site="http://www.qt.io/download-open-source/"