unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Jonathan Brielmaier <jonathan.brielmaier@web.de>
To: 41869@debbugs.gnu.org
Cc: Jonathan Brielmaier <jonathan.brielmaier@web.de>
Subject: [bug#41869] [PATCH] gnu: libmateweather: Add patch to rename a timezone city.
Date: Mon, 15 Jun 2020 12:10:01 +0200	[thread overview]
Message-ID: <20200615101001.30670-1-jonathan.brielmaier@web.de> (raw)

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@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





             reply	other threads:[~2020-06-15 10:11 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-06-15 10:10 Jonathan Brielmaier [this message]
2020-06-15 10:29 ` [bug#41869] [PATCH] gnu: libmateweather: Add patch to rename a timezone city Efraim Flashner
2020-06-15 10:38   ` Jonathan Brielmaier
2020-06-16 23:53     ` bug#41869: " Jonathan Brielmaier

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200615101001.30670-1-jonathan.brielmaier@web.de \
    --to=jonathan.brielmaier@web.de \
    --cc=41869@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).