From patchwork Thu May 25 17:21:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 50326 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 3504727BBEA; Thu, 25 May 2023 18:23:22 +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.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 AA96E27BBE2 for ; Thu, 25 May 2023 18:23:21 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q2Eg6-0003wM-Eq; Thu, 25 May 2023 13:23:06 -0400 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 1q2Eg2-0003vR-Tj for guix-patches@gnu.org; Thu, 25 May 2023 13:23:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q2Eg2-0003LW-L7 for guix-patches@gnu.org; Thu, 25 May 2023 13:23:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q2Eg2-00044k-CD for guix-patches@gnu.org; Thu, 25 May 2023 13:23:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63721] [PATCH 1/2] gnu: mpd: Update to 0.23.13. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 25 May 2023 17:23:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63721 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63721@debbugs.gnu.org Cc: Bruno Victal Received: via spool by 63721-submit@debbugs.gnu.org id=B63721.168503532615573 (code B ref 63721); Thu, 25 May 2023 17:23:02 +0000 Received: (at 63721) by debbugs.gnu.org; 25 May 2023 17:22:06 +0000 Received: from localhost ([127.0.0.1]:47982 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q2Ef8-000437-C4 for submit@debbugs.gnu.org; Thu, 25 May 2023 13:22:06 -0400 Received: from smtpmciv2.myservices.hosting ([185.26.107.238]:57138) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q2Ef6-00042x-AS for 63721@debbugs.gnu.org; Thu, 25 May 2023 13:22:05 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpmciv2.myservices.hosting (Postfix) with ESMTP id 735C020DEF for <63721@debbugs.gnu.org>; Thu, 25 May 2023 19:21:48 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id E83BB80097; Thu, 25 May 2023 19:21:47 +0200 (CEST) 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 gDaBsnmeSsW7; Thu, 25 May 2023 19:21:47 +0200 (CEST) Received: from guix-nuc.home.arpa (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 529DD80060; Thu, 25 May 2023 19:21:47 +0200 (CEST) From: Bruno Victal Date: Thu, 25 May 2023 18:21:41 +0100 Message-Id: X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 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 Properly enable tests as well since meson misleadingly reported a success when clearly no tests were performed: ```````````````````````````````````` … starting phase `check' ninja: no work to do. No tests defined. phase `check' succeeded after 0.2 seconds starting phase `install' … ```````````````````````````````````` * gnu/packages/mpd.scm (mpd): Update to 0.23.13. [arguments]: Set #:configure-flags option to build tests. [native-inputs]: Add googletest, zip. Remove unused cmake. --- gnu/packages/mpd.scm | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) base-commit: 0c662d570eec2fe8879e49bd4ccc31950aeb9ef8 diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index 5005da4e87..3259217989 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -118,7 +118,7 @@ (define-public libmpdclient (define-public mpd (package (name "mpd") - (version "0.23.12") + (version "0.23.13") (source (origin (method url-fetch) (uri @@ -127,12 +127,13 @@ (define-public mpd "/mpd-" version ".tar.xz")) (sha256 (base32 - "1rq2hyfvwwri3sivab747csza2i096y7m8563rl5mhpchhiadz5p")))) + "06fmy68lfrsi5y03l53dnwcynqhwh5f5vhdpbsr8lzmvzgk02sx9")))) (build-system meson-build-system) (arguments (list #:configure-flags #~(list "-Ddocumentation=enabled" - "-Dsystemd=enabled") + "-Dsystemd=enabled" + "-Dtest=true") #:phases #~(modify-phases %standard-phases (add-after 'unpack 'enable-elogind @@ -182,7 +183,12 @@ (define-public mpd yajl zlib zziplib))) - (native-inputs (list cmake pkg-config python-sphinx)) + (native-inputs (list pkg-config python-sphinx googletest + ;; See test/meson.build for information about these + ;; additional dependencies. + ;; + ;; Used when zziplib feature is enabled. + zip)) ;; Missing optional inputs: ;; libcdio_paranoia ;; libmms From patchwork Thu May 25 17:21:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 50325 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 8130927BBE9; Thu, 25 May 2023 18:23:20 +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.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 6087827BBE2 for ; Thu, 25 May 2023 18:23:18 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q2Eg4-0003vm-I7; Thu, 25 May 2023 13:23:04 -0400 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 1q2Eg3-0003vU-3e for guix-patches@gnu.org; Thu, 25 May 2023 13:23:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q2Eg2-0003La-Rd for guix-patches@gnu.org; Thu, 25 May 2023 13:23:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q2Eg2-00044r-NS for guix-patches@gnu.org; Thu, 25 May 2023 13:23:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63721] [PATCH 2/2] gnu: mpd: Split outputs. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 25 May 2023 17:23:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63721 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63721@debbugs.gnu.org Cc: Bruno Victal Received: via spool by 63721-submit@debbugs.gnu.org id=B63721.168503533515594 (code B ref 63721); Thu, 25 May 2023 17:23:02 +0000 Received: (at 63721) by debbugs.gnu.org; 25 May 2023 17:22:15 +0000 Received: from localhost ([127.0.0.1]:47985 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q2EfG-00043R-NF for submit@debbugs.gnu.org; Thu, 25 May 2023 13:22:14 -0400 Received: from smtpmciv4.myservices.hosting ([185.26.107.240]:59478) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q2EfE-00043J-GH for 63721@debbugs.gnu.org; Thu, 25 May 2023 13:22:12 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpmciv4.myservices.hosting (Postfix) with ESMTP id E29AA2081F for <63721@debbugs.gnu.org>; Thu, 25 May 2023 19:22:06 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 4DEF180097; Thu, 25 May 2023 19:21:56 +0200 (CEST) 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 E-aiid_gqxvZ; Thu, 25 May 2023 19:21:55 +0200 (CEST) Received: from guix-nuc.home.arpa (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id A464780060; Thu, 25 May 2023 19:21:55 +0200 (CEST) From: Bruno Victal Date: Thu, 25 May 2023 18:21:42 +0100 Message-Id: X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 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 The HTML manual accounts for more than 40% of the package size. * gnu/packages/mpd.scm (mpd)[outputs]: Add 'html' output. [arguments]: Add split-package phase. --- gnu/packages/mpd.scm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index 3259217989..fa16e60484 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -146,7 +146,16 @@ (define-public mpd (("systemd_dep = declare_dependency" all) (string-append "_" all))) (substitute* "meson.build" - (("systemd_dep,") "systemd_dep, _systemd_dep,"))))))) + (("systemd_dep,") "systemd_dep, _systemd_dep,")))) + (add-after 'install 'split-package + (lambda _ + ;; The HTML manual accounts for over 40% of the disk + ;; space used by the package. + (let* ((path "/share/doc/mpd/html") + (htmldir (string-append #$output path)) + (htmldir* (string-append #$output:html path))) + (mkdir-p (dirname htmldir*)) + (rename-file htmldir htmldir*))))))) (inputs (append (if (target-linux?) (list liburing) '()) (list ao @@ -189,6 +198,7 @@ (define-public mpd ;; ;; Used when zziplib feature is enabled. zip)) + (outputs (list "out" "html")) ;; Missing optional inputs: ;; libcdio_paranoia ;; libmms