From patchwork Mon Jun 15 10:10:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Brielmaier X-Patchwork-Id: 22718 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 EF81B27BBE3; Mon, 15 Jun 2020 11:11:39 +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, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, 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 ESMTP id B7A6B27BBE1 for ; Mon, 15 Jun 2020 11:11:37 +0100 (BST) Received: from localhost ([::1]:54378 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jkm5Y-0004pe-Vm for patchwork@mira.cbaines.net; Mon, 15 Jun 2020 06:11:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46950) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jkm50-0004gG-L9 for guix-patches@gnu.org; Mon, 15 Jun 2020 06:11:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33738) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jkm50-000321-BQ for guix-patches@gnu.org; Mon, 15 Jun 2020 06:11:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jkm50-0003MZ-6E for guix-patches@gnu.org; Mon, 15 Jun 2020 06:11:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41869] [PATCH] gnu: libmateweather: Add patch to rename a timezone city. Resent-From: Jonathan Brielmaier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 15 Jun 2020 10:11:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 41869 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 41869@debbugs.gnu.org Cc: Jonathan Brielmaier X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.159221582812863 (code B ref -1); Mon, 15 Jun 2020 10:11:01 +0000 Received: (at submit) by debbugs.gnu.org; 15 Jun 2020 10:10:28 +0000 Received: from localhost ([127.0.0.1]:45284 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jkm4O-0003LN-Ji for submit@debbugs.gnu.org; Mon, 15 Jun 2020 06:10:28 -0400 Received: from lists.gnu.org ([209.51.188.17]:55138) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jkm4J-0003LA-5G for submit@debbugs.gnu.org; Mon, 15 Jun 2020 06:10:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46840) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jkm4I-00045W-Rt for guix-patches@gnu.org; Mon, 15 Jun 2020 06:10:18 -0400 Received: from mout.web.de ([217.72.192.78]:56023) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jkm4D-0002gD-P5 for guix-patches@gnu.org; Mon, 15 Jun 2020 06:10:18 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1592215810; bh=Zu5Zb4/MKTf65MOnAEn7H4147/M383hEQPsZiVAzdoI=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=Zt63Wy8npJBoKxjRl7P3/Zzahi/VwwOJRwPzt1q4bqmzLS5Aa1llA8iole04XVhjI HBQtuavWO4OwNMPPt2j2iU4aNBLUgKBuI3O/zhOT2uIYlU92O9ec3c9khxhb29F+qr v/bIp8XPB7uJ9iFq84Qm+2KSrssYbTGPkVVKGaqA= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Received: from x250.fritz.box ([88.152.184.127]) by smtp.web.de (mrweb102 [213.165.67.124]) with ESMTPSA (Nemesis) id 0MUnYm-1jPr380tyO-00Y6tt; Mon, 15 Jun 2020 12:10:10 +0200 From: Jonathan Brielmaier Date: Mon, 15 Jun 2020 12:10:01 +0200 Message-Id: <20200615101001.30670-1-jonathan.brielmaier@web.de> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 X-Provags-ID: V03:K1:gOE21ElBPi5SfPFbiR7wqzCLRKCyp6jq6XI5RVYIih2dg8Aejrf B/KO8CtKFXd+alazPDO1/cHEqxkosdJs86YtS3d5itKecvOq8CWPYYyDvIn89FH0Vsta+Ky Tzf9pHa5kI3wyVOmgZTlNe+/1sYT9C8DHt7iN9IrIFab8Fc8tr2JvBHlfM8B1yalOi68Zoy ZXrP++alIJnK4mNQHBPpA== X-UI-Out-Filterresults: notjunk:1;V03:K0:SWm7psR4B3k=:xVvdAI7i9ghEM3at/qJj2a H0VSVHx1DtNK58T7JuYTKIKRy8A/96ZWpJYE25vB4EB16JxiCXdab5TVRMIEohJQXDknQwJX4 aiYONlQ7ToKt1npJ76ZTkoqEbN+97KzqO8fBFUpqNwi2xZaN7UcWOQP8gpfeCcWOqDHYQTxt4 kj6/xoJkVrJJQxhTPnAW8jawNCjbi4p7m4ygvKf+nUD4SZKgwfoB0uTH7AFRYFz5CqZF9Q3Kl Ch8ypA3exmdZjdnWUVlxUe1XtVnOcZUq2on+soJdvkVd9nnDUC1z1RXScgDh1idQx7rQDgPpL LQrPIgxsGb7SUW2CifF0NfX9//9liFSvcwNvdb6HzM3lVT15bi8+bHpT4BatkRWljJSPRXtxT PPEYSAjtty4pSEIF9GHMqxjRHxkLch/MOh+5tgft61mXR3byCQnUAan5h4qsYVxc4moM/iYqH t5bFkOnOSwK8oWH2pJ17XX3nP/5KnRI3PovSsxUrnksguGV8eqwgnv8JkekOjH6LJ5xjFUtPk kGcfk7nG7E1t1PwtCoSfmhl946SCNjkKJS6+frOe6SORNQjZPPjmtwfU5MybimUn9NN62jdu5 5IcmwM654HcNjlb+IZCp4l0uqv576H52FSEKsrn8iDheig5be4qZyBkP9UjpMCXTW+YOMQUAK 3gj+/23cgRAIyu3/ZfPGxJzrKDkOZheBBbOp0+3YakbvtxgH97Ntf0LBpM1VdvqB4fyUgG2by KuzQKmlFMBQFQX/tqM0IjsjgJAu3zPHN3sMcod5CqGzjGz1o78J64QonCxoch28raXb6aUTIK Quu6WQls7/2HXyeQz5p9qNNdMyYTNnYziC+E8frtg2yvXKJUzJE8i9SUcFZHAmdm6OLjLXCai 7kA2afOe+BlaAFJVz03kN2UQ96WkziS0SCqrSdr4dA7cHpaoXrEOi/nXW9LjJYLR5q2u4iwtT XAUEnwUo8ideC5tp5Cl4Z8yqKVq4gYcln2tTaEjOxyApMKjSvXuv9SdkucDD64tnTLxLMz6zU mTHr/ngYf4qVnGUZIzckFHfALgG9jADB0Y1dheJL0jVMapCx71uzYPBQY1Z0f4vfPBHFqtBft 1MdectmVz8H+TYXAqSmwih+DlGLcrKhiM470edhutYmvKMLTAdnr3NoDWN8ovBOBUHBuRk6k7 c8I5Av/3eVxAHaf7vC/LeUzumaruclJ9AHwsxPy5r1kvtdbqpNegJ+4UU5x69O7Q5dAk32Mi4 hnugfQUR58QzuoWLL Received-SPF: pass client-ip=217.72.192.78; envelope-from=jonathan.brielmaier@web.de; helo=mout.web.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/15 06:10:10 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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 This let the check phase succeed again. * gnu/packages/mate.scm (libmateweather)[source]: Add patch. * gnu/packages/patches/libmateweather-rename-godthab-to-nuuk.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. --- gnu/local.mk | 1 + gnu/packages/mate.scm | 4 ++- ...ibmateweather-rename-godthab-to-nuuk.patch | 34 +++++++++++++++++++ 3 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/libmateweather-rename-godthab-to-nuuk.patch -- 2.26.2 diff --git a/gnu/local.mk b/gnu/local.mk index 7333427850..c6293e4b1c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1186,6 +1186,7 @@ dist_patch_DATA = \ %D%/packages/patches/libmad-length-check.patch \ %D%/packages/patches/libmad-md_size.patch \ %D%/packages/patches/libmad-mips-newgcc.patch \ + %D%/packages/patches/libmateweather-rename-godthab-to-nuuk.patch \ %D%/packages/patches/libmp4v2-c++11.patch \ %D%/packages/patches/libmpeg2-arm-private-symbols.patch \ %D%/packages/patches/libmpeg2-global-symbol-test.patch \ diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index 8b548b5d8e..9b5d49b164 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -264,7 +264,9 @@ desktop and the mate-about program.") name "-" version ".tar.xz")) (sha256 (base32 - "094mnlczxq9crjj8z7dzs1zmwscdkbp54l3qjaf4a4bhd8lihv8d")))) + "094mnlczxq9crjj8z7dzs1zmwscdkbp54l3qjaf4a4bhd8lihv8d")) + (patches + (search-patches "libmateweather-rename-godthab-to-nuuk.patch")))) (build-system gnu-build-system) (arguments '(#:configure-flags diff --git a/gnu/packages/patches/libmateweather-rename-godthab-to-nuuk.patch b/gnu/packages/patches/libmateweather-rename-godthab-to-nuuk.patch new file mode 100644 index 0000000000..2cbe32d7b5 --- /dev/null +++ b/gnu/packages/patches/libmateweather-rename-godthab-to-nuuk.patch @@ -0,0 +1,34 @@ +https://github.com/mate-desktop/libmateweather/pull/77 +Makes check phase green again. + +From ea13e06563fb5fa53f8a9643156a64825e986acb Mon Sep 17 00:00:00 2001 +From: rbuj +Date: Fri, 22 May 2020 20:19:57 +0200 +Subject: [PATCH] Locations: America/Godthab was renamed to America/Nuuk + +--- + data/Locations.xml.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/data/Locations.xml.in b/data/Locations.xml.in +index 5488867..62529b9 100644 +--- a/data/Locations.xml.in ++++ b/data/Locations.xml.in +@@ -6482,7 +6482,7 @@ + --> + Danmarkshavn + +- ++ +