From patchwork Mon Dec 26 03:32:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: jgart X-Patchwork-Id: 45584 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 3DE3B27BBED; Mon, 26 Dec 2022 03:33:23 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 22E1A27BBE9 for ; Mon, 26 Dec 2022 03:33:22 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p9eEZ-0006k9-No; Sun, 25 Dec 2022 22:33:03 -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 1p9eEY-0006iU-Mb for guix-patches@gnu.org; Sun, 25 Dec 2022 22:33:02 -0500 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 1p9eEY-0001LC-3e for guix-patches@gnu.org; Sun, 25 Dec 2022 22:33:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p9eEX-00021l-Qo for guix-patches@gnu.org; Sun, 25 Dec 2022 22:33:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60330] [PATCH v2 Draft] gnu: lilypond: Update to 2.24.0 References: <20221226032737.31606-1-jgart@dismail.de> In-Reply-To: <20221226032737.31606-1-jgart@dismail.de> Resent-From: jgart Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 26 Dec 2022 03:33:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60330 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60330@debbugs.gnu.org Cc: jgart Received: via spool by 60330-submit@debbugs.gnu.org id=B60330.16720255727779 (code B ref 60330); Mon, 26 Dec 2022 03:33:01 +0000 Received: (at 60330) by debbugs.gnu.org; 26 Dec 2022 03:32:52 +0000 Received: from localhost ([127.0.0.1]:50473 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p9eEN-00021N-OK for submit@debbugs.gnu.org; Sun, 25 Dec 2022 22:32:52 -0500 Received: from mx1.dismail.de ([78.46.223.134]:38278) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p9eEM-000219-1l for 60330@debbugs.gnu.org; Sun, 25 Dec 2022 22:32:50 -0500 Received: from mx1.dismail.de (localhost [127.0.0.1]) by mx1.dismail.de (OpenSMTPD) with ESMTP id f293fce4 for <60330@debbugs.gnu.org>; Mon, 26 Dec 2022 04:32:43 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=dismail.de; h=from:to:cc :subject:date:message-id:mime-version:content-type :content-transfer-encoding; s=20190914; bh=HndMNYNhx1u+J9iHnPCEG DZA39iCB6UQdDXRmq+89J4=; b=sdW/s++ZKnrCDXR8AyZdd21k4Wq2dx2Y0JcSj GgBeazY2Dc9boNBVGOYDXJX8Kvr6NFtPwdWTDDKJGvX10TMF6my3x/hrmZkJ0byN O5qKk1hGAR1gSPfHTb4BFmyusEqF1UE9xqND5ssoggn6Om15oa/tvIsghsgPqtEn LqTXMIqoPa1Y8B5R1Q41chf6WMfWCcrzZu26SwO5Av6zg2OfI5/37wzikhSFvi2p NUgQ47khenjbW8iCX9sAqFfOZT1MARZgdG0jzCiwHzxvtsoLSWNPkB0sFUBWjM6K dqagOB4Qtg86v7UMpMkWhWI8L3bRTbky3TIc1Z+xb+Vfm+r4A== Received: from smtp2.dismail.de ( [10.240.26.12]) by mx1.dismail.de (OpenSMTPD) with ESMTP id 785d75fa for <60330@debbugs.gnu.org>; Mon, 26 Dec 2022 04:32:43 +0100 (CET) Received: from smtp2.dismail.de (localhost [127.0.0.1]) by smtp2.dismail.de (OpenSMTPD) with ESMTP id fe1f68ea for <60330@debbugs.gnu.org>; Mon, 26 Dec 2022 04:32:43 +0100 (CET) Received: by dismail.de (OpenSMTPD) with ESMTPSA id 85372226 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Mon, 26 Dec 2022 04:32:42 +0100 (CET) Date: Sun, 25 Dec 2022 21:32:22 -0600 Message-Id: <20221226033221.32096-1-jgart@dismail.de> X-Mailer: git-send-email 2.38.1 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: , Reply-to: jgart X-ACL-Warn: , jgart via Guix-patches X-Patchwork-Original-From: jgart via Guix-patches via From: jgart 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 (lilypond): Update to 2.24.0 [arguments]: Remove adjust-to-API-change, prepare-configuration, and install-info phases. Use disable-documentation flag and GUILE_FLAVOUR environment variable. Remove make-flags keyword option. [inputs]: Add extractpdfmark and update guile to 3.0. [native-inputs]: Update Python 2 to 3 and add missing texlive-fontinst and texlive-lm --- gnu/packages/music.scm | 67 +++++++++++++----------------------------- 1 file changed, 21 insertions(+), 46 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 5be767a138..1727fdbbdf 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -49,6 +49,7 @@ ;;; Copyright © 2022 Maxim Cournoyer ;;; Copyright © 2022 Wamm K. D. ;;; Copyright © 2022 Jose G Perez Taveras +;;; Copyright © 2022 jgart ;;; ;;; This file is part of GNU Guix. ;;; @@ -1385,7 +1386,7 @@ (define-public ninjas2 (define-public lilypond (package (name "lilypond") - (version "2.20.0") + (version "2.24.0") (source (origin (method url-fetch) @@ -1393,60 +1394,32 @@ (define-public lilypond "v" (version-major+minor version) "/" "lilypond-" version ".tar.gz")) (sha256 - (base32 "0qd6pd4siss016ffmcyw5qc6pr2wihnvrgd4kh1x725w7wr02nar")))) + (base32 "0scbyzbxqnzgibls62npg2i3sywnb146gw7jlvinj9dhj8xvxv9w")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ;out-test/collated-files.html fails - #:out-of-source? #t - #:make-flags '("conf=www") ;to generate images for info manuals - #:configure-flags - (list "CONFIGURATION=www" - (string-append "--with-texgyre-dir=" - (assoc-ref %build-inputs "font-tex-gyre") - "/share/fonts/opentype/")) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-path-references - (lambda _ - (substitute* "scm/backend-library.scm" - (("\\(search-executable '\\(\"gs\"\\)\\)") - (string-append "\"" (which "gs") "\"")) - (("\"/bin/sh\"") - (string-append "\"" (which "sh") "\""))))) - (add-after 'fix-path-references 'adjust-to-API-change - (lambda _ - (substitute* '("Documentation/pictures/GNUmakefile" - "stepmake/stepmake/tex-rules.make") - ((".*-c .setpdfwrite.*") "")) - (substitute* "scm/backend-library.scm" - (("\"-c.setpdfwrite\"") "")) - (substitute* "scm/framework-ps.scm" - (("\".setpdfwrite ") "\"")))) - (add-before 'configure 'prepare-configuration - (lambda _ - (substitute* "configure" - (("SHELL=/bin/sh") "SHELL=sh") - ;; When checking the fontforge version do not consider the - ;; version string that's part of the directory. - (("head -n") "tail -n") - ;; Also allow for SOURCE_DATE_EPOCH = 0 in fontforge. - (("20110222") "19700101")) - (setenv "out" "www") - (setenv "conf" "www"))) - (add-after 'install 'install-info - (lambda _ - (invoke "make" - "-j" (number->string (parallel-job-count)) - "conf=www" "install-info")))))) + (list #:tests? #f ;out-test/collated-files.html fails + #:out-of-source? #t + #:configure-flags + #~(list "--disable-documentation" "GUILE_FLAVOR=guile-3.0") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-path-references + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "scm/backend-library.scm" + (("\\(search-executable '\\(\"gs\"\\)\\)") + (string-append "\"" (search-input-file inputs "bin/gs") "\"")) + (("\"/bin/sh\"") + (string-append "\"" (search-input-file inputs "bin/sh") "\"")))))))) (inputs - `(("guile" ,guile-1.8) + `(("guile" ,guile-3.0) + ("extractpdfmark" ,extractpdfmark) ("font-dejavu" ,font-dejavu) ("font-tex-gyre" ,font-tex-gyre) ("fontconfig" ,fontconfig) ("freetype" ,freetype) ("ghostscript" ,ghostscript) ("pango" ,pango) - ("python" ,python-2))) + ("python" ,python))) (native-inputs `(("bison" ,bison) ("perl" ,perl) @@ -1458,7 +1431,9 @@ (define-public lilypond ("netpbm" ,netpbm) ;for pngtopnm ("texlive" ,(texlive-updmap.cfg (list texlive-metapost texlive-epsf + texlive-fontinst texlive-lh + texlive-lm texlive-latex-cyrillic))) ("texinfo" ,texinfo) ("texi2html" ,texi2html-1.82)