summaryrefslogtreecommitdiff
path: root/poky/meta/recipes-core/glib-2.0
diff options
context:
space:
mode:
Diffstat (limited to 'poky/meta/recipes-core/glib-2.0')
-rw-r--r--poky/meta/recipes-core/glib-2.0/glib-2.0/fix-nl-abaltmon.patch104
-rw-r--r--poky/meta/recipes-core/glib-2.0/glib-2.0_2.58.3.bb1
-rw-r--r--poky/meta/recipes-core/glib-2.0/glib.inc16
3 files changed, 116 insertions, 5 deletions
diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0/fix-nl-abaltmon.patch b/poky/meta/recipes-core/glib-2.0/glib-2.0/fix-nl-abaltmon.patch
new file mode 100644
index 0000000000..c36a397fef
--- /dev/null
+++ b/poky/meta/recipes-core/glib-2.0/glib-2.0/fix-nl-abaltmon.patch
@@ -0,0 +1,104 @@
+Fix the last few remaining bugs in glib's date/locale code.
+
+Upstream-Status: Backport
+Signed-off-by: Ross Burton <ross.burton@intel.com>
+
+From 93d8482384ebc5c7d1f3d92b0190db0371269663 Mon Sep 17 00:00:00 2001
+From: Rafal Luzynski <digitalfreak@lingonborough.com>
+Date: Fri, 10 May 2019 00:40:27 +0200
+Subject: [PATCH] build: Fix a typo in the test whether _NL_ABALTMON_n is
+ supported
+
+The correct spelling is "_NL_ABALTMON_n" rather than "_NL_ALTMON_n".
+The typo made Meson build think that _NL_ABALTMON_n constants are
+not supported which was totally wrong. This made g_date_time_format()
+output incorrect abbreviated month names in some languages.
+The old configure.ac script was correct here.
+
+Bug introduced in commit be4f96b6502c01d2a51d60b7a669c8ef82e22a4d.
+
+Closes: #1759
+---
+ meson.build | 26 +++++++++++++-------------
+ 1 file changed, 13 insertions(+), 13 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index c5d2ce5f8..08fa40ac5 100644
+--- a/meson.build
++++ b/meson.build
+@@ -1002,20 +1002,20 @@ if cc.links('''#ifndef _GNU_SOURCE
+ #include <langinfo.h>
+ int main (int argc, char ** argv) {
+ char *str;
+- str = nl_langinfo (_NL_ALTMON_1);
+- str = nl_langinfo (_NL_ALTMON_2);
+- str = nl_langinfo (_NL_ALTMON_3);
+- str = nl_langinfo (_NL_ALTMON_4);
+- str = nl_langinfo (_NL_ALTMON_5);
+- str = nl_langinfo (_NL_ALTMON_6);
+- str = nl_langinfo (_NL_ALTMON_7);
+- str = nl_langinfo (_NL_ALTMON_8);
+- str = nl_langinfo (_NL_ALTMON_9);
+- str = nl_langinfo (_NL_ALTMON_10);
+- str = nl_langinfo (_NL_ALTMON_11);
+- str = nl_langinfo (_NL_ALTMON_12);
++ str = nl_langinfo (_NL_ABALTMON_1);
++ str = nl_langinfo (_NL_ABALTMON_2);
++ str = nl_langinfo (_NL_ABALTMON_3);
++ str = nl_langinfo (_NL_ABALTMON_4);
++ str = nl_langinfo (_NL_ABALTMON_5);
++ str = nl_langinfo (_NL_ABALTMON_6);
++ str = nl_langinfo (_NL_ABALTMON_7);
++ str = nl_langinfo (_NL_ABALTMON_8);
++ str = nl_langinfo (_NL_ABALTMON_9);
++ str = nl_langinfo (_NL_ABALTMON_10);
++ str = nl_langinfo (_NL_ABALTMON_11);
++ str = nl_langinfo (_NL_ABALTMON_12);
+ return 0;
+- }''', name : 'nl_langinfo (_NL_ALTMON_n)')
++ }''', name : 'nl_langinfo (_NL_ABALTMON_n)')
+ glib_conf.set('HAVE_LANGINFO_ABALTMON', 1)
+ endif
+
+--
+2.18.1
+
+From 35c28be32762d5af6b93cb6a3420c5977f7bf599 Mon Sep 17 00:00:00 2001
+From: Rafal Luzynski <digitalfreak@lingonborough.com>
+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
diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0_2.58.3.bb b/poky/meta/recipes-core/glib-2.0/glib-2.0_2.58.3.bb
index 733a2d46d9..d749be34ee 100644
--- a/poky/meta/recipes-core/glib-2.0/glib-2.0_2.58.3.bb
+++ b/poky/meta/recipes-core/glib-2.0/glib-2.0_2.58.3.bb
@@ -17,6 +17,7 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
file://0001-Do-not-write-bindir-into-pkg-config-files.patch \
file://0001-meson.build-do-not-hardcode-linux-as-the-host-system.patch \
file://0001-meson-do-a-build-time-check-for-strlcpy-before-attem.patch \
+ file://fix-nl-abaltmon.patch \
file://glib-meson.cross \
"
diff --git a/poky/meta/recipes-core/glib-2.0/glib.inc b/poky/meta/recipes-core/glib-2.0/glib.inc
index 574bb38557..9ffc4560a9 100644
--- a/poky/meta/recipes-core/glib-2.0/glib.inc
+++ b/poky/meta/recipes-core/glib-2.0/glib.inc
@@ -30,11 +30,7 @@ LEAD_SONAME = "libglib-2.0.*"
inherit meson gettext gtk-doc pkgconfig ptest-gnome upstream-version-is-even bash-completion gio-module-cache manpages distro_features_check
-GTKDOC_ENABLE_FLAG = "-Dgtk_doc=true"
-GTKDOC_DISABLE_FLAG = "-Dgtk_doc=false"
-
-EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GTKDOC_ENABLED', 'True', '${GTKDOC_ENABLE_FLAG}', \
- '${GTKDOC_DISABLE_FLAG}', d)} "
+GTKDOC_MESON_OPTION = "gtk_doc"
# This avoids the need to depend on target python3, which in case of mingw is not even possible.
# meson's python configuration pokes into python3 configuration, so this provides the native config to it.
@@ -152,6 +148,14 @@ RDEPENDS_${PN}-ptest += "\
tzdata-europe \
tzdata-posix \
shared-mime-info \
+ ${PN}-locale-ja \
+ ${PN}-locale-fr \
+ ${PN}-locale-el \
+ ${PN}-locale-hr \
+ ${PN}-locale-lt \
+ ${PN}-locale-pl \
+ ${PN}-locale-ru \
+ ${PN}-locale-th \
"
RDEPENDS_${PN}-ptest_append_libc-glibc = "\
@@ -177,5 +181,7 @@ RDEPENDS_${PN}-ptest_append_libc-glibc = "\
locale-base-fr-fr \
locale-base-es-es \
locale-base-en-gb \
+ locale-base-en-us \
locale-base-pl-pl \
+ locale-base-pl-pl.iso-8859-2 \
"
generated by cgit v1.2.3 (git 2.39.0) at 2024-08-11 00:11:20 +0300