From patchwork Sat Sep 5 15:16:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Csepp X-Patchwork-Id: 23910 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 7711B27BBE7; Sat, 5 Sep 2020 16:50:13 +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, 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 ESMTPS id 81A7227BBE8 for ; Sat, 5 Sep 2020 16:50:09 +0100 (BST) Received: from localhost ([::1]:44840 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kEaS8-0005zS-FN for patchwork@mira.cbaines.net; Sat, 05 Sep 2020 11:50:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47028) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kEaS2-0005zB-6Q for guix-patches@gnu.org; Sat, 05 Sep 2020 11:50:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60616) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kEaS1-0006eZ-TN for guix-patches@gnu.org; Sat, 05 Sep 2020 11:50:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kEaS1-00055p-RP for guix-patches@gnu.org; Sat, 05 Sep 2020 11:50:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43223] [PATCH] Update Picard (with a small patch) Resent-From: raingloom Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 05 Sep 2020 15:50:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 43223 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43223@debbugs.gnu.org X-Debbugs-Original-To: Guix Patches Received: via spool by submit@debbugs.gnu.org id=B.159932094919511 (code B ref -1); Sat, 05 Sep 2020 15:50:01 +0000 Received: (at submit) by debbugs.gnu.org; 5 Sep 2020 15:49:09 +0000 Received: from localhost ([127.0.0.1]:43929 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kEaR7-00054a-Gw for submit@debbugs.gnu.org; Sat, 05 Sep 2020 11:49:09 -0400 Received: from lists.gnu.org ([209.51.188.17]:52740) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kEaR2-000547-AK for submit@debbugs.gnu.org; Sat, 05 Sep 2020 11:49:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46948) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kEaR2-0005pj-1h for guix-patches@gnu.org; Sat, 05 Sep 2020 11:49:00 -0400 Received: from mx1.riseup.net ([198.252.153.129]:59582) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kEaQw-0006bP-Pm for guix-patches@gnu.org; Sat, 05 Sep 2020 11:48:59 -0400 Received: from bell.riseup.net (bell-pn.riseup.net [10.0.1.178]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client CN "*.riseup.net", Issuer "Sectigo RSA Domain Validation Secure Server CA" (not verified)) by mx1.riseup.net (Postfix) with ESMTPS id 4BkJqn28BWzFpSW for ; Sat, 5 Sep 2020 08:48:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1599320933; bh=hBPDYzd33VpM+q+g+VHhYaryspOMPOdvagO9POm2HRs=; h=Date:From:To:Subject:From; b=ITk4OEJ6mQuCbp92o7jpyR/ExP190aj5ct9KBIfH4yqfIcBgxbQ9tvZEWUQHlYguS hGLqLdzOrsnKVz5SJ+YStRIlBCbGeuuodesC7mrlnaJFOXNkThdis/aNqfwPoZTv6O Zdl4Q1Fc7eMd9GQ24fTVqyZwQKxoaHehIUxXqWhM= X-Riseup-User-ID: F10B49389C31FEEDAC1C263976B4B41CDB93B2F3CE958E903020B91BCC90C9FE Received: from [127.0.0.1] (localhost [127.0.0.1]) by bell.riseup.net (Postfix) with ESMTPSA id 4BkJqm5XVlzJnZT for ; Sat, 5 Sep 2020 08:48:52 -0700 (PDT) Date: Sat, 5 Sep 2020 17:16:26 +0200 From: raingloom Message-ID: <20200905171626.5819def9@riseup.net> MIME-Version: 1.0 Received-SPF: pass client-ip=198.252.153.129; envelope-from=raingloom@riseup.net; helo=mx1.riseup.net X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/05 11:48:53 X-ACL-Warn: Detected OS = Linux 3.11 and newer [fuzzy] 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, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no 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 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 84bf2cd161b477bbe223eee3b72041401adc1062 Mon Sep 17 00:00:00 2001 From: raingloom 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