summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@arm.com>2023-01-03 13:46:57 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-01-26 23:39:06 +0000
commit1399ebf2455fab47b73b3ea27734ffd0ba97ed8b (patch)
tree10d976a8c5c432a7a94dc4c4f7f465dc449a5ce2 /meta/recipes-graphics
parent7faee52d4060b3ba08e70a719cef6b2692425c22 (diff)
downloadpoky-1399ebf2455fab47b73b3ea27734ffd0ba97ed8b.tar.gz
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>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r--meta/recipes-graphics/pango/pango/0001-tests-meson.build-install-nofonts-fonts.conf-as-it-i.patch35
-rw-r--r--meta/recipes-graphics/pango/pango_1.50.12.bb (renamed from meta/recipes-graphics/pango/pango_1.50.11.bb)3
2 files changed, 1 insertions, 37 deletions
diff --git a/meta/recipes-graphics/pango/pango/0001-tests-meson.build-install-nofonts-fonts.conf-as-it-i.patch b/meta/recipes-graphics/pango/pango/0001-tests-meson.build-install-nofonts-fonts.conf-as-it-i.patch
deleted file mode 100644
index 8dacd62138..0000000000
--- a/meta/recipes-graphics/pango/pango/0001-tests-meson.build-install-nofonts-fonts.conf-as-it-i.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1From 13f8ba5d5b699df1f88eeea859406daba6d6941f Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex@linutronix.de>
3Date: Tue, 8 Nov 2022 18:08:51 +0100
4Subject: [PATCH] tests/meson.build: install nofonts/fonts.conf as it is
5 required by tests
6
7Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/pango/-/merge_requests/654]
8Signed-off-by: Alexander Kanavin <alex@linutronix.de>
9---
10 tests/meson.build | 5 +++++
11 1 file changed, 5 insertions(+)
12
13diff --git a/tests/meson.build b/tests/meson.build
14index 8b4bfa38..6c1c461b 100644
15--- a/tests/meson.build
16+++ b/tests/meson.build
17@@ -250,6 +250,10 @@ foreach d: test_items_data
18 installed_test_items_data += d + '.expected'
19 endforeach
20
21+installed_test_nofonts_data = [
22+ 'nofonts/fonts.conf',
23+]
24+
25 installed_test_datadir = join_paths(pango_datadir, 'installed-tests', 'pango')
26 installed_test_bindir = join_paths(pango_libexecdir, 'installed-tests', 'pango')
27
28@@ -261,6 +265,7 @@ if get_option('install-tests')
29 install_data(installed_test_breaks_data, install_dir: join_paths(installed_test_bindir, 'breaks'))
30 install_data(installed_test_items_data, install_dir: join_paths(installed_test_bindir, 'itemize'))
31 install_data(installed_test_fontsets_data, install_dir: join_paths(installed_test_bindir, 'fontsets'))
32+ install_data(installed_test_nofonts_data, install_dir: join_paths(installed_test_bindir, 'nofonts'))
33 endif
34
35 gen_installed_test = files([ 'gen-installed-test.py' ])
diff --git a/meta/recipes-graphics/pango/pango_1.50.11.bb b/meta/recipes-graphics/pango/pango_1.50.12.bb
index 6f599f5b78..6779f39c4f 100644
--- a/meta/recipes-graphics/pango/pango_1.50.11.bb
+++ b/meta/recipes-graphics/pango/pango_1.50.12.bb
@@ -22,10 +22,9 @@ GIR_MESON_DISABLE_FLAG = "disabled"
22 22
23SRC_URI += "file://run-ptest \ 23SRC_URI += "file://run-ptest \
24 file://0001-Skip-running-test-layout-test.patch \ 24 file://0001-Skip-running-test-layout-test.patch \
25 file://0001-tests-meson.build-install-nofonts-fonts.conf-as-it-i.patch \
26 " 25 "
27 26
28SRC_URI[archive.sha256sum] = "8800f812d89ee61388188703203f3a7878963c22f8695aaf1fa0a1a1428d17ae" 27SRC_URI[archive.sha256sum] = "caef96d27bbe792a6be92727c73468d832b13da57c8071ef79b9df69ee058fe3"
29 28
30DEPENDS = "glib-2.0 glib-2.0-native fontconfig freetype virtual/libiconv cairo harfbuzz fribidi" 29DEPENDS = "glib-2.0 glib-2.0-native fontconfig freetype virtual/libiconv cairo harfbuzz fribidi"
31 30