[pango/revert-c73c2d5d] Revert "Merge branch 'ebassi/gir-identifiers' into 'master'"



commit 31a05027fc4e7cd67170c690a8e68ae8680dcb24
Author: Matthias Clasen <mclasen redhat com>
Date:   Wed Jun 10 15:41:29 2020 +0000

    Revert "Merge branch 'ebassi/gir-identifiers' into 'master'"
    
    This reverts merge request !197

 pango/meson.build | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/pango/meson.build b/pango/meson.build
index 015175c3..ad7fb798 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: 'PangoFc',
+      identifier_prefix: 'Pango',
       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: 'PangoOT',
+      identifier_prefix: 'Pango',
       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: 'PangoFT2',
+      identifier_prefix: 'Pango',
       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: 'PangoXft',
+      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' ],
@@ -528,7 +528,7 @@ if cairo_dep.found()
       dependencies: [ pangocairo_deps, pango_gir_dep ],
       namespace: 'PangoCairo',
       nsversion: pango_api_version,
-      identifier_prefix: 'PangoCairo',
+      identifier_prefix: 'Pango',
       symbol_prefix: 'pango',
       export_packages: 'pangocairo',
       includes: [ pango_gir[0], 'GObject-2.0', 'cairo-1.0' ],


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]