From patchwork Sat Sep 24 05:39:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: kiasoc5 X-Patchwork-Id: 42900 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 9CED327BBEA; Sat, 24 Sep 2022 06:53:42 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1085227BBE9 for ; Sat, 24 Sep 2022 06:53:42 +0100 (BST) Received: from localhost ([::1]:50158 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oby6f-0002z3-4K for patchwork@mira.cbaines.net; Sat, 24 Sep 2022 01:53:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55230) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1obxxL-0006jw-NT for guix-patches@gnu.org; Sat, 24 Sep 2022 01:44:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43033) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1obxxK-0007Xa-25 for guix-patches@gnu.org; Sat, 24 Sep 2022 01:44:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1obxxJ-0004KW-OM for guix-patches@gnu.org; Sat, 24 Sep 2022 01:44:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58037] [PATCH] gnu: picard: Update to 2.8.3, modernize package. Resent-From: kiasoc5 Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 24 Sep 2022 05:44:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 58037 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 58037@debbugs.gnu.org Cc: kiasoc5 X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.166399818916576 (code B ref -1); Sat, 24 Sep 2022 05:44:01 +0000 Received: (at submit) by debbugs.gnu.org; 24 Sep 2022 05:43:09 +0000 Received: from localhost ([127.0.0.1]:42111 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1obxwT-0004JI-8U for submit@debbugs.gnu.org; Sat, 24 Sep 2022 01:43:09 -0400 Received: from lists.gnu.org ([209.51.188.17]:54392) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1obxwR-0004J9-R2 for submit@debbugs.gnu.org; Sat, 24 Sep 2022 01:43:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55324) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1obxwJ-0006V8-50 for guix-patches@gnu.org; Sat, 24 Sep 2022 01:42:59 -0400 Received: from knopi.disroot.org ([178.21.23.139]:50178) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1obxw0-0007RX-7V for guix-patches@gnu.org; Sat, 24 Sep 2022 01:42:46 -0400 Received: by disroot.org (Postfix, from userid 107) id 86A584BC78; Sat, 24 Sep 2022 07:39:28 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1663997968; bh=2tbPus13K4WZWZYV4q3P3xKylpMJUgFCZkGhYbOHlcQ=; h=From:To:Cc:Subject:Date; b=MXinwpYhpA8LrVXD+EtAKzOtsSnuznBOSWfZDR0wuuFdMifG81jwzLeeMJz4UAfzO q2cgYaItBWZBWRik1Aiuznsj4JGEIqQwHy43Bv00yfNF2Gk1Y/R29Mv8h8L9kN44wY gWPxGLLnJ38tCqHcpYVyUhtjV+8bocXriDxLkcVha+UPsY1L1Z1qkK+m5aHjI7LagU T1fomvf6tIVh8Bn2tRm+pEjwgco1IPavXG6tZ6Bzzp+J5niUHz/8uSyIfzW0NCmItI MXZHrdJBbEvoCjYcEBCRskB0EUBFVc5KVzTiEOO56LJczf7Z0J0kqSma60G+81w2lr xD2tdPczmlIdg== Date: Sat, 24 Sep 2022 01:39:00 -0400 Message-Id: <79238a8ccadaf28f35de0e78c8a7649967d0ef12.1663997932.git.kiasoc5@disroot.org> Mime-Version: 1.0 Received-SPF: pass client-ip=178.21.23.139; envelope-from=kiasoc5@disroot.org; helo=knopi.disroot.org X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, SPF_HELO_NONE=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" Reply-to: kiasoc5 X-ACL-Warn: , kiasoc5 via Guix-patches X-Patchwork-Original-From: kiasoc5 via Guix-patches via From: kiasoc5 X-getmail-retrieved-from-mailbox: Patches * gnu/packages/music.scm (picard): Update to 2.8.3. [source]: Remove patch. [arguments]: Use G-expressions. Remove trailing #t. [native-inputs]: Remove input labels. [inputs]: Add python-fasteners, python-pyyaml, python-markdown, python-pyjwt. Remove a transitive dependency on QtWebKit. See for more information about this change. * gnu/packages/patches/picard-fix-id3-rename-test.patch: Remove it. * gnu/local.mk (dist_path_DATA): Update accordingly. --- gnu/local.mk | 1 - gnu/packages/music.scm | 47 ++++++++++--------- .../patches/picard-fix-id3-rename-test.patch | 11 ----- 3 files changed, 26 insertions(+), 33 deletions(-) delete mode 100644 gnu/packages/patches/picard-fix-id3-rename-test.patch base-commit: cbe8391d7c570a12416acfbfbbb818404d8b9203 diff --git a/gnu/local.mk b/gnu/local.mk index ef1bae5f3c..74de2f7517 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1648,7 +1648,6 @@ dist_patch_DATA = \ %D%/packages/patches/phoronix-test-suite-fsdg.patch \ %D%/packages/patches/php-bug-74093-test.patch \ %D%/packages/patches/php-curl-compat.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/pinball-system-ltdl.patch \ diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 66b4beae0c..db0522609c 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -3524,7 +3524,7 @@ (define-public pianobar (define-public picard (package (name "picard") - (version "2.4.4") + (version "2.8.3") (source (origin (method url-fetch) (uri (string-append @@ -3532,30 +3532,35 @@ (define-public picard "picard/picard-" version ".tar.gz")) (sha256 (base32 - "1c5l7i43jaj3s4wklc0cba6nn2x9cmpcggk4q4h9m1bci2xilsiy")) - (patches (search-patches "picard-fix-id3-rename-test.patch")))) + "0h4yk1y4k23hkfk7k2in27rd34ani857m0vvn7xa8vxizz951dka")))) (build-system python-build-system) (arguments - '(#:use-setuptools? #f - #:configure-flags - (list "--root=/" - ;; Don't phone home or show ‘Check for Update…’ in the Help menu. - "--disable-autoupdate") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-source - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "picard/const/__init__.py" - (("pyfpcalc") - (string-append - "pyfpcalc', '" - (assoc-ref inputs "chromaprint") "/bin/fpcalc"))) - #t))))) + (list + #:use-setuptools? #f + #:configure-flags + #~(list "--root=/" + ;; Don't phone home or show ‘Check for Update…’ in the Help menu. + "--disable-autoupdate") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-source + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "picard/const/__init__.py" + (("pyfpcalc") + (string-append + "pyfpcalc', '" + (assoc-ref inputs "chromaprint") "/bin/fpcalc")))))))) (native-inputs - `(("gettext" ,gettext-minimal) - ("python-dateutil" ,python-dateutil))) + (list gettext-minimal python-dateutil)) (inputs - (list chromaprint python-discid python-pyqt python-mutagen)) + (list chromaprint + python-discid + python-pyqt-without-qtwebkit + python-mutagen + python-fasteners + python-pyyaml + python-markdown + python-pyjwt)) (home-page "https://picard.musicbrainz.org/") (synopsis "Graphical music tagging application") (description diff --git a/gnu/packages/patches/picard-fix-id3-rename-test.patch b/gnu/packages/patches/picard-fix-id3-rename-test.patch deleted file mode 100644 index 3c4fa63c84..0000000000 --- a/gnu/packages/patches/picard-fix-id3-rename-test.patch +++ /dev/null @@ -1,11 +0,0 @@ -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)