pango: upgrade 1.52.2 -> 1.54.0

Upstream has removed installable tests, although there is pressure to
bring them back[1].

- Build fixes
- Memory leak fixes
- Drop the install-tests build option
- Add build-examples and build-tests build options
- Require meson 0.63
- Add pango_item_get_char_offset
- Update to Unicode 15.1
- Fix wrong use of GWeakRef, leading to crashes

[1] https://gitlab.gnome.org/GNOME/pango/-/issues/799

(From OE-Core rev: 228c4275df766d97250cbfa0a2c1254e704c07c7)

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton
2024-07-19 16:51:50 +01:00
committed by Richard Purdie
parent f8a5d23dd6
commit 0a6c30c637
4 changed files with 3 additions and 69 deletions

View File

@@ -53,7 +53,6 @@ PTESTS_FAST = "\
m4 \
nettle \
opkg \
pango \
popt \
python3-atomicwrites \
python3-attrs \

View File

@@ -1,45 +0,0 @@
From b9bfe3a79f165682a6db3d7ee1928365e93b1ccf Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Wed, 13 Apr 2022 19:39:29 -0700
Subject: [PATCH] Skip running test-layout test
This fails intermittently, it varies based on what version of harfbuzz
is installed and if it does not match with what pango CI tests then we
get random failures in this test. This has been disabled in other
distros [1] too
We want to drop this on next upgrade and see if this test passes if not
then keep it disabled
Fixes
Running test: pango/test-layout.test
1..36
ok 1 /layout/letterspacing.layout
ok 2 /layout/valid-7.layout
not ok 3 /layout/valid-14.layout
Bail out!
FAIL: pango/test-layout.test (Child process killed by signal 6)
[1] https://github.com/archlinux/svntogit-packages/commit/3f883e7ff8071adad23b6bcc0ba4b995aff10d52
Upstream-Status: Inappropriate [bugfix https://gitlab.gnome.org/GNOME/pango/-/issues/677]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
tests/test-layout.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/test-layout.c b/tests/test-layout.c
index 1139e4f..b47a066 100644
--- a/tests/test-layout.c
+++ b/tests/test-layout.c
@@ -222,5 +222,5 @@ main (int argc, char *argv[])
}
g_dir_close (dir);
- return g_test_run ();
+ return 77;
}
--
2.35.2

View File

@@ -1,6 +0,0 @@
#! /bin/sh
# workaround for https://gitlab.gnome.org/GNOME/pango/-/issues/668
mkdir -p /usr/share/fonts/pango-private
cp -rf /usr/libexec/installed-tests/pango/fonts/* /usr/share/fonts/pango-private
gnome-desktop-testing-runner pango

View File

@@ -11,42 +11,28 @@ LICENSE = "LGPL-2.0-or-later"
LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
inherit gnomebase gi-docgen ptest-gnome upstream-version-is-even gobject-introspection
inherit gnomebase gi-docgen upstream-version-is-even gobject-introspection
UPSTREAM_CHECK_REGEX = "pango-(?P<pver>\d+\.(?!9\d+)\d+\.\d+)"
GIR_MESON_ENABLE_FLAG = "enabled"
GIR_MESON_DISABLE_FLAG = "disabled"
SRC_URI += "file://run-ptest \
file://0001-Skip-running-test-layout-test.patch \
"
SRC_URI[archive.sha256sum] = "d0076afe01082814b853deec99f9349ece5f2ce83908b8e58ff736b41f78a96b"
SRC_URI[archive.sha256sum] = "8a9eed75021ee734d7fc0fdf3a65c3bba51dfefe4ae51a9b414a60c70b2d1ed8"
DEPENDS = "glib-2.0 glib-2.0-native fontconfig freetype virtual/libiconv cairo harfbuzz fribidi"
PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)} \
${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}"
PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
PACKAGECONFIG[x11] = ",,virtual/libx11 libxft"
PACKAGECONFIG[tests] = "-Dinstall-tests=true, -Dinstall-tests=false"
PACKAGECONFIG[thai] = "-Dlibthai=enabled,-Dlibthai=disabled,libthai"
GIR_MESON_OPTION = 'introspection'
do_configure:prepend() {
chmod +x ${S}/tests/*.py
}
LEAD_SONAME = "libpango-1.0*"
FILES:${PN} = "${bindir}/* ${libdir}/libpango*${SOLIBS}"
RDEPENDS:${PN}-ptest += "cantarell-fonts"
RDEPENDS:${PN}-ptest:append:libc-glibc = " locale-base-en-us"
RPROVIDES:${PN} += "pango-modules pango-module-indic-lang \
pango-module-basic-fc pango-module-arabic-lang"