diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2020-06-10 15:41:03 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2020-06-10 15:41:03 +0000 |
| commit | c73c2d5d0258b0fc6f8408e6c8fce09cd273d20e (patch) | |
| tree | 55dc32fbb25ac3167d9d2bda7ff0c7d53ae58257 | |
| parent | 6529d5584f7690305a30cd87c8ecc08bea76aaf7 (diff) | |
| parent | 9f37824abe59ce6725c58c65e7a588ef0861d268 (diff) | |
| download | pango-c73c2d5d0258b0fc6f8408e6c8fce09cd273d20e.tar.gz | |
Merge branch 'ebassi/gir-identifiers' into 'master'
Use the correct identifier for Pango sub-libraries
See merge request GNOME/pango!197
| -rw-r--r-- | pango/meson.build | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pango/meson.build b/pango/meson.build index ad7fb798..015175c3 100644 --- a/pango/meson.build +++ b/pango/meson.build @@ -238,7 +238,7 @@ if build_pangoft2 dependencies: [ libpango_dep, pango_gir_dep ], namespace: 'PangoFc', nsversion: pango_api_version, - identifier_prefix: 'Pango', + identifier_prefix: 'PangoFc', symbol_prefix: 'pango', export_packages: 'pangofc', includes: [ pango_gir[0], 'fontconfig-2.0', ], @@ -256,7 +256,7 @@ if build_pangoft2 dependencies: [ libpango_dep, pango_gir_dep, pangofc_gir_dep ], namespace: 'PangoOT', nsversion: pango_api_version, - identifier_prefix: 'Pango', + identifier_prefix: 'PangoOT', symbol_prefix: 'pango', export_packages: 'pangoot', includes: [ pangofc_gir[0], 'freetype2-2.0', ], @@ -273,7 +273,7 @@ if build_pangoft2 dependencies: [ libpango_dep, pango_gir_dep, pangofc_gir_dep, pangoot_gir_dep ], namespace: 'PangoFT2', nsversion: pango_api_version, - identifier_prefix: 'Pango', + identifier_prefix: 'PangoFT2', symbol_prefix: 'pango', export_packages: 'pangoft2', includes: [ pangofc_gir[0], 'freetype2-2.0', ], @@ -363,7 +363,7 @@ 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: 'Pango', + identifier_prefix: 'PangoXft', 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' ], @@ -528,7 +528,7 @@ if cairo_dep.found() dependencies: [ pangocairo_deps, pango_gir_dep ], namespace: 'PangoCairo', nsversion: pango_api_version, - identifier_prefix: 'Pango', + identifier_prefix: 'PangoCairo', symbol_prefix: 'pango', export_packages: 'pangocairo', includes: [ pango_gir[0], 'GObject-2.0', 'cairo-1.0' ], |