GNU bug report logs - #41869
[PATCH] gnu: libmateweather: Add patch to rename a timezone city.

Previous Next

Package: guix-patches;

Reported by: Jonathan Brielmaier <jonathan.brielmaier <at> web.de>

Date: Mon, 15 Jun 2020 10:11:01 UTC

Severity: normal

Tags: patch

Done: Jonathan Brielmaier <jonathan.brielmaier <at> web.de>

Bug is archived. No further changes may be made.

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 41869 in the body.
You can then email your comments to 41869 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

View this report as an mbox folder, status mbox, maintainer mbox


Report forwarded to guix-patches <at> gnu.org:
bug#41869; Package guix-patches. (Mon, 15 Jun 2020 10:11:02 GMT) Full text and rfc822 format available.

Acknowledgement sent to Jonathan Brielmaier <jonathan.brielmaier <at> web.de>:
New bug report received and forwarded. Copy sent to guix-patches <at> gnu.org. (Mon, 15 Jun 2020 10:11:02 GMT) Full text and rfc822 format available.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Jonathan Brielmaier <jonathan.brielmaier <at> web.de>
To: guix-patches <at> gnu.org
Cc: Jonathan Brielmaier <jonathan.brielmaier <at> web.de>
Subject: [PATCH] gnu: libmateweather: Add patch to rename a timezone city.
Date: Mon, 15 Jun 2020 12:10:01 +0200
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

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 <robert.buj <at> gmail.com>
+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 @@
+             -->
+           <name>Danmarkshavn</name>
+         </timezone>
+-        <timezone id="America/Godthab">
++        <timezone id="America/Nuuk">
+           <!-- The primary timezone for Greenland, although sources
+                seem to point towards calling the area "Western
+                Greenland" rathern than just "Greenland".
+@@ -6502,7 +6502,7 @@
+           <name>Thule AFB</name>
+         </timezone>
+       </timezones>
+-      <tz-hint>America/Godthab</tz-hint>
++      <tz-hint>America/Nuuk</tz-hint>
+       <city>
+         <!-- A city in Greenland.
+              The local name in Kalaallisut is "Uummannaq".
--
2.26.2





Information forwarded to guix-patches <at> gnu.org:
bug#41869; Package guix-patches. (Mon, 15 Jun 2020 10:31:02 GMT) Full text and rfc822 format available.

Message #8 received at 41869 <at> debbugs.gnu.org (full text, mbox):

From: Efraim Flashner <efraim <at> flashner.co.il>
To: Jonathan Brielmaier <jonathan.brielmaier <at> web.de>
Cc: 41869 <at> debbugs.gnu.org
Subject: Re: [bug#41869] [PATCH] gnu: libmateweather: Add patch to rename a
 timezone city.
Date: Mon, 15 Jun 2020 13:29:35 +0300
[Message part 1 (text/plain, inline)]
This looks like it could just be a snippet in the origin


-- 
Efraim Flashner   <efraim <at> flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted
[signature.asc (application/pgp-signature, inline)]

Information forwarded to guix-patches <at> gnu.org:
bug#41869; Package guix-patches. (Mon, 15 Jun 2020 10:40:02 GMT) Full text and rfc822 format available.

Message #11 received at 41869 <at> debbugs.gnu.org (full text, mbox):

From: Jonathan Brielmaier <jonathan.brielmaier <at> web.de>
To: Efraim Flashner <efraim <at> flashner.co.il>
Cc: 41869 <at> debbugs.gnu.org
Subject: Re: [bug#41869] [PATCH] gnu: libmateweather: Add patch to rename a
 timezone city.
Date: Mon, 15 Jun 2020 12:38:56 +0200
Could be, but I'm more a fan of patches because it will fail after the
next update of the package. Snippets are easier to forget for clean up...

On 15.06.20 12:29, Efraim Flashner wrote:
> This looks like it could just be a snippet in the origin




Information forwarded to guix-patches <at> gnu.org:
bug#41869; Package guix-patches. (Tue, 16 Jun 2020 23:55:01 GMT) Full text and rfc822 format available.

Message #14 received at 41869 <at> debbugs.gnu.org (full text, mbox):

From: Jonathan Brielmaier <jonathan.brielmaier <at> web.de>
To: Efraim Flashner <efraim <at> flashner.co.il>
Cc: 41869-close <at> debbugs.gnu.org, 41869 <at> debbugs.gnu.org
Subject: Re: [bug#41869] [PATCH] gnu: libmateweather: Add patch to rename a
 timezone city.
Date: Wed, 17 Jun 2020 01:53:55 +0200
Closing. Mathieu did it in e23ec7144c264902ac13fa75e01a206e4d907e5a

On 15.06.20 12:38, Jonathan Brielmaier wrote:
> Could be, but I'm more a fan of patches because it will fail after the
> next update of the package. Snippets are easier to forget for clean up...
>
> On 15.06.20 12:29, Efraim Flashner wrote:
>> This looks like it could just be a snippet in the origin




Reply sent to Jonathan Brielmaier <jonathan.brielmaier <at> web.de>:
You have taken responsibility. (Tue, 16 Jun 2020 23:55:02 GMT) Full text and rfc822 format available.

Notification sent to Jonathan Brielmaier <jonathan.brielmaier <at> web.de>:
bug acknowledged by developer. (Tue, 16 Jun 2020 23:55:02 GMT) Full text and rfc822 format available.

bug archived. Request was from Debbugs Internal Request <help-debbugs <at> gnu.org> to internal_control <at> debbugs.gnu.org. (Wed, 15 Jul 2020 11:24:07 GMT) Full text and rfc822 format available.

This bug report was last modified 3 years and 256 days ago.

Previous Next


GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.