From b70ed4259fc96bebb66433da06e7df770b8eb46d Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sat, 9 Mar 2019 23:11:39 +1000
Subject: [PATCH] QtCreator: Switch back to using the libclang version 5.0.

---
 dev-qt/qt_creator/qt_creator-4.8.1.recipe | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/dev-qt/qt_creator/qt_creator-4.8.1.recipe b/dev-qt/qt_creator/qt_creator-4.8.1.recipe
index 9c79109d0..f52d4325c 100644
--- a/dev-qt/qt_creator/qt_creator-4.8.1.recipe
+++ b/dev-qt/qt_creator/qt_creator-4.8.1.recipe
@@ -4,9 +4,9 @@ development environment (IDE) for application developers to create \
 applications for multiple desktop, embedded, and mobile device platforms, \
 such as Android and iOS."
 HOMEPAGE="https://www.qt.io/ide/"
-COPYRIGHT="2018 The Qt Company Ltd"
+COPYRIGHT="2019 The Qt Company Ltd"
 LICENSE="GNU GPL v3"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://download.qt.io/official_releases/qtcreator/4.8/$portVersion/qt-creator-opensource-src-$portVersion.tar.xz"
 CHECKSUM_SHA256="8f691de9b30b99dd44e010525ba9bf3054142a1082dc5273c46c533b91c07bd9"
 SOURCE_DIR="qt-creator-opensource-src-$portVersion"
@@ -22,8 +22,10 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
-	lib:libclang$secondaryArchSuffix
+	cmd:qdoc$secondaryArchSuffix >= 5
+	cmd:qmake$secondaryArchSuffix >= 5
 	lib:libGL$secondaryArchSuffix
+	lib:libLLVM_5.0$secondaryArchSuffix
 	lib:libQt5Concurrent$secondaryArchSuffix
 	lib:libQt5Core$secondaryArchSuffix
 	lib:libQt5Designer$secondaryArchSuffix
@@ -44,8 +46,9 @@ REQUIRES="
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:libclang$secondaryArchSuffix >= 7
+	devel:libclang$secondaryArchSuffix >= 5
 	devel:libGL$secondaryArchSuffix
+	devel:libLLVM_5.0$secondaryArchSuffix
 	devel:libQt5Concurrent$secondaryArchSuffix
 	devel:libQt5Core$secondaryArchSuffix
 	devel:libQt5Designer$secondaryArchSuffix
@@ -65,9 +68,9 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	cmd:g++$secondaryArchSuffix
-	cmd:llvm_config >= 7
 	cmd:lrelease$secondaryArchSuffix >= 5
 	cmd:make	
+	cmd:qdoc$secondaryArchSuffix >= 5
 	cmd:qmake$secondaryArchSuffix >= 5
 	cmd:python2
 	cmd:which
@@ -82,11 +85,12 @@ BUILD()
 INSTALL()
 {
 	make install INSTALL_ROOT=$appsDir/QtCreator
-#	rm -rf $appsDir/QtCreator/share
 
 	# Qt port doesn't support createPlatformOpenGLContext yet
 	rm -rf $appsDir/QtCreator/lib/qtcreator/plugins/libQmlDesigner.so
 	rm -rf $appsDir/QtCreator/lib/qtcreator/plugins/libQmlProfiler.so
+	# Create symlink to libclang 5.0 from Qt's build
+	ln -s /system/apps/Qt5/lib/libclang* $appsDir/QtCreator/lib/qtcreator/
 
 	local APP_SIGNATURE="application/x-vnd.qt5-qtcreator"
 	local MAJOR="`echo "$portVersion" | cut -d. -f1`"
@@ -104,7 +108,6 @@ INSTALL()
 	addResourcesToBinaries qt_creator.rdef $appsDir/QtCreator/bin/qtcreator
 
 	mv $appsDir/QtCreator/bin/qtcreator "$appsDir/QtCreator/bin/Qt Creator"
-#	ln -s "$appsDir/QtCreator/bin/Qt Creator" $appsDir/QtCreator/
 
 	mkdir -p $dataDir/deskbar/menu/Applications/Qt
 	addAppDeskbarSymlink "$appsDir/QtCreator/bin/Qt Creator" "Qt/Qt Creator"