From be8941dc47404534a561ea32fc968df6c44d341c Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Thu, 30 Apr 2015 12:31:56 -0400
Subject: Bug 328141 - Use Requires.private in pkg-config files when
 appropriate

Clean up our shi^W"stuff".  Please confirm I didn't break everything.
---
 pango-uninstalled.pc.in      | 3 ++-
 pangocairo-uninstalled.pc.in | 3 ++-
 pangoft2-uninstalled.pc.in   | 3 ++-
 pangowin32-uninstalled.pc.in | 3 ++-
 pangowin32.pc.in             | 3 ++-
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/pango-uninstalled.pc.in b/pango-uninstalled.pc.in
index 20ad9de8..9fcf0344 100644
--- a/pango-uninstalled.pc.in
+++ b/pango-uninstalled.pc.in
@@ -2,5 +2,6 @@ Name: Pango Uninstalled
 Description: Internationalized text handling, Not Installed
 Version: @VERSION@
 Requires: glib-2.0 gobject-2.0
-Libs: ${pc_top_builddir}/${pcfiledir}/pango/libpango-@PANGO_API_VERSION@.la @PKGCONFIG_MATH_LIBS@
+Libs: ${pc_top_builddir}/${pcfiledir}/pango/libpango-@PANGO_API_VERSION@.la
+Libs.private: -lm
 Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@
diff --git a/pangocairo-uninstalled.pc.in b/pangocairo-uninstalled.pc.in
index fa0700a2..33cf9047 100644
--- a/pangocairo-uninstalled.pc.in
+++ b/pangocairo-uninstalled.pc.in
@@ -1,6 +1,7 @@
 Name: Pango Cairo Uninstalled
 Description: Cairo rendering support for Pango, Not Installed
 Version: @VERSION@
-Requires: pango cairo @PKGCONFIG_CAIRO_REQUIRES@
+Requires: pango cairo
+Require.private: @PKGCONFIG_CAIRO_REQUIRES@
 Libs: ${pc_top_builddir}/${pcfiledir}/pango/libpangocairo-@PANGO_API_VERSION@.la
 Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@
diff --git a/pangoft2-uninstalled.pc.in b/pangoft2-uninstalled.pc.in
index 7a894aca..e75315ca 100644
--- a/pangoft2-uninstalled.pc.in
+++ b/pangoft2-uninstalled.pc.in
@@ -1,7 +1,8 @@
 Name: Pango FT2 Uninstalled
 Description: Freetype 2.0 font support for Pango, Not Installed
 Version: @VERSION@
-Requires: pango freetype2
+Requires: pango freetype2 fontconfig
+Requires.private: harfbuzz
 Libs: ${pc_top_builddir}/${pcfiledir}/pango/libpangoft2-@PANGO_API_VERSION@.la
 Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@
 
diff --git a/pangowin32-uninstalled.pc.in b/pangowin32-uninstalled.pc.in
index 5541c4e4..9ceb2b94 100644
--- a/pangowin32-uninstalled.pc.in
+++ b/pangowin32-uninstalled.pc.in
@@ -2,5 +2,6 @@ Name: Pango Win32 Uninstalled
 Description: Win32 GDI font support for Pango, Not Installed
 Version: @VERSION@
 Requires: pango
-Libs: ${pc_top_builddir}/${pcfiledir}/pango/libpangowin32.la @WIN32_LIBS@
+Libs: ${pc_top_builddir}/${pcfiledir}/pango/libpangowin32.la
+Libs.private: -lgdi32 -lusp10
 Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@
diff --git a/pangowin32.pc.in b/pangowin32.pc.in
index 250d935b..4c9b879f 100644
--- a/pangowin32.pc.in
+++ b/pangowin32.pc.in
@@ -7,5 +7,6 @@ Name: Pango Win32
 Description: Win32 GDI font support for Pango
 Version: @VERSION@
 Requires: pango
-Libs: -L${libdir} -lpangowin32-@PANGO_API_VERSION@ @WIN32_LIBS@
+Libs: -L${libdir} -lpangowin32-@PANGO_API_VERSION@
+Libs.private: -lgdi32 -lusp10
 Cflags: -I${includedir}/pango-1.0
-- 
cgit v1.2.1