diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2020-02-25 21:37:19 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2020-02-25 21:37:19 +0000 |
| commit | cb599846ca8b0a7a70107932cc3b1c8abda606bd (patch) | |
| tree | f930e91df36f11e154e579d1635012b99135311b | |
| parent | 561351fd905b6f6f29093084efc1bb0145c567d7 (diff) | |
| parent | 92a5cf0de036532b8d82150dfb3c4e00c4c97252 (diff) | |
| download | pango-cb599846ca8b0a7a70107932cc3b1c8abda606bd.tar.gz | |
Merge branch 'ricotz/456' into 'master'
Use correct c:include and distinct package in PangoFc-1.0 and PangoOT-1.0
Closes #456
See merge request GNOME/pango!175
| -rw-r--r-- | pango/meson.build | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pango/meson.build b/pango/meson.build index 99a9e4a6..738bd36c 100644 --- a/pango/meson.build +++ b/pango/meson.build @@ -237,9 +237,9 @@ if build_pangoft2 nsversion: pango_api_version, identifier_prefix: 'PangoFc', symbol_prefix: 'pango_fc', - export_packages: 'pangoft2', + export_packages: 'pangofc', includes: [ pango_gir[0], 'fontconfig-2.0', ], - header: 'pango/pangoft2.h', + header: 'pango/pangofc-fontmap.h', install: true, extra_args: gir_args, ) @@ -255,9 +255,9 @@ if build_pangoft2 nsversion: pango_api_version, identifier_prefix: 'PangoOT', symbol_prefix: 'pango_ot', - export_packages: 'pangoft2', + export_packages: 'pangoot', includes: [ pangofc_gir[0], 'freetype2-2.0', ], - header: 'pango/pangoft2.h', + header: 'pango/pango-ot.h', install: true, extra_args: gir_args, ) |