[gtk/wip.win32.fixes: 1/5] gtk/meson.build: Fix builds without PangoFT2
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/wip.win32.fixes: 1/5] gtk/meson.build: Fix builds without PangoFT2
- Date: Wed, 12 Jan 2022 09:24:21 +0000 (UTC)
commit 9f4ab79b527a53e8b43e9c844a605da49a1597fe
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.
Also, always include the pangoft2 dependency in gtk_dep when it is found.
gtk/meson.build | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
---
diff --git a/gtk/meson.build b/gtk/meson.build
index 09a6e0bc84..9e01201522 100644
--- a/gtk/meson.build
+++ b/gtk/meson.build
@@ -1072,6 +1072,10 @@ gtk_gen_headers = [
gtkversion,
]
+font_script_language_sources = files([
+ 'language-names.c',
+])
+
gtk_sources += [
gtk_a11y_src,
gtk_dbus_src,
@@ -1081,6 +1085,7 @@ gtk_sources += [
gtkmarshalers,
gtkprivatetypebuiltins,
gtktypebuiltins,
+ font_script_language_sources,
]
gtk_deps = [
@@ -1097,13 +1102,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',
- ])
-endif
-
if x11_enabled
x11_data_prefix = dependency('x11').get_variable(pkgconfig: 'prefix')
@@ -1151,6 +1149,9 @@ endif
# So we don't add these twice
if x11_enabled or wayland_enabled
gtk_sources += gtk_use_wayland_or_x11_c_sources
+endif
+
+if pangoft_dep.found()
gtk_deps += pangoft_dep
endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]