diff options
| author | Chun-wei Fan <fanchunwei@src.gnome.org> | 2022-01-10 14:56:27 +0800 |
|---|---|---|
| committer | Chun-wei Fan <fanchunwei@src.gnome.org> | 2022-01-12 17:29:30 +0800 |
| commit | 169172a9e0aaf71317846a204443407ec76bdc91 (patch) | |
| tree | 3d0aec9828da1a64a4099f01ee5c31f394daca82 /demos | |
| parent | 0a3fad4d4779ec2c8de27349103ee691c94e4b25 (diff) | |
| download | gtk+-169172a9e0aaf71317846a204443407ec76bdc91.tar.gz | |
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.
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/gtk-demo/font_features.c | 1 | ||||
| -rw-r--r-- | 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 5b79dfad5f..5c84a0121d 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 |