From patchwork Mon Oct 9 20:06:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 54672 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 97DD527BBEA; Mon, 9 Oct 2023 21:09:55 +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 E830E27BBE9 for ; Mon, 9 Oct 2023 21:09:54 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qpwYp-0006zl-1w; Mon, 09 Oct 2023 16:09:03 -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 1qpwYX-0006em-VS for guix-patches@gnu.org; Mon, 09 Oct 2023 16:08:49 -0400 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 1qpwYX-0008Al-64 for guix-patches@gnu.org; Mon, 09 Oct 2023 16:08:45 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qpwYr-0002cs-Ty for guix-patches@gnu.org; Mon, 09 Oct 2023 16:09:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65479] [PATCH core-updates v3 44/63] gnu: vmpk: Drop docbook workaround. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 09 Oct 2023 20:09:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65479 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65479@debbugs.gnu.org Cc: Bruno Victal Received: via spool by 65479-submit@debbugs.gnu.org id=B65479.16968821109809 (code B ref 65479); Mon, 09 Oct 2023 20:09:05 +0000 Received: (at 65479) by debbugs.gnu.org; 9 Oct 2023 20:08:30 +0000 Received: from localhost ([127.0.0.1]:33370 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpwYH-0002Y7-GD for submit@debbugs.gnu.org; Mon, 09 Oct 2023 16:08:29 -0400 Received: from smtpmciv2.myservices.hosting ([185.26.107.238]:44314) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpwY7-0002Wj-KU for 65479@debbugs.gnu.org; Mon, 09 Oct 2023 16:08:20 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpmciv2.myservices.hosting (Postfix) with ESMTP id C657C20D92 for <65479@debbugs.gnu.org>; Mon, 9 Oct 2023 22:07:35 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 4D0B6800A0; Mon, 9 Oct 2023 22:07:35 +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 CucA1w8OC1_A; Mon, 9 Oct 2023 22:07:35 +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 7DA0D8009E; Mon, 9 Oct 2023 22:07:33 +0200 (CEST) From: Bruno Victal Date: Mon, 9 Oct 2023 21:06:32 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 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 * gnu/packages/music.scm (vmpk)[arguments]<#:phases>: Drop 'fix-docbook phase. [native-inputs]: Add docbook-xml-4.4. --- gnu/packages/music.scm | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 752d81e4b9..1d31e54f95 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -3128,23 +3128,12 @@ (define-public vmpk "0kh8pns9pla9c47y2nwckjpiihczg6rpg96aignsdsd7vkql69s9")))) (build-system cmake-build-system) (arguments - `(#:tests? #f ; no test target - #:phases - (modify-phases %standard-phases - (add-before 'configure 'fix-docbook - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "cmake_admin/CreateManpages.cmake" - (("http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl") - (string-append (assoc-ref inputs "docbook-xsl") - "/xml/xsl/docbook-xsl-" - ,(package-version docbook-xsl) - "/manpages/docbook.xsl"))) - #t))))) + `(#:tests? #f)) ; no test target (inputs (list drumstick qtbase-5 qtsvg-5 qtx11extras)) (native-inputs (list libxslt ;for xsltproc - docbook-xsl qttools-5 pkg-config)) + docbook-xml-4.4 docbook-xsl qttools-5 pkg-config)) (home-page "https://vmpk.sourceforge.io/") (synopsis "Virtual MIDI piano keyboard") (description