diff options
| author | Emmanuele Bassi <ebassi@gnome.org> | 2020-04-14 17:42:12 +0100 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gnome.org> | 2020-06-08 17:07:01 +0100 |
| commit | 5bd63ea4ebb2bb8d9fd0fd03211b33ecc573764c (patch) | |
| tree | 8385c285e3def19a614755e4bea324c9dcb2fe34 | |
| parent | 9bdd02dbc6d6725a71baa68c13968ba0d3d6d264 (diff) | |
| download | pango-5bd63ea4ebb2bb8d9fd0fd03211b33ecc573764c.tar.gz | |
build: Generate the correct introspection symbols
The prefix for the Pango sub-libraries is still Pango, so we need to
ensure that the symbols and identifiers are correctly matched.
This partially reverts !175, as Pango does not have separate pkg-config
files for pango-ot and pango-fc.
| -rw-r--r-- | pango/meson.build | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/pango/meson.build b/pango/meson.build index b2496373..808a8509 100644 --- a/pango/meson.build +++ b/pango/meson.build @@ -240,9 +240,9 @@ if build_pangoft2 dependencies: [ libpango_dep, pango_gir_dep ], namespace: 'PangoFc', nsversion: pango_api_version, - identifier_prefix: 'PangoFc', - symbol_prefix: 'pango_fc', - export_packages: 'pangofc', + identifier_prefix: 'Pango', + symbol_prefix: 'pango', + export_packages: 'pangoft2', includes: [ pango_gir[0], 'fontconfig-2.0', ], header: 'pango/pangofc-fontmap.h', install: true, @@ -258,9 +258,9 @@ if build_pangoft2 dependencies: [ libpango_dep, pango_gir_dep, pangofc_gir_dep ], namespace: 'PangoOT', nsversion: pango_api_version, - identifier_prefix: 'PangoOT', - symbol_prefix: 'pango_ot', - export_packages: 'pangoot', + identifier_prefix: 'Pango', + symbol_prefix: 'pango', + export_packages: 'pangoft2', includes: [ pangofc_gir[0], 'freetype2-2.0', ], header: 'pango/pango-ot.h', install: true, @@ -275,8 +275,8 @@ if build_pangoft2 dependencies: [ libpango_dep, pango_gir_dep, pangofc_gir_dep, pangoot_gir_dep ], namespace: 'PangoFT2', nsversion: pango_api_version, - identifier_prefix: 'PangoFT2', - symbol_prefix: 'pango_ft2', + identifier_prefix: 'Pango', + symbol_prefix: 'pango', export_packages: 'pangoft2', includes: [ pangofc_gir[0], 'freetype2-2.0', ], header: 'pango/pangoft2.h', @@ -349,8 +349,8 @@ if xft_dep.found() and fontconfig_dep.found() dependencies: [ libpango_dep, libpangoft2_dep, pango_gir_dep, pangoot_gir_dep, pangoft2_gir_dep ], namespace: 'PangoXft', nsversion: pango_api_version, - identifier_prefix: 'PangoXft', - symbol_prefix: 'pango_xft', + identifier_prefix: 'Pango', + symbol_prefix: 'pango', export_packages: 'pangoxft', includes: [ pango_gir[0], pangoot_gir[0], pangoft2_gir[0], 'GObject-2.0', 'xft-2.0', 'xlib-2.0' ], header: 'pango/pangoxft.h', @@ -518,8 +518,8 @@ if cairo_dep.found() dependencies: [ pangocairo_deps, pango_gir_dep ], namespace: 'PangoCairo', nsversion: pango_api_version, - identifier_prefix: 'PangoCairo', - symbol_prefix: 'pango_cairo', + identifier_prefix: 'Pango', + symbol_prefix: 'pango', export_packages: 'pangocairo', includes: [ pango_gir[0], 'GObject-2.0', 'cairo-1.0' ], header: 'pango/pangocairo.h', |