From 4347472dc9fadfb90d495851ceffbe7ac7283332 Mon Sep 17 00:00:00 2001 From: newbluemoon Date: Sun, 18 Dec 2022 20:49:28 +0100 Subject: [PATCH 1/2] lilypond: update to 2.24.0 --- srcpkgs/lilypond/template | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/srcpkgs/lilypond/template b/srcpkgs/lilypond/template index 0b013b631b37..44733475974f 100644 --- a/srcpkgs/lilypond/template +++ b/srcpkgs/lilypond/template @@ -1,12 +1,13 @@ # Template file for 'lilypond' # should be kept in sync with 'lilypond-doc' pkgname=lilypond -version=2.23.82 +version=2.24.0 revision=1 build_wrksrc="build" build_style="gnu-configure" configure_script="../configure" configure_args="--disable-documentation ac_cv_func_isinf=yes" +make_install_args="vimdir=/usr/share/vim/vimfiles" hostmakedepends="autogen automake bison flex fontforge gettext perl pkg-config python3 t1utils tar texinfo texlive gsfonts" makedepends="gc-devel guile-devel libltdl-devel pango-devel" @@ -17,7 +18,7 @@ maintainer="newbluemoon " license="GPL-3.0-or-later, GFDL-1.3-or-later" homepage="https://lilypond.org/" distfiles="https://lilypond.org/downloads/sources/v${version%.*}/lilypond-${version}.tar.gz" -checksum=043c736ffe4e783dbb3b134d38192f87fe78d2bd2a8287c7cbbdfd7acc5a22c3 +checksum=3cedbe3b92b02569e3a6f2f0674858967b3da278d70aa3e98aef5bdcd7f78b69 python_version=3 make_check=ci-skip # ci sometimes fails, but all checks pass locally @@ -35,11 +36,6 @@ pre_configure() { cd .. && ./autogen.sh --noconfigure } -post_install() { - vmkdir usr/share/vim - mv $DESTDIR/usr/share/lilypond/${version}/vim $DESTDIR/usr/share/vim/vim82 -} - do_check() { make ${makejobs} CPU_COUNT=${makejobs#-j} test-baseline make ${makejobs} CPU_COUNT=${makejobs#-j} check From a67ee5690b511a937ef82092fdcbf75a388b1ae9 Mon Sep 17 00:00:00 2001 From: newbluemoon Date: Sun, 18 Dec 2022 20:49:46 +0100 Subject: [PATCH 2/2] lilypond-doc: update to 2.24.0 --- 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 2809bdcb3fa5..cb38e68ab5e6 100644 --- a/srcpkgs/lilypond-doc/template +++ b/srcpkgs/lilypond-doc/template @@ -1,14 +1,14 @@ # Template file for 'lilypond-doc' # should be kept in sync with 'lilypond' pkgname=lilypond-doc -version=2.23.82 +version=2.24.0 revision=1 short_desc="Documentation for the lilypond music engraving program" maintainer="newbluemoon " license="GPL-3.0-or-later, GFDL-1.3-or-later" homepage="https://lilypond.org/" distfiles="https://gitlab.com/lilypond/lilypond/-/releases/v${version}/downloads/lilypond-${version}-documentation.tar.xz" -checksum=26057c60d69b538b19a49b32f863e33d0ec723d50906443f88696270ffe830f7 +checksum=1322c696ed76498dae9d8201f90e982a5c1fc270a51de78c0979d4104a9070bd do_install() { vmkdir usr/share