[pango/move-fc: 3/3] Move pangofc to libpango



commit 8b85815f1b122842d915e7fc29cc68d228a64dbb
Author: Matthias Clasen <mclasen redhat com>
Date:   Tue Jul 9 21:22:41 2019 -0400

    Move pangofc to libpango
    
    Move the fontconfig+harfbuzz using parts to libpango,
    since we want to start using harfbuzz on all platforms.

 pango/meson.build | 30 ++++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 8 deletions(-)
---
diff --git a/pango/meson.build b/pango/meson.build
index bcb5ad72..faf38780 100644
--- a/pango/meson.build
+++ b/pango/meson.build
@@ -56,6 +56,27 @@ pango_headers = [
   'pango-version-macros.h',
 ]
 
+pango_requires = [
+  'gobject-2.0',
+]
+
+if fontconfig_dep.found()
+  pango_headers += [
+    'pangofc-font.h',
+    'pangofc-fontmap.h',
+    'pangofc-decoder.h',
+  ]
+  pango_sources += [
+    'pangofc-font.c',
+    'pangofc-fontmap.c',
+    'pangofc-decoder.c',
+    'pangofc-shape.c',
+  ]
+  pango_requires += [
+    fontconfig_pc,
+  ]
+endif
+
 install_headers(pango_headers, subdir: pango_api_path)
 
 # Features header
@@ -155,7 +176,7 @@ pkgconfig.generate(libpango,
   name: 'Pango',
   description: 'Internationalized text handling',
   version: meson.project_version(),
-  requires: ['gobject-2.0'],
+  requires: pango_requires,
   filebase: 'pango',
   subdirs: pango_api_name,
   install_dir: join_paths(pango_libdir, 'pkgconfig'),
@@ -165,17 +186,10 @@ pkgconfig.generate(libpango,
 if build_pangoft2
   pangoft2_headers = [
     'pango-ot.h',
-    'pangofc-font.h',
-    'pangofc-fontmap.h',
-    'pangofc-decoder.h',
     'pangoft2.h',
   ]
 
   pangoft2_public_sources = [
-    'pangofc-font.c',
-    'pangofc-fontmap.c',
-    'pangofc-decoder.c',
-    'pangofc-shape.c',
     'pangoft2.c',
   ]
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]