[pango/pango2-cleanups: 13/15] Drop pangoot

[Matthias Clasen <matthiasc src gnome org>]

commit 4fc5b61564be9520a0c9c54e4a55487e7e06f87c
Author: Matthias Clasen <mclasen redhat com>
Date:   Mon Jan 10 13:54:33 2022 -0500

    Drop pangoot

 pango/meson.build        |  49 +-----
 pango/pango-ot-buffer.c  | 229 -------------------------
 pango/pango-ot-info.c    | 325 ------------------------------------
 pango/pango-ot-private.h |  89 ----------
 pango/pango-ot-ruleset.c | 407 --------------------------------------------
 pango/pango-ot-tag.c     | 135 ---------------
 pango/pango-ot.h         | 427 -----------------------------------------------
 tests/testmisc.c         |  29 ----
 8 files changed, 5 insertions(+), 1685 deletions(-)
---
diff --git a/pango/meson.build b/pango/meson.build
index d8ecb64e..69fce2d0 100644
--- a/pango/meson.build
+++ b/pango/meson.build
@@ -201,17 +201,6 @@ if build_pangoft2
     'pango-trace.c',
   ]
 
-  pangoot_headers = [
-    'pango-ot.h',
-  ]
-
-  pangoot_public_sources = [
-    'pango-ot-buffer.c',
-    'pango-ot-info.c',
-    'pango-ot-ruleset.c',
-    'pango-ot-tag.c',
-  ]
-
   pangoft2_headers = [
     'pangoft2.h',
   ]
@@ -222,7 +211,7 @@ if build_pangoft2
     'pangoft2.c',
   ]
 
-  pangoft2_sources = pangofc_public_sources + pangoot_public_sources + pangoft2_public_sources
+  pangoft2_sources = pangofc_public_sources + pangoft2_public_sources
 
   if host_system == 'windows'
     pangoft2_rc = configure_file(
@@ -234,7 +223,7 @@ if build_pangoft2
     pangoft2_sources += pangoft2_res
   endif
 
-  install_headers(pangoft2_headers + pangofc_headers + pangoot_headers, subdir: pango_api_path)
+  install_headers(pangoft2_headers + pangofc_headers, subdir: pango_api_path)
 
   libpangoft2 = library(
     'pangoft2-@0@'.format(pango_api_version),
@@ -271,28 +260,10 @@ if build_pangoft2
     pangofc_gir_dep = declare_dependency(sources: pangofc_gir)
     pangoft2_dep_sources += pangofc_gir
 
-    # Deprecated API, still needed for PangoXft
-    pangoot_gir = gnome.generate_gir(
-      libpangoft2,
-      sources: pangoot_headers + pangoot_public_sources,
-      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',
-      includes: [ pangofc_gir[0], 'freetype2-2.0', ],
-      header: 'pango/pango-ot.h',
-      install: true,
-      extra_args: gir_args,
-    )
-    pangoot_gir_dep = declare_dependency(sources: pangoot_gir)
-    pangoft2_dep_sources += pangoot_gir
-
     pangoft2_gir = gnome.generate_gir(
       libpangoft2,
       sources: pangoft2_headers + pangoft2_public_sources,
-      dependencies: [ libpango_dep, pango_gir_dep, pangofc_gir_dep, pangoot_gir_dep ],
+      dependencies: [ libpango_dep, pango_gir_dep, pangofc_gir_dep ],
       namespace: 'PangoFT2',
       nsversion: pango_api_version,
       identifier_prefix: 'PangoFT2',
@@ -323,16 +294,6 @@ if build_pangoft2
     requires: [ 'pango', freetype2_pc, fontconfig_pc ],
   )
 
-  # Since we split the introspection data, we also need a split pkg-config
-  # file for Vala
-  pkgconfig.generate(
-    name: 'Pango OT',
-    description: 'OpenType font support for Pango (deprecated)',
-    filebase: 'pangoot',
-    subdirs: pango_api_name,
-    requires: [ 'pangoft2' ],
-  )
-
   pkgconfig.generate(
     name: 'Pango FC',
     description: 'Fontconfig support for Pango',
@@ -383,13 +344,13 @@ if xft_dep.found() and fontconfig_dep.found()
     pangoxft_gir = gnome.generate_gir(
       libpangoxft,
       sources: pangoxft_headers + pangoxft_sources,
-      dependencies: [ libpango_dep, libpangoft2_dep, pango_gir_dep, pangoot_gir_dep, pangoft2_gir_dep ],
+      dependencies: [ libpango_dep, libpangoft2_dep, pango_gir_dep, pangoft2_gir_dep ],
       namespace: 'PangoXft',
       nsversion: pango_api_version,
       identifier_prefix: 'PangoXft',
       symbol_prefix: 'pango_xft',
       export_packages: 'pangoxft',
-      includes: [ pango_gir[0], pangoot_gir[0], pangoft2_gir[0], 'GObject-2.0', 'xft-2.0', 'xlib-2.0' ],
+      includes: [ pango_gir[0], pangoft2_gir[0], 'GObject-2.0', 'xft-2.0', 'xlib-2.0' ],
       header: 'pango/pangoxft.h',
       install: true,
       extra_args: gir_args,
diff --git a/tests/testmisc.c b/tests/testmisc.c
index 1aa90948..c1eadc58 100644
--- a/tests/testmisc.c
+++ b/tests/testmisc.c
@@ -23,10 +23,6 @@
 #include <glib.h>
 #include <pango/pangocairo.h>
 
-#ifdef HAVE_CAIRO_FREETYPE
-#include <pango/pango-ot.h>
-#endif
-
 /* test that we don't crash in shape_tab when the layout
  * is such that we don't have effective attributes
  */
@@ -388,28 +384,6 @@ test_gravity_for_script (void)
     }
 }
 
-#ifdef HAVE_CAIRO_FREETYPE
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-
-static void
-test_language_to_tag (void)
-{
-  PangoLanguage *lang;
-  PangoOTTag tag;
-  PangoLanguage *lang2;
-
-  lang = pango_language_from_string ("de");
-
-  tag = pango_ot_tag_from_language (lang);
-
-  lang2 = pango_ot_tag_to_language (tag);
-
-  g_assert_true (lang2 == lang);
-}
-
-G_GNUC_END_IGNORE_DEPRECATIONS
-#endif
-
 static void
 test_fallback_shape (void)
 {
@@ -841,9 +815,6 @@ main (int argc, char *argv[])
   g_test_add_func ("/gravity/from-matrix", test_gravity_from_matrix);
   g_test_add_func ("/gravity/for-script", test_gravity_for_script);
   g_test_add_func ("/layout/fallback-shape", test_fallback_shape);
-#ifdef HAVE_CAIRO_FREETYPE
-  g_test_add_func ("/language/to-tag", test_language_to_tag);
-#endif
   g_test_add_func ("/bidi/get-cursor-crash", test_get_cursor_crash);
   g_test_add_func ("/bidi/get-cursor", test_get_cursor);
   g_test_add_func ("/layout/index-to-x", test_index_to_x);