diff options
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | NEWS | 6 | ||||
| -rwxr-xr-x | make-release.sh | 2 | ||||
| -rw-r--r-- | meson.build | 2 | ||||
| -rw-r--r-- | meson_options.txt | 5 | ||||
| -rw-r--r-- | pango/meson.build | 3 | ||||
| -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 |
10 files changed, 21 insertions, 10 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dffa8056..c287010c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -40,7 +40,7 @@ asan-build: needs: [] variables: script: - - CC=clang meson --buildtype=debugoptimized -Db_sanitize=address -Db_lundef=false -Dintrospection=false _build + - CC=clang meson --buildtype=debugoptimized -Db_sanitize=address -Db_lundef=false -Dintrospection=disabled _build - ninja -C _build - .gitlab-ci/run-tests.sh _build allow_failure: true @@ -1,3 +1,9 @@ +Overview of changes in 1.47.0 +============================= +- Add pango_language_get_preferred +- Add pango_fc_font_get_languages +- Sort faces of a family by slant and weight + Overview of changes in 1.46.2 ============================= - Fix pango_win32_font_map_load_font with falback families diff --git a/make-release.sh b/make-release.sh index 9d5a6607..d0b4b750 100755 --- a/make-release.sh +++ b/make-release.sh @@ -19,7 +19,7 @@ meson dist -C${release_build_dir} --include-subprojects || exit meson configure -Dgtk_doc=true ${release_build_dir} || exit ninja -C${release_build_dir} pango-doc || exit -tar cf ${release_build_dir}/meson-dist/pango-docs-${version}.tar.xz ${release_build_dir}/docs/ +tar cf ${release_build_dir}/meson-dist/pango-docs-${version}.tar.xz -C${release_build_dir} docs/ echo -e "\n\nPango ${version} release on branch ${branch} in ./${release_build_dir}/:\n" diff --git a/meson.build b/meson.build index 36fc4112..504b68b5 100644 --- a/meson.build +++ b/meson.build @@ -372,7 +372,7 @@ if host_system == 'darwin' endif cairo_found_type = '' -cairo_dep = dependency('cairo', version: cairo_req_version, required: get_option('cairo')) +cairo_dep = dependency('cairo', version: cairo_req_version, required: false) if cairo_dep.found() cairo_found_type = cairo_dep.type_name() diff --git a/meson_options.txt b/meson_options.txt index 5aa7c795..235b8a48 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -4,8 +4,9 @@ option('gtk_doc', value: false) option('introspection', description: 'Build the GObject introspection data for Pango', - type: 'boolean', - value: true) + type: 'feature', + value: 'auto', + yield: true) option('install-tests', description : 'Install tests', type: 'boolean', diff --git a/pango/meson.build b/pango/meson.build index 4c055f52..0b87b644 100644 --- a/pango/meson.build +++ b/pango/meson.build @@ -121,7 +121,8 @@ libpango = library( pango_dep_sources = [pango_enum_h] -build_gir = get_option('introspection') +gir = find_program('g-ir-scanner', required : get_option('introspection')) +build_gir = gir.found() and (not meson.is_cross_build() or get_option('introspection').enabled()) if build_gir gir_args = [ 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@', |