[gtk/fix-build-no-pangoft: 32/36] gtk/meson.build: Fix builds without PangoFT2




commit e601322c1c5d0d2c28db88af117a3e86f6c028e0
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Wed Jan 5 17:50:29 2022 +0800

    gtk/meson.build: Fix builds without PangoFT2
    
    We aren't really using PangoFT2 for [language|script]-names.c, and are
    always using items from them, so make sure they are being built.

 gtk/meson.build | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)
---
diff --git a/gtk/meson.build b/gtk/meson.build
index 201af63f23..4e61231e25 100644
--- a/gtk/meson.build
+++ b/gtk/meson.build
@@ -1072,6 +1072,11 @@ gtk_gen_headers = [
   gtkversion,
 ]
 
+font_script_language_sources = files([
+  'language-names.c',
+  'script-names.c',
+])
+
 gtk_sources += [
   gtk_a11y_src,
   gtk_dbus_src,
@@ -1081,6 +1086,7 @@ gtk_sources += [
   gtkmarshalers,
   gtkprivatetypebuiltins,
   gtktypebuiltins,
+  font_script_language_sources,
 ]
 
 gtk_deps = [
@@ -1097,14 +1103,6 @@ gtk_deps = [
   graphene_dep,
 ]
 
-if harfbuzz_dep.found() and pangoft_dep.found()
-  gtk_deps += [ harfbuzz_dep, pangoft_dep ]
-  gtk_sources += files([
-  'language-names.c',
-  'script-names.c',
-  ])
-endif
-
 if x11_enabled
   x11_data_prefix = dependency('x11').get_variable(pkgconfig: 'prefix')
 


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