From d78f3729ff5a379f23dae3b5279603021152893b Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 4 Oct 2014 11:34:17 +0000
Subject: [PATCH] glib2: fix pkgconfig files, add devel dependencies.

---
 dev-libs/glib/glib2-2.38.1.recipe | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/dev-libs/glib/glib2-2.38.1.recipe b/dev-libs/glib/glib2-2.38.1.recipe
index 562a94c47..a24266264 100644
--- a/dev-libs/glib/glib2-2.38.1.recipe
+++ b/dev-libs/glib/glib2-2.38.1.recipe
@@ -24,7 +24,7 @@ COPYRIGHT="1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
 	2008-2010 Collabora Ltd.
 	1995-2010 Several others"
 
-REVISION="3"
+REVISION="4"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
@@ -107,7 +107,20 @@ INSTALL()
 					libgmodule-2.0 \
 					libgobject-2.0 \
 					libgthread-2.0
-
+	fixPkgconfig
+	
+	# The libtool files reference other libraries using the wrong paths, which
+	# creates a lot of confusion. Fix them so correct paths are used.
+	local develPackageName="${portName}_devel-$portFullVersion"
+	local packageLinksDir=$(dirname $portPackageLinksDir)
+	local ffiLinksDir="$packageLinksDir/${develPackageName}/devel~libffi$secondaryArchSuffix/$relativeDevelopLibDir"
+	sed -i -e "s,^\(Libs.private.*\)-L.* \(-l.*\)$,\1-L$ffiLinksDir \2," \
+		$developLibDir/pkgconfig/gobject-2.0.pc
+	local zlibLinksDir="$packageLinksDir/${develPackageName}/devel~libz$secondaryArchSuffix/$relativeDevelopLibDir"
+	sed -i -e "s,^\(Libs.private.*\)-L.* \(-l.*\)$,\1-L$zlibLinksDir \2," \
+		$developLibDir/pkgconfig/gio-2.0.pc
+	
+	
 	# move the glibconfig header into devel as well
 	mv $libDir/glib-2.0 $developLibDir
 
@@ -131,4 +144,8 @@ PROVIDES_devel="
 
 REQUIRES_devel="
 	glib2$secondaryArchSuffix == $portVersion base
+	devel:libffi$secondaryArchSuffix
+	devel:libiconv$secondaryArchSuffix
+	devel:libintl$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
 	"