diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2019-07-09 19:53:26 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2019-07-09 20:01:58 -0400 |
| commit | 7a666d5b4a4611fac0d7a1c5ab831e20cd2ca504 (patch) | |
| tree | c78d0a6ef26cdd90ec03169e23c4b7300e674774 | |
| parent | ad5c0fe4cee2fe84e4dd98b3c0de19295b39aea4 (diff) | |
| download | pango-wip/one-library.tar.gz | |
Fix up pc fileswip/one-library
Move all of the requires to pango.pc, including harfbuzz.
| -rw-r--r-- | meson.build | 10 | ||||
| -rw-r--r-- | pango/meson.build | 12 |
2 files changed, 8 insertions, 14 deletions
diff --git a/meson.build b/meson.build index 73b5da2b..4262a651 100644 --- a/meson.build +++ b/meson.build @@ -489,16 +489,6 @@ endif if cairo_dep.found() pango_conf.set('HAVE_CAIRO', 1) pango_deps += cairo_dep - - pangocairo_requires = '' - - if pango_font_backends.contains('freetype') - pangocairo_requires += 'pangoft2 ' - endif - - if pango_font_backends.contains('win32') - pangocairo_requires += 'pangowin32 ' - endif endif gnome = import('gnome') diff --git a/pango/meson.build b/pango/meson.build index 7217a51d..4dcc13bd 100644 --- a/pango/meson.build +++ b/pango/meson.build @@ -28,6 +28,8 @@ pango_sources = [ 'shape.c', ] +pango_requires = ['gobject-2.0', harfbuzz_pc ] + pango_headers = [ 'pango.h', 'pango-attributes.h', @@ -104,6 +106,7 @@ if build_pangoft2 install_headers(pangoft2_headers, subdir: pango_api_path) pango_sources += pangoft2_sources + pango_requires += [ freetype2_pc, fontconfig_pc ] endif # cairo @@ -146,6 +149,7 @@ if cairo_dep.found() install_headers(pangocairo_headers, subdir: pango_api_path) pango_sources += pangocairo_sources + pango_requires += cairo_pc endif # Win32 @@ -255,7 +259,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'), @@ -312,7 +316,7 @@ if build_pangoft2 version: meson.project_version(), filebase: 'pangoft2', subdirs: pango_api_name, - requires: [ 'pango', freetype2_pc, fontconfig_pc ], + requires: 'pango', install_dir: join_paths(pango_libdir, 'pkgconfig'), ) else @@ -385,7 +389,7 @@ if xft_dep.found() and fontconfig_dep.found() version: meson.project_version(), filebase: 'pangoxft', subdirs: pango_api_name, - requires: [ 'pangoft2', 'xft' ], + requires: [ 'pango', 'xft' ], install_dir: join_paths(pango_libdir, 'pkgconfig'), ) else @@ -478,7 +482,7 @@ if cairo_dep.found() version: meson.project_version(), filebase: 'pangocairo', subdirs: pango_api_name, - requires: [ 'pango', cairo_pc ], + requires: 'pango', install_dir: join_paths(pango_libdir, 'pkgconfig'), ) else |