From patchwork Fri May 10 09:58:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 163849 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:142:0:0:0:0 with SMTP id j2csp2144615ilr; Fri, 10 May 2019 02:58:37 -0700 (PDT) X-Google-Smtp-Source: APXvYqxRMJHGZLrJ5Kwh3O2yoOGduUWLQov+4/XPtrtkjaySQwefJL2ZussVOF1ihUOKrWa3dxSR X-Received: by 2002:a17:902:2e83:: with SMTP id r3mr11953899plb.286.1557482316963; Fri, 10 May 2019 02:58:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557482316; cv=none; d=google.com; s=arc-20160816; b=tcIaZY3SaX3blkMVtIfa0leOKEwL1p0b4JdkZepvK3XDjSTvLp+nik5XHxuROxSWMQ NTMZk9+R8x+iy3aI8i90tWSEZs1dFqpMJON1kt8ancXO8TyafZFZFKzDWb60mZURGUwX uw+TNFasOoY5fb5k4nJYchSr3Knq9veCXUWwiJDypZapaSkv7ugpaMzHhdnxzcMZJlsb oKKfE3tOXcrPLcC0s+f+fVePPjRLpVC6700jqDofbk1SsQo3rA1AS/ogSidCo6hm/jfT yZWVqOVV+jFKgXWlwkP3eYPAJ/zI98Uv0WeD6Lz1TJlIM8G3jpM69qPaUIRm32/G6Eq8 Rbhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to; bh=wHszHbu/UmJSRiazVuZlLbBsbV/e0eJMnbRyyOXBNLA=; b=bP3NSXcJPIZ1hJHt9NEAyPi4XggOEyyA2Antg76BIM6dlOJdz2Rh+Gf7EtY0iNxVkB 6zD2vbrVv69uWY9uKV+IwS3K5xGfREojMTm4rwGhBu4SVZaN50p3P8KYQqii/Sjzr1a0 vCqTMN+o/XIqRBiDGdWUgp8c6XcjKUk1L/p8V8yH99rA1aTkyckcSbOh19VcBU0QknvY +OXDbg5ZEvEIL9Mj1UJIbUF2wyZXdkojc9/PnkR+d3Xf2COQdUQEQ0EZt3HlLG724waR a76QqRU2NbERTOA/nnFbY8yR7pqNfdcjmTUkVbF5CdKyDfK33ZRx/V6LQGyNsA6BBkWX HVDw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=nxd84W6i; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id d5si6881307pla.352.2019.05.10.02.58.36; Fri, 10 May 2019 02:58:36 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=nxd84W6i; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 9081E7E086; Fri, 10 May 2019 09:58:31 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by mail.openembedded.org (Postfix) with ESMTP id 436D66C1C3 for ; Fri, 10 May 2019 09:58:30 +0000 (UTC) Received: by mail-wr1-f67.google.com with SMTP id w8so4657316wrl.6 for ; Fri, 10 May 2019 02:58:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id; bh=V+yxmTUlh7j5j1yVUhUJsvmJ1qWgI+zq3SdtRFEtLdc=; b=nxd84W6ieloSfBrtLDONr6ajL0jv33Lp29n/Idr2um1x8X1968uSJY5dL+l1qRgU0H jl8XlgMnxu36pZ0rdgDR7p+yF/5vn9dGei6p9rZyesU9T9wSkXeu/jepgeW2OLq4SfON /jZ3Q/T6QR8yMS7YTtzvxL3ocb/xzmlyOR8/UEjwN/bUAB7+DhcmBR5ZpR1kfIt+bDec 1nQ2m/90h506pA4VEZW5M03OnUu82+SrHsiDDEIoctrUSU2BIh2+ljDZICPzajE8p84g IFHCSKFetmyLt4NQNqtTr7d3Rj86LNFaks7b/sUJXeHKgfvK/KcdukSjO7cfvwL7uL+a U0ZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=V+yxmTUlh7j5j1yVUhUJsvmJ1qWgI+zq3SdtRFEtLdc=; b=DtuiruFCG6mV4F1ETXGMvdlUPNbtTVLB/6ztdXCiOAq0Yc5g6hDx2TWd6r7DLWGzSi aMAMee5TIWBi1dAXjbvSN71tNMxPNYDtmrmyNPVDkOCSxl1YUFwuveD/ALZ6p38qnGvM TSdeXGF6/ezwdOqunIkGMnQtAzGrr9sucg4WRDzKju2oy2pVcpdR+9npXLhzqTnY0nvD zK7StKzQHCwhdLjFAUaPbzNFZsDE8zC/On7qh6gUnQIQC/plAOgtZqmfSUK/zct5ld9C Tkiapq/lc2uaUIcvMslfkWyRIIPojvRdEw13wPmPOdl9edOihMNP48FNPaHM+4WV31yv sVTQ== X-Gm-Message-State: APjAAAX1+eYBuzzw1bRqcu3ZzCeTapcKDMXZPx0gzy5SDg7ImRqs18Yj tTVzB+TfQsA+UcFpKpCWvIaN7LhIINE= X-Received: by 2002:adf:b645:: with SMTP id i5mr7203914wre.272.1557482310755; Fri, 10 May 2019 02:58:30 -0700 (PDT) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id c20sm7037474wre.28.2019.05.10.02.58.29 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 May 2019 02:58:29 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Fri, 10 May 2019 10:58:27 +0100 Message-Id: <20190510095827.18896-1-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 Subject: [OE-core] [PATCH] glib-2.0: fix locale handling X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org A bug upstream resulted in broken locale handling with the new glibc we have, so the test suite was failing. Signed-off-by: Ross Burton --- .../glib-2.0/glib-2.0/fix-nl-abaltmon.patch | 62 ++++++++++++++++++++++ meta/recipes-core/glib-2.0/glib-2.0_2.58.3.bb | 1 + 2 files changed, 63 insertions(+) create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/fix-nl-abaltmon.patch -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core 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 new file mode 100644 index 00000000000..5c1488bc41d --- /dev/null +++ b/meta/recipes-core/glib-2.0/glib-2.0/fix-nl-abaltmon.patch @@ -0,0 +1,62 @@ +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/glib/merge_requests/828] +Signed-off-by: Ross Burton + +From 93d8482384ebc5c7d1f3d92b0190db0371269663 Mon Sep 17 00:00:00 2001 +From: Rafal Luzynski +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 + 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 diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.58.3.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.58.3.bb index 733a2d46d98..d749be34ee8 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0_2.58.3.bb +++ b/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 \ "