[gtk/fix-demos-wo-pangoft2] gtk-demo: Fix building scrolling demo without PangoFT2
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/fix-demos-wo-pangoft2] gtk-demo: Fix building scrolling demo without PangoFT2
- Date: Wed, 11 Nov 2020 03:15:50 +0000 (UTC)
commit a76f37a501e18ee66205f56bc6731c1a9515e1e2
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Wed Nov 11 11:08:38 2020 +0800
gtk-demo: Fix building scrolling demo without PangoFT2
For builds that do not have PangoFT2, the demo fails to link because we weren't
building listview_ucd.c. Fix the build by building listview_ucd.c with
script-names.c and unicode-names.c for all builds, as we now require a Pango
version that already always depends on HarfBuzz and those sources do not use
anything from PangoFT2.
demos/gtk-demo/meson.build | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/demos/gtk-demo/meson.build b/demos/gtk-demo/meson.build
index 49f37c7130..b14f1e04f2 100644
--- a/demos/gtk-demo/meson.build
+++ b/demos/gtk-demo/meson.build
@@ -55,6 +55,7 @@ demos = files([
'listview_filebrowser.c',
'listview_minesweeper.c',
'listview_settings.c',
+ 'listview_ucd.c',
'listview_weather.c',
'listview_words.c',
'markup.c',
@@ -120,11 +121,13 @@ extra_demo_sources = files(['main.c',
'four_point_transform.c',
'demo2widget.c',
'demo3widget.c',
- 'pixbufpaintable.c'])
+ 'pixbufpaintable.c',
+ 'script-names.c',
+ 'unicode-names.c'])
if harfbuzz_dep.found() and pangoft_dep.found()
- demos += files(['font_features.c', 'listview_ucd.c'])
- extra_demo_sources += files(['script-names.c', 'language-names.c', 'unicode-names.c'])
+ demos += files(['font_features.c'])
+ extra_demo_sources += files(['language-names.c'])
gtkdemo_deps += [ harfbuzz_dep, epoxy_dep ]
endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]