From patchwork Sat Nov 11 16:45:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 56341 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 96E4B27BBE2; Sat, 11 Nov 2023 16:47:39 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,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 90D5227BBE9 for ; Sat, 11 Nov 2023 16:47:35 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r1r8l-0006CP-Sm; Sat, 11 Nov 2023 11:47:23 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r1r8k-0006BR-6o for guix-patches@gnu.org; Sat, 11 Nov 2023 11:47:22 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r1r8j-0006gE-V2 for guix-patches@gnu.org; Sat, 11 Nov 2023 11:47:21 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r1r9O-0006EN-2c for guix-patches@gnu.org; Sat, 11 Nov 2023 11:48:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67110] [PATCH] gnu: mympd: Update to 13.0.4. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 11 Nov 2023 16:48:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 67110 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67110@debbugs.gnu.org Cc: Bruno Victal X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.169972123923888 (code B ref -1); Sat, 11 Nov 2023 16:48:01 +0000 Received: (at submit) by debbugs.gnu.org; 11 Nov 2023 16:47:19 +0000 Received: from localhost ([127.0.0.1]:54382 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r1r8g-0006DE-OC for submit@debbugs.gnu.org; Sat, 11 Nov 2023 11:47:19 -0500 Received: from lists.gnu.org ([2001:470:142::17]:41644) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r1r8f-0006Cx-6d for submit@debbugs.gnu.org; Sat, 11 Nov 2023 11:47:17 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r1r7q-0005xs-IY for guix-patches@gnu.org; Sat, 11 Nov 2023 11:46:26 -0500 Received: from smtpmciv3.myservices.hosting ([185.26.107.239]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r1r7o-0006Sn-P5 for guix-patches@gnu.org; Sat, 11 Nov 2023 11:46:26 -0500 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpmciv3.myservices.hosting (Postfix) with ESMTP id 6712920951 for ; Sat, 11 Nov 2023 17:46:14 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id C18F480060; Sat, 11 Nov 2023 17:46:07 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id fOgylwKLqO_y; Sat, 11 Nov 2023 17:46:07 +0100 (CET) Received: from guix-nuc.home.arpa (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 3C0F48005B; Sat, 11 Nov 2023 17:46:07 +0100 (CET) From: Bruno Victal Date: Sat, 11 Nov 2023 16:45:41 +0000 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Received-SPF: pass client-ip=185.26.107.239; envelope-from=mirai@makinata.eu; helo=smtpmciv3.myservices.hosting X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/mpd.scm (mympd): Update to 13.0.4. [native-inputs]: Add jekyll. [outputs]: Add 'doc. [arguments]<#:configure-flags>: Install HTML documentation. Set correct value for localstatedir. <#:phases>: Add 'move-doc. Change-Id: Icadf6c2268a1ecbe928c3ba7ff5157b139a8b1df --- gnu/packages/mpd.scm | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) base-commit: af6105afc67a15a491a0a4fd18a28c9f801a0b94 diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index 0e762144a1..e4a36de5f1 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -57,6 +57,7 @@ (define-module (gnu packages mpd) #:use-module (gnu packages libusb) #:use-module (gnu packages lua) #:use-module (gnu packages readline) + #:use-module (gnu packages ruby) #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages curl) @@ -622,7 +623,7 @@ (define-public mpdevil (define-public mympd (package (name "mympd") - (version "12.1.1") + (version "13.0.4") (source (origin (method git-fetch) (uri (git-reference @@ -631,22 +632,29 @@ (define-public mympd (file-name (git-file-name name version)) (sha256 (base32 - "1bal31xmdmq46bi0qmia07sqcwy695vcz5y5hxwkz71rcfywbsf9")))) + "1jlmpjs4a2sr0kxqp4crnq9jzagdmn5ggdd8x44wl1cdw38glrfn")))) + (outputs '("out" "doc")) (build-system cmake-build-system) (arguments (list #:configure-flags - #~(list "-DMYMPD_BUILD_TESTING=ON" - ;; Handled by 'strip' phase. - "-DMYMPD_STRIP_BINARY=OFF") + #~(list "-DCMAKE_INSTALL_LOCALSTATEDIR=/var" + "-DMYMPD_BUILD_TESTING=ON" + "-DMYMPD_DOC_HTML=ON") #:phases #~(modify-phases %standard-phases (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? ;; The following test requires network connectivity. - (invoke "ctest" "--exclude-regex" "test_http_client"))))))) - (native-inputs (list jq perl pkg-config)) + (invoke "ctest" "--exclude-regex" "test_http_client")))) + (add-after 'install 'move-doc + (lambda _ + (let ((old (string-append #$output "/share/doc")) + (new (string-append #$output:doc "/share/doc"))) + (mkdir-p (dirname new)) + (rename-file old new))))))) + (native-inputs (list jekyll jq perl pkg-config)) (inputs (list flac libid3tag lua openssl pcre2)) (home-page "https://jcorporation.github.io/") (synopsis "Web-based MPD client")