From 4c7bd64884bf0ccfcbb01093ae0de23180d07de6 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sat, 9 Mar 2019 13:22:37 +1000
Subject: [PATCH] Qt5: Switch back to using the libclang version 5.0. * (Build
 with clang 7.0 completely broken. The documentation does not build
 cross-references.) * fix BUILD_REQUIRES for devel:libpng to devel:libpng16

---
 dev-qt/qt5/qt5-5.12.1.recipe | 56 +++++++++++++++++++++++++-----------
 1 file changed, 39 insertions(+), 17 deletions(-)

diff --git a/dev-qt/qt5/qt5-5.12.1.recipe b/dev-qt/qt5/qt5-5.12.1.recipe
index f7ea25559..60daaa6d1 100644
--- a/dev-qt/qt5/qt5-5.12.1.recipe
+++ b/dev-qt/qt5/qt5-5.12.1.recipe
@@ -7,7 +7,7 @@ HOMEPAGE="https://qt.io/"
 COPYRIGHT="2015-2019 The Qt Company Ltd."
 LICENSE="GNU LGPL v2.1
 	GNU LGPL v3"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://download.qt.io/official_releases/qt/5.12/${portVersion/\~/-}/single/qt-everywhere-src-${portVersion/\~/-}.tar.xz"
 CHECKSUM_SHA256="caffbd625c7bc10ff8c5c7a27dbc7d84fa4de146975c0e1ffe904b514ccd6da4"
 SOURCE_DIR="qt-everywhere-src-${portVersion/\~/-}"
@@ -322,6 +322,10 @@ REQUIRES_examples="
 
 PROVIDES_tools="
 	qt5${secondaryArchSuffix}_tools = $portVersion compat >= 5
+	app:Assistant$secondaryArchSuffix = $portVersion compat >= 5
+	app:Designer$secondaryArchSuffix = $portVersion compat >= 5
+	app:Linguist$secondaryArchSuffix = $portVersion compat >= 5
+	app:QDBusViewer$secondaryArchSuffix = $portVersion compat >= 5
 	cmd:assistant$secondaryArchSuffix = $portVersion compat >= 5
 	cmd:designer$secondaryArchSuffix = $portVersion compat >= 5
 	cmd:lconvert$secondaryArchSuffix = $portVersion compat >= 5
@@ -345,13 +349,15 @@ PROVIDES_tools="
 REQUIRES_tools="
 	qt5$secondaryArchSuffix == $portVersion base
 	haiku$secondaryArchSuffix
-	lib:libclang$secondaryArchSuffix
 	lib:libgl$secondaryArchSuffix
+	lib:libLLVM_5.0$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:libclang$secondaryArchSuffix >= 7
+	devel:libclang$secondaryArchSuffix >= 5
+	devel:libclanganalysis$secondaryArchSuffix >= 5
+	devel:libLLVM_5.0$secondaryArchSuffix
 	devel:libcrypto$secondaryArchSuffix >= 1.0.0
 	devel:libdouble_conversion$secondaryArchSuffix	
 	devel:libegl$secondaryArchSuffix
@@ -373,7 +379,7 @@ BUILD_REQUIRES="
 	devel:libjpeg$secondaryArchSuffix
 	devel:liborc_0.4$secondaryArchSuffix
 	devel:libpcre2_16$secondaryArchSuffix
-	devel:libpng$secondaryArchSuffix
+	devel:libpng16$secondaryArchSuffix
 	devel:libsqlite3$secondaryArchSuffix
 	devel:libssl$secondaryArchSuffix >= 1.0.0
 	devel:libtiff$secondaryArchSuffix
@@ -391,7 +397,6 @@ BUILD_PREREQUIRES="
 	cmd:gperf
 	cmd:grep
 	cmd:ld$secondaryArchSuffix
-	cmd:llvm_config >= 7
 	cmd:ninja
 	cmd:make
 	cmd:orcc$secondaryArchSuffix
@@ -406,6 +411,8 @@ BUILD_PREREQUIRES="
 
 BUILD()
 {
+	export LLVM_INSTALL_DIR="$(llvm-config --prefix)"
+
 	CPPFLAGS=-D_BSD_SOURCE ./configure \
 		-prefix $prefix \
 		-bindir $binDir \
@@ -434,13 +441,15 @@ BUILD()
 
 INSTALL()
 {
+	export QT_INSTALL_HEADERS=$includeDir
+	export LLVM_INSTALL_DIR="$(llvm-config --prefix)"
+
 	make install
 
 	# build and install docs
 	PATH=$PATH:$binDir
 	LIBRARY_PATH=$LIBRARY_PATH:$libDir
-	export QT_INSTALL_HEADERS=$includeDir
-	make $jobArgs docs
+	make docs
 	make install_docs
 
 	# copy all examples
@@ -498,6 +507,21 @@ INSTALL()
 		devPackageCommands="$devPackageCommands $binDir/$i"
 	done
 
+	# move tools to apps folder
+	mkdir -p $appsDir/Qt5/lib
+	mv $binDir/assistant $appsDir/Qt5/Assistant
+	ln -s $appsDir/Qt5/Assistant $binDir/assistant
+	mv $binDir/qdbusviewer $appsDir/Qt5/QDBusViewer
+	ln -s $appsDir/Qt5/QDBusViewer $binDir/qdbusviewer
+	mv $binDir/designer $appsDir/Qt5/Designer
+	ln -s $appsDir/Qt5/Designer $binDir/designer
+	mv $binDir/linguist $appsDir/Qt5/Linguist
+	ln -s $appsDir/Qt5/Linguist $binDir/linguist
+	mv $binDir/qdoc $appsDir/Qt5/qdoc
+	ln -s $appsDir/Qt5/qdoc $binDir/qdoc
+	cp -f /system/$relativeLibDir/libclang* $appsDir/Qt5/lib
+	strip $appsDir/Qt5/lib/*
+
 	toolsCommands="assistant designer lconvert linguist lrelease lupdate pixeltool
 		qcollectiongenerator qdistancefieldgenerator qdbus qdbuscpp2xml qdbusviewer qdbusxml2cpp
 		qdoc qhelpgenerator qtattributionsscanner qtdiag qtpaths qtplugininfo"
@@ -506,12 +530,15 @@ INSTALL()
 		toolsPackageCommands="$toolsPackageCommands $binDir/$i"
 	done
 
+	DIR_QT_DEVELOP_DESKBAR="${dataDir}/deskbar/menu/Applications/Qt"
+	mkdir -p ${DIR_QT_DEVELOP_DESKBAR}
+
 	local MAJOR="`echo "$portVersion" | cut -d. -f1`"
 	local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
 	local MINOR="`echo "$portVersion" | cut -d. -f3`"
 	local VARIETY="B_APPV_DEVELOPMENT"
 
-	iconFiles="assistant designer linguist qdbusviewer"
+	iconFiles="Assistant Designer Linguist QDBusViewer"
 	for j in $iconFiles; do
 		sed \
 			-e "s|@MAJOR@|$MAJOR|" \
@@ -520,17 +547,11 @@ INSTALL()
 			-e "s|@VARIETY@|$VARIETY|" \
 			$portDir/additional-files/$j.rdef.in > $sourceDir/$j.rdef
 
-		addResourcesToBinaries $sourceDir/$j.rdef "$binDir/$j"
-		mimeset -f "$binDir/$j"
+		addResourcesToBinaries $sourceDir/$j.rdef "$appsDir/Qt5/$j"
+		addAppDeskbarSymlink "$appsDir/Qt5/$j" "Qt/$j"
+		mimeset -f "$appsDir/Qt5/$j"
 	done
 
-	DIR_QT_DEVELOP_DESKBAR="${dataDir}/deskbar/menu/Applications/Qt"
-	mkdir -p ${DIR_QT_DEVELOP_DESKBAR}
-	addAppDeskbarSymlink $binDir/assistant "Qt/Assistant"
-	addAppDeskbarSymlink $binDir/designer "Qt/Designer"
-	addAppDeskbarSymlink $binDir/linguist "Qt/Linguist"
-	addAppDeskbarSymlink $binDir/qdbusviewer "Qt/Qt D-Bus Viewer"
-
 	packageEntries docs \
 		$docDir/Qt5
 
@@ -544,6 +565,7 @@ INSTALL()
 		$dataDir/Qt5/mkspecs
 
 	packageEntries tools \
+		$appsDir \
 		$toolsPackageCommands \
 		${DIR_QT_DEVELOP_DESKBAR}
 }