mirror of
https://git.yoctoproject.org/poky
synced 2026-09-15 06:49:33 +02:00
pango: upgrade 1.50.11 -> 1.50.12
Overview of changes in 1.50.12, 18-11-2022 ========================================== - Fix weight conversion on MacOS - Update to Unicode 15 - Some introspection annotation fixes - Improve PangoAttrList serialization - Fix char offset calculatiosn in multi-paragraph layouts (From OE-Core rev: 032a2a1abf19954c59d50fcacafb2293ac5a9351) Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 35fc61a1dd63a0555b67da899418010d595b545c) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
7faee52d40
commit
1399ebf245
@@ -1,35 +0,0 @@
|
|||||||
From 13f8ba5d5b699df1f88eeea859406daba6d6941f Mon Sep 17 00:00:00 2001
|
|
||||||
From: Alexander Kanavin <alex@linutronix.de>
|
|
||||||
Date: Tue, 8 Nov 2022 18:08:51 +0100
|
|
||||||
Subject: [PATCH] tests/meson.build: install nofonts/fonts.conf as it is
|
|
||||||
required by tests
|
|
||||||
|
|
||||||
Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/pango/-/merge_requests/654]
|
|
||||||
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
|
|
||||||
---
|
|
||||||
tests/meson.build | 5 +++++
|
|
||||||
1 file changed, 5 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/tests/meson.build b/tests/meson.build
|
|
||||||
index 8b4bfa38..6c1c461b 100644
|
|
||||||
--- a/tests/meson.build
|
|
||||||
+++ b/tests/meson.build
|
|
||||||
@@ -250,6 +250,10 @@ foreach d: test_items_data
|
|
||||||
installed_test_items_data += d + '.expected'
|
|
||||||
endforeach
|
|
||||||
|
|
||||||
+installed_test_nofonts_data = [
|
|
||||||
+ 'nofonts/fonts.conf',
|
|
||||||
+]
|
|
||||||
+
|
|
||||||
installed_test_datadir = join_paths(pango_datadir, 'installed-tests', 'pango')
|
|
||||||
installed_test_bindir = join_paths(pango_libexecdir, 'installed-tests', 'pango')
|
|
||||||
|
|
||||||
@@ -261,6 +265,7 @@ if get_option('install-tests')
|
|
||||||
install_data(installed_test_breaks_data, install_dir: join_paths(installed_test_bindir, 'breaks'))
|
|
||||||
install_data(installed_test_items_data, install_dir: join_paths(installed_test_bindir, 'itemize'))
|
|
||||||
install_data(installed_test_fontsets_data, install_dir: join_paths(installed_test_bindir, 'fontsets'))
|
|
||||||
+ install_data(installed_test_nofonts_data, install_dir: join_paths(installed_test_bindir, 'nofonts'))
|
|
||||||
endif
|
|
||||||
|
|
||||||
gen_installed_test = files([ 'gen-installed-test.py' ])
|
|
||||||
@@ -22,10 +22,9 @@ GIR_MESON_DISABLE_FLAG = "disabled"
|
|||||||
|
|
||||||
SRC_URI += "file://run-ptest \
|
SRC_URI += "file://run-ptest \
|
||||||
file://0001-Skip-running-test-layout-test.patch \
|
file://0001-Skip-running-test-layout-test.patch \
|
||||||
file://0001-tests-meson.build-install-nofonts-fonts.conf-as-it-i.patch \
|
|
||||||
"
|
"
|
||||||
|
|
||||||
SRC_URI[archive.sha256sum] = "8800f812d89ee61388188703203f3a7878963c22f8695aaf1fa0a1a1428d17ae"
|
SRC_URI[archive.sha256sum] = "caef96d27bbe792a6be92727c73468d832b13da57c8071ef79b9df69ee058fe3"
|
||||||
|
|
||||||
DEPENDS = "glib-2.0 glib-2.0-native fontconfig freetype virtual/libiconv cairo harfbuzz fribidi"
|
DEPENDS = "glib-2.0 glib-2.0-native fontconfig freetype virtual/libiconv cairo harfbuzz fribidi"
|
||||||
|
|
||||||
Reference in New Issue
Block a user