From 478043e795ef81496809e4c6b33d1ccbcac466fb Mon Sep 17 00:00:00 2001 From: newbluemoon Date: Mon, 2 Nov 2020 14:41:02 +0100 Subject: [PATCH 1/2] lilypond: update to 2.21.80 also: * switch to python3 * clean up *depends --- srcpkgs/lilypond/template | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/srcpkgs/lilypond/template b/srcpkgs/lilypond/template index ba073098e02..253dd698d7f 100644 --- a/srcpkgs/lilypond/template +++ b/srcpkgs/lilypond/template @@ -1,30 +1,28 @@ # Template file for 'lilypond' pkgname=lilypond -version=2.21.7 +version=2.21.80 revision=1 build_wrksrc="build" build_style="gnu-configure" configure_script="../configure" configure_args="--disable-documentation ac_cv_func_isinf=yes --with-texgyre-dir=/usr/share/texmf-dist/fonts/opentype/public/tex-gyre" -hostmakedepends="autogen automake flex fontforge gettext gnupg guile1.8 pkg-config - t1utils tar texinfo texlive" -makedepends="gc-devel guile1.8-devel libltdl-devel pango-devel python-devel" -depends="python ghostscript" +hostmakedepends="autogen automake bison flex fontforge gettext guile1.8 perl + pkg-config python3 t1utils tar texinfo texlive" +makedepends="gc-devel guile1.8-devel libltdl-devel pango-devel" +depends="ghostscript python3" short_desc="Music engraving program" maintainer="newbluemoon " license="GPL-3.0-or-later, GFDL-1.3-or-later" homepage="https://lilypond.org/" distfiles="https://lilypond.org/downloads/sources/v2.21/lilypond-${version}.tar.gz" -checksum=058a18558944305aa7b8bca1a1098dce33a177cf108ed7eafeecdc0e7dd754ff -python_version=2 +checksum=64296eff097e5c5bd0b27a45ea2261b151099534d886119a414eb8947e34aec4 +python_version=3 if [ -n "${CROSS_BUILD}" ]; then - # needs guile-config-1.8 and python-config - hostmakedepends+=" guile1.8-devel python-devel" + # needs guile-config-1.8 + hostmakedepends+=" guile1.8-devel" makedepends+=" libfl-devel" - configure_args+=" --with-python-lib=python2.7 - --with-python-include=${XBPS_CROSS_BASE}/usr/include/python2.7" fi post_extract() { From 65bbd12b736d881eaec7830be2e45f045bcca412 Mon Sep 17 00:00:00 2001 From: newbluemoon Date: Mon, 2 Nov 2020 14:41:18 +0100 Subject: [PATCH 2/2] lilypond-doc: update to 2.21.80 --- srcpkgs/lilypond-doc/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/lilypond-doc/template b/srcpkgs/lilypond-doc/template index 03f6cf43237..7c89018651f 100644 --- a/srcpkgs/lilypond-doc/template +++ b/srcpkgs/lilypond-doc/template @@ -1,6 +1,6 @@ # Template file for 'lilypond-doc' pkgname=lilypond-doc -version=2.21.7 +version=2.21.80 revision=1 create_wrksrc=yes short_desc="Documentation for the lilypond music engraving program" @@ -8,7 +8,7 @@ maintainer="newbluemoon " license="GPL-3.0-or-later, GFDL-1.3-or-later" homepage="http://lilypond.org/" distfiles="http://lilypond.org/downloads/binaries/documentation/lilypond-${version}-1.documentation.tar.bz2" -checksum=d6ed668e48752803acaa430b7529a13d7eba5e05ec4864170d3aa5729eb66de7 +checksum=052fa2af076cf9b6ac0005b04e649327d38842f3213dee41774b8c29ff55d3b0 do_install() { vmkdir usr