[gtk/wip.win32.fixes: 3/4] demos: Always build font explorer demo
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/wip.win32.fixes: 3/4] demos: Always build font explorer demo
- Date: Mon, 10 Jan 2022 07:55:36 +0000 (UTC)
commit 04bd2187a98d5a1df2e9fa619bc3c8c718fb7264
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Mon Jan 10 14:56:27 2022 +0800
demos: Always build font explorer demo
We are no longer using PangoFT2 APIs in this demo, so make sure that we build
it on all builds since we already depend on a HarfBuzz/Pango version that
provide everything that we need here.
Drop the unnecessary pangofc-font.h include as a result.
demos/gtk-demo/font_features.c | 1 -
demos/gtk-demo/meson.build | 8 ++------
2 files changed, 2 insertions(+), 7 deletions(-)
---
diff --git a/demos/gtk-demo/font_features.c b/demos/gtk-demo/font_features.c
index 4c3af558e7..074e604ed1 100644
--- a/demos/gtk-demo/font_features.c
+++ b/demos/gtk-demo/font_features.c
@@ -12,7 +12,6 @@
*/
#include <gtk/gtk.h>
-#include <pango/pangofc-font.h>
#include <hb.h>
#include <hb-ot.h>
#include <glib/gi18n.h>
diff --git a/demos/gtk-demo/meson.build b/demos/gtk-demo/meson.build
index 6c94e71540..4ef21b26df 100644
--- a/demos/gtk-demo/meson.build
+++ b/demos/gtk-demo/meson.build
@@ -98,6 +98,7 @@ demos = files([
'transparent.c',
'tree_store.c',
'video_player.c',
+ 'font_features.c',
])
gtkdemo_deps = [ libgtk_dep, ]
@@ -128,14 +129,9 @@ extra_demo_sources = files([
'script-names.c',
'unicode-names.c',
'suggestionentry.c',
+ 'language-names.c',
])
-if harfbuzz_dep.found() and pangoft_dep.found()
- demos += files(['font_features.c'])
- extra_demo_sources += files(['language-names.c'])
- gtkdemo_deps += [ harfbuzz_dep, epoxy_dep ]
-endif
-
if os_unix
demos += files('pagesetup.c')
endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]