From fe77860961ca9c2bda07f4357405971183b09a9f Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Wed, 18 Dec 2013 10:02:42 +0100
Subject: [PATCH] Fix haikuwebkit recipe not finding sqlite and ICU

... on gcc2hybrid only.
---
 haiku-libs/haikuwebkit/haikuwebkit-1.2.1.recipe | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.2.1.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.2.1.recipe
index 18d25876d..dad4f7182 100644
--- a/haiku-libs/haikuwebkit/haikuwebkit-1.2.1.recipe
+++ b/haiku-libs/haikuwebkit/haikuwebkit-1.2.1.recipe
@@ -24,7 +24,7 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix >= $haikuVersion
-	icu$secondaryArchSuffix
+	lib:libicuuc$secondaryArchSuffix
 	lib:libjpeg$secondaryArchSuffix
 	lib:libpng$secondaryArchSuffix
 	lib:libsqlite3$secondaryArchSuffix
@@ -36,7 +36,7 @@ REQUIRES="
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	haiku_devel >= $haikuVersion
-	icu${secondaryArchSuffix}_devel
+	devel:libicuuc$secondaryArchSuffix
 	devel:libjpeg$secondaryArchSuffix
 	devel:libpng$secondaryArchSuffix
 	devel:libsqlite3$secondaryArchSuffix
@@ -63,8 +63,9 @@ SOURCE_DIR="haikuwebkit_x86-$portVersion-Source"
 
 BUILD()
 {
+	export PKG_CONFIG_LIBDIR="`finddir B_SYSTEM_DIRECTORY`/$relativeDevelopLibDir/pkgconfig"
 	Tools/Scripts/build-webkit --haiku --no-webkit2 \
-		--cmakearg="-DCMAKE_LIBRARY_PATH=`finddir B_SYSTEM_DEVELOP_DIRECTORY`/lib -DCMAKE_INSTALL_PREFIX=$prefix"
+		--cmakearg="-DCMAKE_LIBRARY_PATH=`finddir B_SYSTEM_DIRECTORY`/$relativeDevelopLibDir -DCMAKE_INCLUDE_PATH=`finddir B_SYSTEM_DIRECTORY`/$relativeIncludeDir -DCMAKE_INSTALL_PREFIX=$prefix"
 }
 
 INSTALL()