[pango/move-fc: 6/7] Reduce overlinking

[Matthias Clasen <matthiasc src gnome org>]

commit 5ae9678ef1664610fc6c83b075c401882629d62d
Author: Matthias Clasen <mclasen redhat com>
Date:   Tue Jul 9 21:51:07 2019 -0400

    Reduce overlinking
    
    Only link libpangoxft and libpangocairo
    against xft and cairo.

 meson.build       | 8 +++++---
 pango/meson.build | 8 +++-----
 2 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/meson.build b/meson.build
index 73b5da2b..d1150907 100644
--- a/meson.build
+++ b/meson.build
@@ -183,6 +183,8 @@ endif
 
 # Dependencies
 pango_deps = []
+pangoxft_deps = []
+pangocairo_deps = []
 
 glib_req_version = '>= 2.59.2'
 fribidi_req_version = '>= 0.19.7'
@@ -314,8 +316,8 @@ endif
 xft_dep = dependency('xft', version: xft_req_version, required: false)
 if xft_dep.found() and fontconfig_dep.found() and freetype_dep.found()
   pango_conf.set('HAVE_XFT', 1)
-  pango_deps += dependency('xrender', required: false)
-  pango_deps += xft_dep
+  pangoxft_deps += dependency('xrender', required: false)
+  pangoxft_deps += xft_dep
 endif
 
 if host_system == 'darwin'
@@ -488,7 +490,7 @@ endif
 
 if cairo_dep.found()
   pango_conf.set('HAVE_CAIRO', 1)
-  pango_deps += cairo_dep
+  pangocairo_deps += cairo_dep
 
   pangocairo_requires = ''
 
diff --git a/pango/meson.build b/pango/meson.build
index 4ca062ec..bcb5ad72 100644
--- a/pango/meson.build
+++ b/pango/meson.build
@@ -282,7 +282,7 @@ if xft_dep.found() and fontconfig_dep.found()
     soversion: pango_soversion,
     darwin_versions : pango_osxversion,
     install: true,
-    dependencies: pango_deps + [ libpango_dep, libpangoft2_dep ],
+    dependencies: pango_deps + pangoxft_deps + [ libpango_dep, libpangoft2_dep ],
     include_directories: [ root_inc, pango_inc ],
     c_args: common_cflags + pango_debug_cflags + pango_cflags + [
       '-DPANGO_DISABLE_DEPRECATION_WARNINGS',
@@ -408,15 +408,13 @@ if cairo_dep.found()
     'pangocairo-render.c',
   ]
 
-  pangocairo_deps = pango_deps + [ libpango_dep ]
+  pangocairo_deps += libpango_dep
 
   if pango_font_backends.contains('freetype')
     pangocairo_sources += [
       'pangocairo-fcfont.c',
       'pangocairo-fcfontmap.c',
     ]
-
-    pangocairo_deps += libpangoft2_dep
   endif
 
   if host_system == 'windows' and pango_font_backends.contains('win32')
@@ -486,7 +484,7 @@ if cairo_dep.found()
   libpangocairo_dep = declare_dependency(
     link_with: libpangocairo,
     include_directories: root_inc,
-    dependencies: pango_deps + [ libpango_dep ],
+    dependencies: pangocairo_deps + pango_deps + [ libpango_dep ],
     sources: pangocairo_dep_sources,
   )