From patchwork Tue Feb 2 09:37:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 26824 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 1DFCD27BC1D; Tue, 2 Feb 2021 09:39:15 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED,URIBL_SBL,URIBL_SBL_A 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 4DE8627BC24 for ; Tue, 2 Feb 2021 09:39:10 +0000 (GMT) Received: from localhost ([::1]:37072 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l6s9N-0002rd-H5 for patchwork@mira.cbaines.net; Tue, 02 Feb 2021 04:39:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40238) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l6s9G-0002rI-St for guix-patches@gnu.org; Tue, 02 Feb 2021 04:39:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:50818) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l6s9G-0005qe-Lh for guix-patches@gnu.org; Tue, 02 Feb 2021 04:39:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1l6s9G-0006vH-IW for guix-patches@gnu.org; Tue, 02 Feb 2021 04:39:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#46254] [PATCH 0/2] gnu: clementine: Update to 1.4.0rc1-450. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 02 Feb 2021 09:39:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 46254 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 46254@debbugs.gnu.org X-Debbugs-Original-To: Guix-patches Received: via spool by submit@debbugs.gnu.org id=B.161225869226550 (code B ref -1); Tue, 02 Feb 2021 09:39:02 +0000 Received: (at submit) by debbugs.gnu.org; 2 Feb 2021 09:38:12 +0000 Received: from localhost ([127.0.0.1]:34131 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l6s8K-0006u2-Vg for submit@debbugs.gnu.org; Tue, 02 Feb 2021 04:38:12 -0500 Received: from lists.gnu.org ([209.51.188.17]:59216) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l6s8F-0006ta-TW for submit@debbugs.gnu.org; Tue, 02 Feb 2021 04:38:03 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:39998) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l6s8F-0002gk-A4 for guix-patches@gnu.org; Tue, 02 Feb 2021 04:37:59 -0500 Received: from mout.gmx.net ([212.227.17.20]:57647) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l6s8B-0005Im-5b for guix-patches@gnu.org; Tue, 02 Feb 2021 04:37:59 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1612258671; bh=7FdXzBCK/NTVvbAtOxER8dNbRB81KzE0a4yckkPV+7s=; h=X-UI-Sender-Class:From:To:Subject:Date; b=EJZAI04EtvXncbxTc7S7mGbSDhHPYmbrkhkctOilqxNZMgs9ueBT7rrGA7kJN0VVK D3ekY4s0vMt0KJo8Rw7mmAFtp+TyCo9ozPmlgnf1y9RV4aVpBTZZY8FPdVeNEexGxy Cjy+NoovFUsmRbFutcD8UBMhk6BIW+Z9PfJutEjY= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from labiere ([82.69.64.142]) by mail.gmx.net (mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MK3Rm-1lNyjp2W3a-00LUdv for ; Tue, 02 Feb 2021 10:37:51 +0100 User-agent: mu4e 1.4.14; emacs 27.1 From: Pierre Langlois Date: Tue, 02 Feb 2021 09:37:50 +0000 Message-ID: <87o8h2q07l.fsf@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:/GGGeBAmZi1+5THag+ChWet4t5ZMKJBL/8BT3xxTvHR0zmh6LMp 6rsHFHvQBYzDbF802a3W8oe8ytG7cqosK5sr1q2PrMBzYStArM3MxNM/i9xhEehDfcfnj1a M5zinUV56vql2e+1MbANc/qnID811S2mR7pCP10sAVMg4eWuaOYxBjq03VcjV4BhT1Bttfk bztO5+GJfuvD/QbTgcdDw== X-UI-Out-Filterresults: notjunk:1;V03:K0:2DoiklAkTKk=:PjWzgq5plvACfO3r/6wVij hGbkinS/andptOBmtCtZnFKuzEq8kcVq9dZDvDOa+Q0EpTCyaYjPM1hZL5W7wg0A26rxp5iGX X422MTMmdUFx6g9+GGbCmRxlQI5xMm02gw7Nx/kIhe4B0B0axlYd9GWa1stMjfNdHeSlmPbYR lOMj0HEV3Z0EL57vweZbUZAdc/CsTdr2uHtfY5rtG4ibNxDPwcHix5c/hVrRxCoLEPTARRYXa tX2XmwlDYW+Tb1dWIz2nvorlq+qtQLuqcBikJim0quQuD87NMzII7c1/rrwR3s4YtgqoNP9Ge b4wtuwH8/O4meTZMTHwGM9YtGhreh3VDefQEvj+ez26Tt897/G81eT4HM0mh7hpy7/FPmqfBo 3gOdfgbBx5351drCUZboiHFseknmcYyySPgc7G8qC+hEwlte3dQ8B9G46MpV1UQ/Kq6FRIWrv I8UDc1zyPJdMfkRRhdrwySDCYItwcWTWrQMb1xkIGTNkFrIzvJbiLoJjusVVg86/kxvkY6TVE B5+eqaKSTQzVWXJQ30XWg95zX6wbdfW0GMzkyXdNiUboePyYcD3S4fyNMQyU4mxmykcwxkq4s f5aR+wh09Jxj50RTKX0dgchCVOPFTtCqFqvsTpMJBND4Zr9WV9plPdd5fJAHd/AMHTCi7UVog W7qnztIbTtLqme7iCjdcQBDwwZuJ/CmzgF0ynqxhnEbDM+1JY6q4LFfAUr+NN1dE6ypBGuseL p5NERk24xLNcRT+qwUoBxQQcXc7VZRekuHirOi5SwcOux0V6svqF7bQmox0Msg62PVF0ozXLI FICjp5b9SIAPysyxSg0xqWSJa4ZYeTHb+e7acIpeZWcCMR1OvAV0gMsHDn9OYGSRWxbU/nEUU L3eIqAr1U/LRRDhWmYjg== Received-SPF: pass client-ip=212.227.17.20; envelope-from=pierre.langlois@gmx.com; helo=mout.gmx.net X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_SBL_A=0.1 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 Hi Guix! I've been sitting on this patch to update Clementine to 1.4 for quite a while, patiently waiting for upstream to do their final release. However since it appears to be broken on staging, I thought we should update it anyway, so here it is! I've picked the first pre-release that includes a fix for https://github.com/clementine-player/Clementine/issues/6701, which is the reason for the current breakable. I've split the re-indentation of the package definition in another commit, otherwise the diff is impossible to review :-). Let me know what you think! Thanks, Pierre From 02c3550bbf11a9d6a5f58265e95826085c92941d Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Tue, 2 Feb 2021 08:40:33 +0000 Subject: [PATCH 2/2] gnu: clementine: Indent. * gnu/packages/music.scm (clementine): Remove 'version' variable and one level of indentation. --- gnu/packages/music.scm | 205 ++++++++++++++++++++--------------------- 1 file changed, 102 insertions(+), 103 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 6d298746e8..89fa147150 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -338,111 +338,110 @@ score, keyboard, guitar, drum and controller views.") (license license:gpl3+))) (define-public clementine - (let ((version "1.4.0rc1-450-g2725ef99d")) - (package - (name "clementine") - (version version) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/clementine-player/Clementine") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1pcwwi9b2qcfjn748577gqx6d1hgg7cisw2dn43npwafdvvkdb90")) - (modules '((guix build utils) - (ice-9 regex))) - (snippet - '(begin - (use-modules ((ice-9 regex))) - (for-each - (lambda (dir) - ;; TODO: The following dependencies are still bundled: - ;; - "qxt": Appears to be unmaintained upstream. - ;; - "qsqlite" - ;; - "qtsingleapplication" - ;; - "qocoa" - ;; - "qtiocompressor" - (let ((bundled '("qsqlite" - "qtsingleapplication" - "qxt" - "qocoa" - "qtiocompressor"))) - (if (not - (string-match - (string-append ".?*(" (string-join bundled "|") ")") - dir)) - (delete-file-recursively dir)))) - (find-files "3rdparty" - (lambda (file stat) - (string-match "^3rdparty/[^/]*$" file)) - #:directories? #t)) - #t)))) - (build-system cmake-build-system) - (arguments - '(#:test-target "clementine_test" - #:configure-flags - (list ;; Requires unpackaged "projectm" - "-DENABLE_VISUALISATIONS=OFF" - ;; Otherwise it may try to download a non-free library at run-time. - ;; TODO In an origin snippet, remove the code that performs the - ;; download. - "-DHAVE_SPOTIFY_DOWNLOADER=FALSE" - ;; Clementine checks that the taglib version is higher than 1.11, - ;; because of https://github.com/taglib/taglib/issues/864. Remove - ;; this flag when 1.12 is released. - "-DUSE_SYSTEM_TAGLIB=TRUE") - #:phases - (modify-phases %standard-phases - (add-after 'install 'wrap-program - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (gst-plugin-path (getenv "GST_PLUGIN_SYSTEM_PATH"))) - (wrap-program (string-append out "/bin/clementine") - `("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path))) - #t)))))) - (native-inputs - `(("gettext" ,gettext-minimal) - ("googletest" ,googletest) - ("pkg-config" ,pkg-config) - ("qtlinguist" ,qttools))) - (inputs - `(("boost" ,boost) - ("chromaprint" ,chromaprint) - ("fftw" ,fftw) - ("glib" ,glib) - ("glu" ,glu) - ("gstreamer" ,gstreamer) - ("gst-plugins-base" ,gst-plugins-base) - ("gst-plugins-good" ,gst-plugins-good) - ("gst-libav" ,gst-libav) - ("libcdio" ,libcdio) - ("libmygpo-qt" ,libmygpo-qt) - ;; TODO: Package libgpod. - ("libmtp" ,libmtp) - ("libxml2" ,libxml2) - ("protobuf" ,protobuf) - ("pulseaudio" ,pulseaudio) - ("qtbase" ,qtbase) - ("qtx11extras" ,qtx11extras) - ("sqlite" ,sqlite) - ("sparsehash" ,sparsehash) - ("taglib" ,taglib))) - (home-page "https://clementine-player.org") - (synopsis "Music player and library organizer") - (description "Clementine is a multiplatform music player. It is inspired + (package + (name "clementine") + (version "1.4.0rc1-450-g2725ef99d") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/clementine-player/Clementine") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1pcwwi9b2qcfjn748577gqx6d1hgg7cisw2dn43npwafdvvkdb90")) + (modules '((guix build utils) + (ice-9 regex))) + (snippet + '(begin + (use-modules ((ice-9 regex))) + (for-each + (lambda (dir) + ;; TODO: The following dependencies are still bundled: + ;; - "qxt": Appears to be unmaintained upstream. + ;; - "qsqlite" + ;; - "qtsingleapplication" + ;; - "qocoa" + ;; - "qtiocompressor" + (let ((bundled '("qsqlite" + "qtsingleapplication" + "qxt" + "qocoa" + "qtiocompressor"))) + (if (not + (string-match + (string-append ".?*(" (string-join bundled "|") ")") + dir)) + (delete-file-recursively dir)))) + (find-files "3rdparty" + (lambda (file stat) + (string-match "^3rdparty/[^/]*$" file)) + #:directories? #t)) + #t)))) + (build-system cmake-build-system) + (arguments + '(#:test-target "clementine_test" + #:configure-flags + (list ;; Requires unpackaged "projectm" + "-DENABLE_VISUALISATIONS=OFF" + ;; Otherwise it may try to download a non-free library at run-time. + ;; TODO In an origin snippet, remove the code that performs the + ;; download. + "-DHAVE_SPOTIFY_DOWNLOADER=FALSE" + ;; Clementine checks that the taglib version is higher than 1.11, + ;; because of https://github.com/taglib/taglib/issues/864. Remove + ;; this flag when 1.12 is released. + "-DUSE_SYSTEM_TAGLIB=TRUE") + #:phases + (modify-phases %standard-phases + (add-after 'install 'wrap-program + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (gst-plugin-path (getenv "GST_PLUGIN_SYSTEM_PATH"))) + (wrap-program (string-append out "/bin/clementine") + `("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path))) + #t)))))) + (native-inputs + `(("gettext" ,gettext-minimal) + ("googletest" ,googletest) + ("pkg-config" ,pkg-config) + ("qtlinguist" ,qttools))) + (inputs + `(("boost" ,boost) + ("chromaprint" ,chromaprint) + ("fftw" ,fftw) + ("glib" ,glib) + ("glu" ,glu) + ("gstreamer" ,gstreamer) + ("gst-plugins-base" ,gst-plugins-base) + ("gst-plugins-good" ,gst-plugins-good) + ("gst-libav" ,gst-libav) + ("libcdio" ,libcdio) + ("libmygpo-qt" ,libmygpo-qt) + ;; TODO: Package libgpod. + ("libmtp" ,libmtp) + ("libxml2" ,libxml2) + ("protobuf" ,protobuf) + ("pulseaudio" ,pulseaudio) + ("qtbase" ,qtbase) + ("qtx11extras" ,qtx11extras) + ("sqlite" ,sqlite) + ("sparsehash" ,sparsehash) + ("taglib" ,taglib))) + (home-page "https://clementine-player.org") + (synopsis "Music player and library organizer") + (description "Clementine is a multiplatform music player. It is inspired by Amarok 1.4, focusing on a fast and easy-to-use interface for searching and playing your music.") - (license (list - ;; clementine and qtiocompressor are under GPLv3. - license:gpl3+ - ;; qxt is under CPL1.0. - license:cpl1.0 - ;; qsqlite and qtsingleapplication are under LGPL2.1+. - license:lgpl2.1+ - ;; qocoa is under MIT and CC by-sa for the icons. - license:cc-by-sa3.0))))) + (license (list + ;; clementine and qtiocompressor are under GPLv3. + license:gpl3+ + ;; qxt is under CPL1.0. + license:cpl1.0 + ;; qsqlite and qtsingleapplication are under LGPL2.1+. + license:lgpl2.1+ + ;; qocoa is under MIT and CC by-sa for the icons. + license:cc-by-sa3.0)))) (define-public cmus (package -- 2.30.0