Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

lilypond: update to 2.23.9 #36394

Merged
merged 3 commits into from Jun 1, 2022
Merged

lilypond: update to 2.23.9 #36394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d2e8ad2
lilypond: update to 2.23.9
newbluemoon Mar 28, 2022
602ff97
lilypond-doc: update to 2.23.9
newbluemoon Mar 28, 2022
2825292
guile1.8: remove
newbluemoon Mar 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 0 additions & 6 deletions common/shlibs
View file
Open in desktop
Expand Up @@ -3107,12 +3107,6 @@ libprotoc.so.31 libprotoc-3.20.1_1
libprotobuf.so.31 libprotobuf-3.20.1_1
libsombok.so.3 sombok-2.4.0_1
libdeviceclient.so.0 pragha-1.3.3_1
libguile-srfi-srfi-1-v-3.so.3 guile1.8-1.8.8_1
libguile-srfi-srfi-4-v-3.so.3 guile1.8-1.8.8_1
libguile-srfi-srfi-60-v-2.so.2 guile1.8-1.8.8_1
libguile.so.17 guile1.8-1.8.8_1
libguilereadline-v-17.so.17 guile1.8-1.8.8_1
libguile-srfi-srfi-13-14-v-3.so.3 guile1.8-1.8.8_1
libykclient.so.3 ykclient-2.15_1
libbooster.so.0 cppcms-1.0.5_1
libcppcms.so.1 cppcms-1.0.5_1
Expand Down
1 change: 0 additions & 1 deletion srcpkgs/guile1.8-devel
View file
Open in desktop

This file was deleted.

25 changes: 0 additions & 25 deletions srcpkgs/guile1.8/patches/cross.patch
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions srcpkgs/guile1.8/patches/musl-longlong.patch
View file
Open in desktop

This file was deleted.

49 changes: 0 additions & 49 deletions srcpkgs/guile1.8/patches/musl-sigcontext.patch
View file
Open in desktop

This file was deleted.

34 changes: 0 additions & 34 deletions srcpkgs/guile1.8/template
View file
Open in desktop

This file was deleted.

7 changes: 4 additions & 3 deletions srcpkgs/lilypond-doc/template
View file
Open in desktop
@@ -1,14 +1,15 @@
# Template file for 'lilypond-doc'
pkgname=lilypond-doc
version=2.23.6
# should be kept in sync with 'lilypond'
version=2.23.9
revision=1
create_wrksrc=yes
short_desc="Documentation for the lilypond music engraving program"
maintainer="newbluemoon <blaumolch@mailbox.org>"
license="GPL-3.0-or-later, GFDL-1.3-or-later"
homepage="https://lilypond.org/"
distfiles="https://lilypond.org/downloads/binaries/documentation/lilypond-${version}-1.documentation.tar.bz2"
checksum=1fada73c22dbcfa6224744a8ad87e10cced784f98fd9243768c96ee5bc0ee45d
distfiles="https://gitlab.com/lilypond/lilypond/-/releases/v${version}/downloads/lilypond-${version}-documentation.tar.xz"
checksum=519bdd88e0f347049db3b1d6ed71458c3b4781dc20bdd3c5be00c0fabb6160ba

do_install() {
vmkdir usr
Expand Down
14 changes: 7 additions & 7 deletions srcpkgs/lilypond/template
View file
Open in desktop
@@ -1,28 +1,28 @@
# Template file for 'lilypond'
pkgname=lilypond
Comment on lines 1 to 2
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we should add a notice near the top of lilypond and lilypond-doc that they should be kept in sync like it's done in vala and valadoc

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

version=2.23.6
# should be kept in sync with 'lilypond-doc'
version=2.23.9
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 bison flex fontforge gettext guile1.8 perl
hostmakedepends="autogen automake bison flex fontforge gettext perl
pkg-config python3 t1utils tar texinfo texlive"
makedepends="gc-devel guile1.8-devel libltdl-devel pango-devel"
depends="ghostscript python3"
makedepends="gc-devel guile-devel libltdl-devel pango-devel"
depends="ghostscript guile python3"
checkdepends="ImageMagick rsync texi2html"
short_desc="Music engraving program"
maintainer="newbluemoon <blaumolch@mailbox.org>"
license="GPL-3.0-or-later, GFDL-1.3-or-later"
homepage="https://lilypond.org/"
distfiles="https://lilypond.org/downloads/sources/v2.23/lilypond-${version}.tar.gz"
checksum=a179bd974a0e64390efef5bb0cc1e7287f1218237548433adba51c4f25bba2ce
checksum=11204fab661a5324f55c607dc8f9363a47afc741563f8dc867cdd60c173b27db
python_version=3
make_check=ci-skip # ci fails, but all checks pass locally

if [ -n "${CROSS_BUILD}" ]; then
# needs guile-config-1.8
hostmakedepends+=" guile1.8-devel"
makedepends+=" libfl-devel"
fi

Expand Down
2 changes: 2 additions & 0 deletions srcpkgs/removed-packages/template
View file
Open in desktop
Expand Up @@ -106,6 +106,8 @@ replaces="
gst1-python<=1.18.3_1
gtkhtml-devel<=4.10.0_1
gtkhtml<=4.10.0_1
guile1.8-devel<=1.8.8_3
guile1.8<=1.8.8_3
gx-go<=1.9.0_1
httperf<=0.9.0_9
icecat-i18n-ach<=78.6.1_1
Expand Down