bug#41869: closed ([PATCH] gnu: libmateweather: Add patch to rename a timezone city.)

[GNU bug Tracking System]

Your message dated Wed, 17 Jun 2020 01:53:55 +0200
with message-id <ad202018-277a-a3ba-c2c2-e85fa585e9db@web.de>
and subject line Re: [bug#41869] [PATCH] gnu: libmateweather: Add patch to 
rename a timezone city.
has caused the debbugs.gnu.org bug report #41869,
regarding [PATCH] gnu: libmateweather: Add patch to rename a timezone city.
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs@gnu.org.)


-- 
41869: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=41869
GNU Bug Tracking System
Contact help-debbugs@gnu.org with problems
> --- Begin Message ---
>
>
>
> 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@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
>
>
>
>
> --- End Message ---
> --- Begin Message ---
>
>
>
> Subject: 
>
> Re: [bug#41869] [PATCH] gnu: libmateweather: Add patch to rename a timezone city.
>
>
>
>
> Date: 
>
> Wed, 17 Jun 2020 01:53:55 +0200
>
>
>
>
> User-agent: 
>
> Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Icedove/68.9.0
>
>
>
>
> 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
>
>
> --- End Message ---