diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2020-09-30 12:19:15 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2020-09-30 12:19:15 +0000 |
| commit | cb925c525e61738eb2410e199f0c52271bc14711 (patch) | |
| tree | c8a09a3218395da09f828fe00fa1e8da019034bd | |
| parent | 60499b0b524e2c626970e5b5e71f5abf7e5c690b (diff) | |
| parent | ddc282f6ca84dc6e6e5586a0addfa82a74e6e761 (diff) | |
| download | pango-cb925c525e61738eb2410e199f0c52271bc14711.tar.gz | |
Merge branch 'ebassi/for-master' into 'master'
Ebassi/for master
See merge request GNOME/pango!251
| -rw-r--r-- | pango/pangofc-font.c | 2 | ||||
| -rw-r--r-- | tests/gen-all-unicode.py | 2 | ||||
| -rw-r--r-- | tests/gen-installed-test.py | 2 | ||||
| -rw-r--r-- | tests/meson.build | 5 |
4 files changed, 7 insertions, 4 deletions
diff --git a/pango/pangofc-font.c b/pango/pangofc-font.c index 01520cb4..cf6b427f 100644 --- a/pango/pangofc-font.c +++ b/pango/pangofc-font.c @@ -1069,7 +1069,7 @@ pango_fc_font_get_languages (PangoFcFont *font) } /** - * pango_fc_font_get_pattern: + * pango_fc_font_get_pattern: (skip) * @font: a #PangoFcFont * * Returns the FcPattern that @font is based on. diff --git a/tests/gen-all-unicode.py b/tests/gen-all-unicode.py index 011ab9d2..c30cfc49 100644 --- a/tests/gen-all-unicode.py +++ b/tests/gen-all-unicode.py @@ -1,3 +1,5 @@ +#!/usr/bin/env python3 + import sys # From glib/gutf8.c: diff --git a/tests/gen-installed-test.py b/tests/gen-installed-test.py index 794ea107..eeb4abee 100644 --- a/tests/gen-installed-test.py +++ b/tests/gen-installed-test.py @@ -1,3 +1,5 @@ +#!/usr/bin/env python3 + import sys import argparse import os diff --git a/tests/meson.build b/tests/meson.build index 6e10e2b7..b962a758 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -141,14 +141,13 @@ if get_option('install-tests') install_data(installed_test_items_data, install_dir: join_paths(installed_test_bindir, 'itemize')) endif -python = import('python3').find_python() gen_installed_test = files([ 'gen-installed-test.py' ]) gen_all_unicode = files([ 'gen-all-unicode.py' ]) custom_target('all-unicode', output: 'all-unicode.txt', command: [ - python, gen_all_unicode, '@OUTPUT@' + gen_all_unicode, '@OUTPUT@' ], install: get_option('install-tests'), install_dir: installed_test_bindir) @@ -161,7 +160,7 @@ foreach t: tests custom_target(name + '.test', output: name + '.test', command: [ - python, gen_installed_test, + gen_installed_test, installed_test_bindir, name, '@OUTDIR@', |