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_options.txt | 5 | ||||
-rw-r--r-- | pango/meson.build | 3 |
5 files changed, 13 insertions, 5 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_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 = [ |