From b2832df86b5218954c63b01595620fe8cf7ec921 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 14 May 2019 09:32:12 -0700 Subject: glib-2.0: fix last failing ptest Upstream glib don't really actually test the test suite with modern glibc and all the locales present so we're finding a number of bugs. Backport another fix from upstream to fix the test data with modern glibc. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- .../glib-2.0/glib-2.0/fix-nl-abaltmon.patch | 44 +++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) (limited to 'meta') diff --git a/meta/recipes-core/glib-2.0/glib-2.0/fix-nl-abaltmon.patch b/meta/recipes-core/glib-2.0/glib-2.0/fix-nl-abaltmon.patch index 5c1488bc41..c36a397fef 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/fix-nl-abaltmon.patch +++ b/meta/recipes-core/glib-2.0/glib-2.0/fix-nl-abaltmon.patch @@ -1,4 +1,6 @@ -Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/glib/merge_requests/828] +Fix the last few remaining bugs in glib's date/locale code. + +Upstream-Status: Backport Signed-off-by: Ross Burton From 93d8482384ebc5c7d1f3d92b0190db0371269663 Mon Sep 17 00:00:00 2001 @@ -60,3 +62,43 @@ index c5d2ce5f8..08fa40ac5 100644 -- 2.18.1 + +From 35c28be32762d5af6b93cb6a3420c5977f7bf599 Mon Sep 17 00:00:00 2001 +From: Rafal Luzynski +Date: Mon, 13 May 2019 23:11:28 +0200 +Subject: [PATCH] tests: Update month name check for Greek locale +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Update the abbreviated month name in the test to match the actual +translation. Otherwise the test fails with false positive. + +Vocabulary: + +July (nominative) - Greek: Ιούλιος (abbreviated: Ιούλ) +Of July (genitive) - Greek: Ιουλίου (abbreviated: Ιουλ) + +This is similar to commit 4d215e006ee69bd7a993bf853722993433adbf9a +and commit 7fe793e125c316ac34edd8158df5a132cb044bc1. + +Closes #1776 +--- + glib/tests/date.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/glib/tests/date.c b/glib/tests/date.c +index 8eb28712b..ff13ad101 100644 +--- a/glib/tests/date.c ++++ b/glib/tests/date.c +@@ -388,7 +388,7 @@ test_month_names (void) + TEST_DATE ( 1, 4, 2018, "%OB %Y", "Απρίλιος 2018"); + TEST_DATE ( 1, 5, 2018, "%OB %Y", "Μάιος 2018"); + TEST_DATE ( 1, 6, 2018, "%OB %Y", "Ιούνιος 2018"); +- TEST_DATE (16, 7, 2018, "%e %b %Y", "16 Ιούλ 2018"); ++ TEST_DATE (16, 7, 2018, "%e %b %Y", "16 Ιουλ 2018"); + TEST_DATE ( 1, 8, 2018, "%Ob %Y", "Αύγ 2018"); + } + else +-- +2.18.1 -- cgit 1.2.3-korg