diff options
author | Matthias Clasen <mclasen@redhat.com> | 2021-08-17 15:40:35 +0000 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2021-08-17 15:40:35 +0000 |
commit | 4a54dcb8ab1f0316e400fa59a2600080bb2e16ef (patch) | |
tree | 959463ed28c7e905bf7775a411c5d4a82c82e384 | |
parent | f51b158e9a8de5fb4f92346420a5a0a9c97065e2 (diff) | |
parent | d57bbed1dfb731e6eb05e14bb8df0176fd1401f0 (diff) | |
download | pango-4a54dcb8ab1f0316e400fa59a2600080bb2e16ef.tar.gz |
Merge branch 'fixes-for-1-48' into 'pango-1-48'
build: Raise required fribidi version
See merge request GNOME/pango!409
-rw-r--r-- | meson.build | 2 | ||||
-rw-r--r-- | pango/pango-gravity.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/meson.build b/meson.build index d5932b3b..a77da9a5 100644 --- a/meson.build +++ b/meson.build @@ -191,7 +191,7 @@ endif pango_deps = [] glib_req_version = '>= 2.62' -fribidi_req_version = '>= 0.19.7' +fribidi_req_version = '>= 1.0.6' libthai_req_version = '>= 0.1.9' harfbuzz_req_version = '>= 2.2.0' fontconfig_req_version = '>= 2.11.91' diff --git a/pango/pango-gravity.c b/pango/pango-gravity.c index 0eb3cfe2..73505c60 100644 --- a/pango/pango-gravity.c +++ b/pango/pango-gravity.c @@ -278,6 +278,7 @@ const PangoScriptProperties script_properties[] = {LTR, NONE, S, FALSE}, /* Ahom */ {LTR, NONE, S, FALSE}, /* Hluw */ {RTL, NONE, S, FALSE}, /* Hatr */ + {LTR, NONE, S, FALSE}, /* Mult */ {LTR, NONE, S, FALSE}, /* Hung */ {LTR, NONE, S, FALSE}, /* Sgnw */ |