From ca9511ea470aed6e6670b7ce431abc91b4ee7e4d Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Fri, 12 Jul 2019 22:25:21 -0400
Subject: Revert "Move pangofc to libpango"

This reverts commit 8b85815f1b122842d915e7fc29cc68d228a64dbb.
---
 pango/meson.build | 30 ++++++++----------------------
 1 file changed, 8 insertions(+), 22 deletions(-)

diff --git a/pango/meson.build b/pango/meson.build
index faf38780..bcb5ad72 100644
--- a/pango/meson.build
+++ b/pango/meson.build
@@ -56,27 +56,6 @@ 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
@@ -176,7 +155,7 @@ pkgconfig.generate(libpango,
   name: 'Pango',
   description: 'Internationalized text handling',
   version: meson.project_version(),
-  requires: pango_requires,
+  requires: ['gobject-2.0'],
   filebase: 'pango',
   subdirs: pango_api_name,
   install_dir: join_paths(pango_libdir, 'pkgconfig'),
@@ -186,10 +165,17 @@ 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',
   ]
 
-- 
cgit v1.2.1