From 7b207e08492998bb91ac99f703f193d32dfee31e Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Tue, 2 Feb 2021 08:16:22 +0000 Subject: gnu: clementine: Update to 1.4.0rc1-450. * gnu/packages/music.scm (clementine): Update to 1.4.0rc1-450. [source]: Adapt snippet to list bundled directories to keep rather than ones to delete. Unbundled gmock. Remove patches no longer needed. [arguments]: Set -DUSE_SYSTEM_TAGLIB=TRUE. [native-inputs]: Add googletest. [inputs]: Remove openssl. [license]: Remove gmock license. * gnu/packages/patches/clementine-fix-sqlite.patch: Remove. * gnu/packages/patches/clementine-remove-crypto++-dependency.patch: Remvoe * gnu/packages/patches/clementine-use-openssl.patch: Remove. * gnu/local.mk (dist_patch_DATA): Remove them. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/music.scm | 72 ++++++++++++++++++++++++-------------------------- 1 file changed, 34 insertions(+), 38 deletions(-) (limited to 'gnu/packages/music.scm') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 7d2958685b..a39f9fc3d9 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -11,7 +11,7 @@ ;;; Copyright © 2017 nikita ;;; Copyright © 2017 Rodger Fox ;;; Copyright © 2017, 2018, 2019, 2020, 2021 Nicolas Goaziou -;;; Copyright © 2017, 2018, 2019 Pierre Langlois +;;; Copyright © 2017, 2018, 2019, 2021 Pierre Langlois ;;; Copyright © 2017 Arun Isaac ;;; Copyright © 2017–2021 Tobias Geerinckx-Rice ;;; Copyright © 2018 nee @@ -337,53 +337,48 @@ and play MIDI files with a few clicks in a user-friendly interface offering score, keyboard, guitar, drum and controller views.") (license license:gpl3+))) -;; We don't use the latest release because it depends on Qt4. Instead we -;; download the sources from the tip of the "qt5" branch. (define-public clementine - (let ((commit "4619a4c1ab3b17b13d4b2327ad477912917eaf36") - (revision "2")) + (let ((version "1.4.0rc1-450-g2725ef99d")) (package (name "clementine") - (version (git-version "1.3.1" revision commit)) + (version version) (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/clementine-player/Clementine") - (commit commit))) + (commit version))) (file-name (git-file-name name version)) (sha256 (base32 - "1hximk3q0p8nw8is5w7215xgkb7k4flnfyr0pdz9svfwvcm05w1i")) - (modules '((guix build utils))) + "1pcwwi9b2qcfjn748577gqx6d1hgg7cisw2dn43npwafdvvkdb90")) + (modules '((guix build utils) + (ice-9 regex))) (snippet '(begin + (use-modules ((ice-9 regex))) (for-each (lambda (dir) - (delete-file-recursively - (string-append "3rdparty/" dir))) - (list - ;; TODO: The following dependencies are still bundled: - ;; - "qxt": Appears to be unmaintained upstream. - ;; - "qsqlite" - ;; - "qtsingleapplication" - ;; - "qocoa" - ;; - "qtiocompressor" - ;; - "gmock": The tests crash when using our googletest - ;; package instead of the bundled gmock. - "SPMediaKeyTap" - "fancytabwidget" - "google-breakpad" - "libmygpo-qt" - "libmygpo-qt5" - "libprojectm" - "qtwin" - "sha2" ;; Replaced by openssl. - "taglib" - "tinysvcmdns")) - #t)) - (patches (search-patches "clementine-use-openssl.patch" - "clementine-remove-crypto++-dependency.patch" - "clementine-fix-sqlite.patch")))) + ;; 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" @@ -394,7 +389,10 @@ score, keyboard, guitar, drum and controller views.") ;; TODO In an origin snippet, remove the code that performs the ;; download. "-DHAVE_SPOTIFY_DOWNLOADER=FALSE" - "-DUSE_SYSTEM_SHA2=TRUE") + ;; 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 @@ -406,6 +404,7 @@ score, keyboard, guitar, drum and controller views.") #t)))))) (native-inputs `(("gettext" ,gettext-minimal) + ("googletest" ,googletest) ("pkg-config" ,pkg-config) ("qtlinguist" ,qttools))) (inputs @@ -423,7 +422,6 @@ score, keyboard, guitar, drum and controller views.") ;; TODO: Package libgpod. ("libmtp" ,libmtp) ("libxml2" ,libxml2) - ("openssl" ,openssl) ("protobuf" ,protobuf) ("pulseaudio" ,pulseaudio) ("qtbase" ,qtbase) @@ -439,8 +437,6 @@ playing your music.") (license (list ;; clementine and qtiocompressor are under GPLv3. license:gpl3+ - ;; gmock is under BSD-3. - license:bsd-3 ;; qxt is under CPL1.0. license:cpl1.0 ;; qsqlite and qtsingleapplication are under LGPL2.1+. -- cgit v1.2.3