From patchwork Wed Jul 21 11:04:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Prikler X-Patchwork-Id: 31547 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 2989327BC78; Wed, 21 Jul 2021 12:06:26 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id EA10727BC6B for ; Wed, 21 Jul 2021 12:06:25 +0100 (BST) Received: from localhost ([::1]:41132 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m6A3U-0005pY-TX for patchwork@mira.cbaines.net; Wed, 21 Jul 2021 07:06:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59992) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m6A38-0005HL-FG for guix-patches@gnu.org; Wed, 21 Jul 2021 07:06:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52899) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m6A38-0007P3-7O for guix-patches@gnu.org; Wed, 21 Jul 2021 07:06:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m6A38-0004ki-32 for guix-patches@gnu.org; Wed, 21 Jul 2021 07:06:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49670] [PATCH] gnu: gnome-maps: Update to 3.38.5. References: <20210720223452.9471-1-leo.prikler@student.tugraz.at> In-Reply-To: <20210720223452.9471-1-leo.prikler@student.tugraz.at> Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Jul 2021 11:06:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49670 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49670@debbugs.gnu.org Received: via spool by 49670-submit@debbugs.gnu.org id=B49670.162686556018259 (code B ref 49670); Wed, 21 Jul 2021 11:06:02 +0000 Received: (at 49670) by debbugs.gnu.org; 21 Jul 2021 11:06:00 +0000 Received: from localhost ([127.0.0.1]:36212 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m6A35-0004kR-Vu for submit@debbugs.gnu.org; Wed, 21 Jul 2021 07:06:00 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:45263) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m6A33-0004kH-4x for 49670@debbugs.gnu.org; Wed, 21 Jul 2021 07:05:58 -0400 Received: from localhost.localdomain (80-121-26-175.adsl.highway.telekom.at [80.121.26.175]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4GVCS16Bbkz3x7s for <49670@debbugs.gnu.org>; Wed, 21 Jul 2021 13:05:53 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1626865553; bh=pVIb3J5f5BOfpSjTREJIHVzF/dkpACAwTGvVWOUd5ig=; h=From:To:Subject:Date; b=VJEF+AxyIsERZBxYsVSL9mfChRKJiXqbH6EN4BRt0Et4t+G8R4ZP/H+jCKt7naM6L Wiv3pFXC/aBhopEsOuzhpL+7QG/BKuwjIzYfRiYC9GdF7t+WJ19tQ7gtf4mB0xfO4n 6/k3aoEjOpw/VypOB9R0rx1ppjFf9Y1ocYRMtaJs= From: Leo Prikler Date: Wed, 21 Jul 2021 13:04:31 +0200 Message-Id: <20210721110431.21634-1-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/geo.scm (gnome-maps): Update to 3.38.5. --- As expected, 3.36 is quite dead and a fix for this issue already exists in 3.38. We could backport their patch, but it turns out 3.38.5 builds with a minor patch. gnu/packages/geo.scm | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 37be78edbf..8b71f5b03c 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -210,7 +210,7 @@ topology functions.") (define-public gnome-maps (package (name "gnome-maps") - (version "3.36.7") + (version "3.38.5") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -218,7 +218,7 @@ topology functions.") name "-" version ".tar.xz")) (sha256 (base32 - "09rgw8hq3ligap1zzjhx25q354ficpbiw1z9ramghhcqbpylsxdh")))) + "1llgzm2ni3iy31dznqkc81vadv0fpqgpz2l9zzrj5jshvyq0akgh")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t @@ -236,6 +236,15 @@ topology functions.") (("@pkgdatadir@/org.gnome.Maps") (string-append (assoc-ref outputs "out") "/bin/gnome-maps"))) #t)) + (add-after 'unpack 'fix-broken-tests + (lambda _ + ;; For some reason setting LC_ALL=C and LANG=C as done in the + ;; build system does not prevent these gratuitous commas from + ;; being inserted. + (substitute* "tests/utilsTest.js" + (("1001 m") "1,001 m") + (("1000 ft") "1,000 ft") + (("5282 ft") "5,282 ft")))) (add-after 'install 'wrap (lambda* (#:key inputs outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))