[pango/pango2: 34/201] Drop pangoft2

[Matthias Clasen <matthiasc src gnome org>]

commit 20634c6b1eeb76bf81bf29b63a1a0fa987bfc2a7
Author: Matthias Clasen <mclasen redhat com>
Date:   Sat Feb 12 09:22:21 2022 -0500

    Drop pangoft2

 examples/meson.build     |   4 -
 pango/meson.build        |  37 +--
 pango/pangoft2-fontmap.c | 233 ---------------
 pango/pangoft2-private.h | 106 -------
 pango/pangoft2-render.c  | 761 -----------------------------------------------
 pango/pangoft2.c         | 453 ----------------------------
 pango/pangoft2.h         | 108 -------
 pango/pangoft2.rc.in     |  30 --
 tests/cxx-test.cpp       |   8 -
 tests/meson.build        |   4 +-
 utils/meson.build        |   9 +-
 utils/pango-view.c       |   4 -
 utils/viewer-pangoft2.c  | 167 -----------
 13 files changed, 5 insertions(+), 1919 deletions(-)
---
diff --git a/examples/meson.build b/examples/meson.build
index deee70fd..3919823c 100644
--- a/examples/meson.build
+++ b/examples/meson.build
@@ -10,10 +10,6 @@ endif
 
 examples_deps = [ libpango_dep, libpangocairo_dep, ]
 
-if pango_font_backends.contains('freetype')
-  examples_deps += libpangoft2_dep
-endif
-
 # somebody will have to fix this
 # if host_system == 'windows'
 #   # This hasn't been built in years, most likely, but try now
diff --git a/pango/meson.build b/pango/meson.build
index d90f0976..2769b1d3 100644
--- a/pango/meson.build
+++ b/pango/meson.build
@@ -194,13 +194,9 @@ if build_pangoft2
   ]
 
   pangoft2_headers = [
-    'pangoft2.h',
   ]
 
   pangoft2_public_sources = [
-    'pangoft2-fontmap.c',
-    'pangoft2-render.c',
-    'pangoft2.c',
   ]
 
   pangoft2_sources = pangofc_public_sources + pangoft2_public_sources
@@ -251,23 +247,6 @@ if build_pangoft2
     )
     pangofc_gir_dep = declare_dependency(sources: pangofc_gir)
     pangoft2_dep_sources += pangofc_gir
-
-    pangoft2_gir = gnome.generate_gir(
-      libpangoft2,
-      sources: pangoft2_headers + pangoft2_public_sources,
-      dependencies: [ libpango_dep, pango_gir_dep, pangofc_gir_dep ],
-      namespace: 'PangoFT2',
-      nsversion: pango_api_version,
-      identifier_prefix: 'PangoFT2',
-      symbol_prefix: 'pango_ft2',
-      export_packages: 'pangoft2',
-      includes: [ pangofc_gir[0], 'freetype2-2.0', ],
-      header: 'pango/pangoft2.h',
-      install: true,
-      extra_args: gir_args,
-    )
-    pangoft2_gir_dep = declare_dependency(sources: pangoft2_gir)
-    pangoft2_dep_sources += pangoft2_gir
   endif
 
   libpangoft2_dep = declare_dependency(
@@ -278,14 +257,6 @@ if build_pangoft2
   )
   meson.override_dependency('pangoft2', libpangoft2_dep)
 
-  pkgconfig.generate(libpangoft2,
-    name: 'Pango FT2 and Pango Fc',
-    description: 'Freetype 2.0 and fontconfig font support for Pango',
-    filebase: 'pangoft2',
-    subdirs: pango_api_name,
-    requires: [ 'pango', freetype2_pc, fontconfig_pc ],
-  )
-
   pkgconfig.generate(
     name: 'Pango FC',
     description: 'Fontconfig support for Pango',
@@ -293,12 +264,6 @@ if build_pangoft2
     subdirs: pango_api_name,
     requires: [ 'pangoft2' ],
   )
-else
-  # For usage as a subproject
-  libpangoft2_dep = dependency('', required : false)
-  # Needed for making ft2 no-op while generating pangoxft_gir below
-  pangoft2_gir_dep = dependency('', required : false)
-  pangoft2_gir = [[]]
 endif
 
 # Win32
@@ -382,7 +347,7 @@ if cairo_dep.found()
       'pangocairo-fcfontmap.c',
     ]
 
-    pangocairo_deps += libpangoft2_dep
+    pangocairo_deps += [ libpangoft2_dep ]
   endif
 
   if host_system == 'windows' and pango_font_backends.contains('win32')
diff --git a/tests/cxx-test.cpp b/tests/cxx-test.cpp
index 3e4e476e..436d42cd 100644
--- a/tests/cxx-test.cpp
+++ b/tests/cxx-test.cpp
@@ -8,14 +8,6 @@
 #include <pango/pangowin32.h>
 #endif
 
-#ifdef HAVE_XFT
-#include <pango/pangoxft.h>
-#endif
-
-#ifdef HAVE_FREETYPE
-#include <pango/pangoft2.h>
-#endif
-
 #ifdef HAVE_CAIRO
 #include <pango/pangocairo.h>
 #endif
diff --git a/tests/meson.build b/tests/meson.build
index 3d0e0455..961abcea 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -48,8 +48,8 @@ if cairo_dep.found()
 
   if build_pangoft2
     tests += [
-      [ 'testmisc', [ 'testmisc.c' ], [ libpangocairo_dep, libpangoft2_dep, glib_dep, harfbuzz_dep ] ],
-      [ 'testserialize', [ 'testserialize.c' ], [ libpangocairo_dep, libpangoft2_dep ] ],
+      [ 'testmisc', [ 'testmisc.c' ], [ libpangocairo_dep, glib_dep, harfbuzz_dep ] ],
+      [ 'testserialize', [ 'testserialize.c' ], [ libpangocairo_dep, libpangoft2_dep ]  ],
     ]
 
     if host_system != 'darwin'
diff --git a/utils/meson.build b/utils/meson.build
index 4a16df24..03a4eaf8 100644
--- a/utils/meson.build
+++ b/utils/meson.build
@@ -9,21 +9,16 @@ pango_view_deps = [
   libpango_dep,
 ]
 
-if build_pangoft2
-  pango_view_sources += 'viewer-pangoft2.c'
-  pango_view_deps += libpangoft2_dep
-endif
-
 extra_cflags = [
   '-DPACKAGE_NAME="@0@"'.format(meson.project_name()),
   '-DPACKAGE_VERSION="@0@"'.format(meson.project_version())
 ]
 
-if build_pangoft2 and x11_dep.found()
+if x11_dep.found()
   pango_view_sources += [
     'viewer-x.c',
   ]
-  pango_view_deps += [ libpangoft2_dep, x11_dep ]
+  pango_view_deps += [ x11_dep ]
   extra_cflags += [ '-DHAVE_X' ]
 endif
 
diff --git a/utils/pango-view.c b/utils/pango-view.c
index dbfb31ca..457a7a9a 100644
--- a/utils/pango-view.c
+++ b/utils/pango-view.c
@@ -2,16 +2,12 @@
 #include "viewer.h"
 
 extern const PangoViewer pangocairo_viewer;
-extern const PangoViewer pangoft2_viewer;
 extern const PangoViewer pangox_viewer;
 
 const PangoViewer *viewers[] = {
 #ifdef HAVE_CAIRO
   &pangocairo_viewer,
 #endif
-#ifdef HAVE_FREETYPE
-  &pangoft2_viewer,
-#endif
 #ifdef HAVE_X
   &pangox_viewer,
 #endif