Subject: bug#43223: closed (Re: [bug#43223] [PATCH] Update Picard (with a small patch))

From: [email-masked] (GNU bug Tracking System)
Date: Mon, 05 Oct 2020 08:40:02 +0000

Your bug report

#43223: [PATCH] Update Picard (with a small patch)

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
43223: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=43223
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: [bug#43223] [PATCH] Update Picard (with a small patch)
From: Ludovic Courtès <[email-masked]>
To: raingloom <[email-masked]>
Cc: [email-masked]
Date: Mon, 05 Oct 2020 10:39:26 +0200
List-Id: <debbugs-submit.debbugs.gnu.org>

Hi,

raingloom <[email-masked]> skribis:

>>>From b0480dd5a9367a31ff3b4f8948011ce9986e7da2 Mon Sep 17 00:00:00 2001
> From: raingloom <[email-masked]>
> Date: Sat, 5 Sep 2020 16:55:57 +0200
> Subject: [PATCH 1/2] gnu: Update python-mutagen to 1.45.1.
>
> * gnu/packages/music.scm (python-mutagen): Update python-mutagen to 1.45.1.
>   [native-inputs]: Add python-hypothesis and python-flake8.

[...]

>>>From 84bf2cd161b477bbe223eee3b72041401adc1062 Mon Sep 17 00:00:00 2001
> From: raingloom <[email-masked]>
> Date: Sat, 5 Sep 2020 17:00:05 +0200
> Subject: [PATCH 2/2] gnu: Update picard to 2.4.4 with patch.
>
> * gnu/packages/music.scm (picard): Update to 2.4.4.
>   [native-inputs]: Add python-dateutil.
>   [source]: Add temporary patch to fix failing test due to missing "."
>   	    in temporary filename.
> * gnu/packages/patches/picard-fix-id3-rename-test.patch: New file.
> * gnu/local.mk (dist_patch_DATA): Add it.

Applied both, thank you, and sorry for the delay!

Ludo’.

Subject: [PATCH] Update Picard (with a small patch)
From: raingloom <[email-masked]>
To: Guix Patches <[email-masked]>
Date: Sat, 5 Sep 2020 17:16:26 +0200
List-Id: <debbugs-submit.debbugs.gnu.org>

There are still some warnings printed, but I'll be honest, I have no
idea what they mean.
Everything seems to be working, so here is the patch.

Needed a small patch to fix a text. I'm not too jazzed about having to
log into GitHub of all things to send a pull request (because they
don't have issue tracking enabled), but I'll try to poke the fix
to them with a long stick.

Anyways, hopefully my commit messages are better now. ^u^
>From b0480dd5a9367a31ff3b4f8948011ce9986e7da2 Mon Sep 17 00:00:00 2001
From: raingloom <[email-masked]>
Date: Sat, 5 Sep 2020 16:55:57 +0200
Subject: [PATCH 1/2] gnu: Update python-mutagen to 1.45.1.

* gnu/packages/music.scm (python-mutagen): Update python-mutagen to 1.45.1.
  [native-inputs]: Add python-hypothesis and python-flake8.
---
 gnu/packages/music.scm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 2b7fc7c72b..bbbb0d6819 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -2850,16 +2850,18 @@ formats, looking up tracks through metadata and audio fingerprints.")
 (define-public python-mutagen
   (package
     (name "python-mutagen")
-    (version "1.38")
+    (version "1.45.1")
     (source (origin
               (method url-fetch)
               (uri (pypi-uri "mutagen" version))
               (sha256
                (base32
-                "0rl7sxn1rcjl48fwga3dqf9f6pzspsny4ngxyf6pp337mrq0z693"))))
+                "1qdk6i8gyhbi1c4j5jmbfpac3q8sff2ysri1pnp7nb9wzcp615v3"))))
     (build-system python-build-system)
     (native-inputs
-     `(("python-pytest" ,python-pytest)))
+     `(("python-pytest" ,python-pytest)
+       ("python-hypothesis" ,python-hypothesis)
+       ("python-flake8" ,python-flake8)))
     (home-page "https://bitbucket.org/lazka/mutagen")
     (synopsis "Read and write audio tags")
     (description "Mutagen is a Python module to handle audio metadata.  It
-- 
2.28.0

>From 84bf2cd161b477bbe223eee3b72041401adc1062 Mon Sep 17 00:00:00 2001
From: raingloom <[email-masked]>
Date: Sat, 5 Sep 2020 17:00:05 +0200
Subject: [PATCH 2/2] gnu: Update picard to 2.4.4 with patch.

* gnu/packages/music.scm (picard): Update to 2.4.4.
  [native-inputs]: Add python-dateutil.
  [source]: Add temporary patch to fix failing test due to missing "."
  	    in temporary filename.
* gnu/packages/patches/picard-fix-id3-rename-test.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
---
 gnu/local.mk                                          |  1 +
 gnu/packages/music.scm                                |  8 +++++---
 gnu/packages/patches/picard-fix-id3-rename-test.patch | 11 +++++++++++
 3 files changed, 17 insertions(+), 3 deletions(-)
 create mode 100644 gnu/packages/patches/picard-fix-id3-rename-test.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 3b97b8fdf3..67c67a8bc8 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1417,6 +1417,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/perl-module-pluggable-search.patch	\
   %D%/packages/patches/perl-reproducible-build-date.patch	\
   %D%/packages/patches/perl-www-curl-remove-symbol.patch	\
+  %D%/packages/patches/picard-fix-id3-rename-test.patch		\
   %D%/packages/patches/picprog-non-intel-support.patch		\
   %D%/packages/patches/pidgin-add-search-path.patch		\
   %D%/packages/patches/pidgin-libnm.patch			\
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index bbbb0d6819..a4cd1a9daa 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -2807,7 +2807,7 @@ event-based scripts for scrobbling, notifications, etc.")
 (define-public picard
   (package
     (name "picard")
-    (version "2.1.3")
+    (version "2.4.4")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -2815,7 +2815,8 @@ event-based scripts for scrobbling, notifications, etc.")
                     "picard/picard-" version ".tar.gz"))
               (sha256
                (base32
-                "19w5k3bf4886gdycxjds9nkjvir0gwy2r5cqkz0lbls4ikk4y14f"))))
+                "1c5l7i43jaj3s4wklc0cba6nn2x9cmpcggk4q4h9m1bci2xilsiy"))
+              (patches (search-patches "picard-fix-id3-rename-test.patch"))))
     (build-system python-build-system)
     (arguments
      '(#:use-setuptools? #f
@@ -2834,7 +2835,8 @@ event-based scripts for scrobbling, notifications, etc.")
                  (assoc-ref inputs "chromaprint") "/bin/fpcalc")))
              #t)))))
     (native-inputs
-     `(("gettext" ,gettext-minimal)))
+     `(("gettext" ,gettext-minimal)
+       ("python-dateutil" ,python-dateutil)))
     (inputs
      `(("chromaprint" ,chromaprint)
        ("python-discid" ,python-discid)
diff --git a/gnu/packages/patches/picard-fix-id3-rename-test.patch b/gnu/packages/patches/picard-fix-id3-rename-test.patch
new file mode 100644
index 0000000000..3c4fa63c84
--- /dev/null
+++ b/gnu/packages/patches/picard-fix-id3-rename-test.patch
@@ -0,0 +1,11 @@
+Index: b/test/formats/test_id3.py
+===================================================================
+--- a/test/formats/test_id3.py
++++ b/test/formats/test_id3.py
+@@ -266,5 +266,5 @@
+         def test_rename_txxx_tags(self):
+             file_path = os.path.join('test', 'data', 'test-id3-rename-tags.mp3')
+-            filename = self.copy_file_tmp(file_path, 'mp3')
++            filename = self.copy_file_tmp(file_path, '.mp3')
+             raw_metadata = load_raw(filename)
+             self.assertIn('TXXX:Artists', raw_metadata)
-- 
2.28.0