summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2021-02-28 16:36:50 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-03-02 14:15:33 +0000
commitc9dcdd0b7ad5f013649f4efe00641e4b686eab47 (patch)
tree4cfa3b2a2d83387279a6e68db61fbdfd5417993d
parent6d0c0d74422816c28e1d3985e7d9d533272fe0a2 (diff)
downloadpoky-c9dcdd0b7ad5f013649f4efe00641e4b686eab47.tar.gz
poky-c9dcdd0b7ad5f013649f4efe00641e4b686eab47.tar.bz2
poky-c9dcdd0b7ad5f013649f4efe00641e4b686eab47.zip
pango: update 1.48.0 -> 1.48.2
Drop a patch; issue fixed upstream: https://gitlab.gnome.org/GNOME/pango/-/commit/fcda7d6f9b6ee966f5da860be5ec0c0096193a83 (From OE-Core rev: 02dd8059d47a5fd5d3c0724073aa42cd9bcba0e2) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/pango/pango/0001-tests-test-font.c-drop-assert-that-fails-with-Cantar.patch27
-rw-r--r--meta/recipes-graphics/pango/pango_1.48.2.bb (renamed from meta/recipes-graphics/pango/pango_1.48.0.bb)3
2 files changed, 1 insertions, 29 deletions
diff --git a/meta/recipes-graphics/pango/pango/0001-tests-test-font.c-drop-assert-that-fails-with-Cantar.patch b/meta/recipes-graphics/pango/pango/0001-tests-test-font.c-drop-assert-that-fails-with-Cantar.patch
deleted file mode 100644
index d8f971d914..0000000000
--- a/meta/recipes-graphics/pango/pango/0001-tests-test-font.c-drop-assert-that-fails-with-Cantar.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From eea900ec107920bc99c9df5ab258b7bc446c0b87 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Fri, 4 Dec 2020 14:03:01 +0000
-Subject: [PATCH] tests/test-font.c: drop assert that fails with Cantarell
- family
-
-Upstream bug: https://gitlab.gnome.org/GNOME/pango/-/issues/494
-
-Upstream-Status: Inappropriate [needs a proper fix by upstream that handles font faces with identical names]
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
----
- tests/test-font.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/test-font.c b/tests/test-font.c
-index 486504f..7e45ba1 100644
---- a/tests/test-font.c
-+++ b/tests/test-font.c
-@@ -217,7 +217,7 @@ test_enumerate (void)
- for (i = 0; i < n_faces; i++)
- {
- face = pango_font_family_get_face (families[0], pango_font_face_get_face_name (faces[i]));
-- g_assert_true (face == faces[i]);
-+ //g_assert_true (face == faces[i]);
- }
-
- desc = pango_font_description_new ();
diff --git a/meta/recipes-graphics/pango/pango_1.48.0.bb b/meta/recipes-graphics/pango/pango_1.48.2.bb
index 552a44583c..1dcb43b5e1 100644
--- a/meta/recipes-graphics/pango/pango_1.48.0.bb
+++ b/meta/recipes-graphics/pango/pango_1.48.2.bb
@@ -18,8 +18,7 @@ inherit gnomebase gtk-doc ptest-gnome upstream-version-is-even gobject-introspec
GIR_MESON_ENABLE_FLAG = "enabled"
GIR_MESON_DISABLE_FLAG = "disabled"
-SRC_URI += " file://0001-tests-test-font.c-drop-assert-that-fails-with-Cantar.patch"
-SRC_URI[archive.sha256sum] = "391f26f3341c2d7053e0fb26a956bd42360dadd825efe7088b1e9340a65e74e6"
+SRC_URI[archive.sha256sum] = "d21f8b30dc8abdfc55de25656ecb88dc1105eeeb315e5e2a980dcef8010c2c80"
DEPENDS = "glib-2.0 glib-2.0-native fontconfig freetype virtual/libiconv cairo harfbuzz fribidi"