mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-23 00:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

pango: replace a recipe fix with an upstream submitted patch

Browse Source 
(From OE-Core rev: f444e01e0230904510f50d1b093d75253faf1bca)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2022-11-10 19:12:31 +01:00
committed by Richard Purdie
parent 48abeedd63
commit cf3fbfe04e
2 changed files with 38 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
meta/recipes-graphics/pango/pango/0001-tests-meson.build-install-nofonts-fonts.conf-as-it-i.patch Normal file
View File

@@ -0,0 +1,35 @@
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' ])

13
meta/recipes-graphics/pango/pango_1.50.11.bb
View File

@@ -21,8 +21,9 @@ GIR_MESON_ENABLE_FLAG = "enabled"
GIR_MESON_DISABLE_FLAG = "disabled"
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"
@@ -41,14 +42,6 @@ do_configure:prepend() {
chmod +x ${S}/tests/*.py
}
# https://gitlab.gnome.org/GNOME/pango/-/issues/713
do_install:append() {
if [ "${@bb.utils.filter('PACKAGECONFIG', 'tests', d)}" ]; then
mkdir -p ${D}${libexecdir}/installed-tests/pango/nofonts
install ${S}/tests/nofonts/fonts.conf ${D}${libexecdir}/installed-tests/pango/nofonts
fi
}
LEAD_SONAME = "libpango-1.0*"
FILES:${PN} = "${bindir}/* ${libdir}/libpango*${SOLIBS}"