diff options
-rw-r--r-- | .SRCINFO | 66 | ||||
-rw-r--r-- | .gitignore | 4 | ||||
-rw-r--r-- | PKGBUILD | 106 | ||||
-rw-r--r-- | no_fontforge-versioncheck.patch | 12 |
4 files changed, 96 insertions, 92 deletions
@@ -1,33 +1,55 @@ pkgbase = lilypond-devel - pkgdesc = An automated music engraving system (development version) - pkgver = 2.19.83 + pkgdesc = Lilypond music engraving program (development release) + pkgver = 2.25.14 pkgrel = 1 - url = http://lilypond.org/ - arch = i686 + url = https://lilypond.org arch = x86_64 - license = GPL + groups = pro-audio + license = FDL1.3 + license = GPL3 + license = custom:OFL + makedepends = fontconfig makedepends = fontforge - makedepends = gsfonts + makedepends = freetype2 + makedepends = glib2 + makedepends = imagemagick + makedepends = pango + makedepends = python + makedepends = rsync makedepends = t1utils - makedepends = ghostscript + makedepends = texinfo makedepends = texlive-core makedepends = tex-gyre-fonts makedepends = texlive-langcyrillic - makedepends = dblatex - depends = fontconfig - depends = freetype2 - depends = guile1.8 - depends = pango - depends = glib2 - depends = python2 - optdepends = extractpdfmark: for reducing the size of pdf output significantly - optdepends = tk: for the gui - provides = lilypond=2.19.83 + makedepends = texlive-metapost + makedepends = texlive-fontutils + makedepends = texlive-plaingeneric + makedepends = zip + depends = gcc-libs + depends = ghostscript + depends = glibc + depends = gsfonts + depends = guile2.2 + depends = guile + optdepends = python: for lilypond-book and other scripts + optdepends = tex-gyre-fonts: for extra fonts + optdepends = ttf-dejavu: for extra fonts + provides = lilypond=${pkgver} conflicts = lilypond - source = http://lilypond.org/downloads/sources/v2.19/lilypond-2.19.83.tar.gz - source = no_fontforge-versioncheck.patch - sha256sums = 96ba4f4b342d21057ad74d85d647aea7e47a5c24f895127c2b3553a252738fb3 - sha256sums = e74391f718babb984c5f637397162cf096c4716f5b9a21346ec76035cfc80817 + source = https://lilypond.org/downloads/sources/v2.25/lilypond-2.25.14.tar.gz + sha512sums = 8daec6bd6f30507a4cefe9815cba9e8fa0174571db6e2b58cfa98a87a48ee99a262d284c19f81e0f5b2b2d6e5d806bf6cdf8a10ca81b22285d8a0902ce01febb + b2sums = aa735b27f7490ffd191002b83958073076c0c12671fc5273efd73dadca6cb2f0ba04bdb867484b096a54ee4677ed07ba59afacb1cc4dee31c779ee541f6c4d18 pkgname = lilypond-devel - + depends = gcc-libs + depends = ghostscript + depends = glibc + depends = gsfonts + depends = guile2.2 + depends = guile + depends = libfontconfig.so + depends = libfreetype.so + depends = libglib-2.0.so + depends = libgobject-2.0.so + depends = libpangoft2-1.0.so + depends = libpango-1.0.so diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000000..91f1c1027e95 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +/* +!/.gitignore +!/PKGBUILD +!/.SRCINFO @@ -1,71 +1,61 @@ -# Contributor: Patrick McCarty <pnorcks at gmail dot com> -# Maintainer: Stefan Husmann <stefan-husmann@t-online.de> +# Maintainer: David Seus <cryptointerest at posteo dot de> +# Contributor: lis +# Contributor: Robert Kubosz <kubosz.robert@gmail.com> +# Contributor: David Runge <dvzrv@archlinux.org> +# Contributor: Evgeniy Alekseev <arcanis at archlinux dot org> +# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Geoffroy Carrier <geoffroy@archlinux.org> +# Contributor: William Rea <sillywilly@gmail.com> +# Contributor: Robert Emil Berge <filoktetes@linuxophic.org> pkgname=lilypond-devel -pkgver=2.19.83 +_pkgname=lilypond +pkgver=2.25.14 pkgrel=1 -pkgdesc="An automated music engraving system (development version)" -arch=('i686' 'x86_64') -url="http://lilypond.org/" -license=('GPL') -depends=('fontconfig' - 'freetype2' - 'guile1.8' - 'pango' - 'glib2' - 'python2') -makedepends=('fontforge' - 'gsfonts' - 't1utils' - 'ghostscript' - 'texlive-core' - 'tex-gyre-fonts' - 'texlive-langcyrillic' - 'dblatex') -optdepends=('extractpdfmark: for reducing the size of pdf output significantly' - 'tk: for the gui') -provides=("lilypond=$pkgver") +pkgdesc="Lilypond music engraving program (development release)" +arch=('x86_64') +url="https://lilypond.org" +license=('FDL1.3' 'GPL3' 'custom:OFL') +groups=('pro-audio') +# NOTE: use guile only with 2.24.x +depends=('gcc-libs' 'ghostscript' 'glibc' 'gsfonts' 'guile2.2' 'guile') +makedepends=('fontconfig' 'fontforge' 'freetype2' 'glib2' 'imagemagick' 'pango' +'python' 'rsync' 't1utils' 'texinfo' 'texlive-core' 'tex-gyre-fonts' +'texlive-langcyrillic' 'texlive-metapost' 'texlive-fontutils' +'texlive-plaingeneric' 'zip') +optdepends=( + 'python: for lilypond-book and other scripts' + 'tex-gyre-fonts: for extra fonts' + 'ttf-dejavu: for extra fonts' +) +provides=('lilypond=${pkgver}') conflicts=('lilypond') -source=("http://lilypond.org/downloads/sources/v2.19/lilypond-${pkgver}.tar.gz" "no_fontforge-versioncheck.patch") -sha256sums=('96ba4f4b342d21057ad74d85d647aea7e47a5c24f895127c2b3553a252738fb3' - 'e74391f718babb984c5f637397162cf096c4716f5b9a21346ec76035cfc80817') +source=("https://lilypond.org/downloads/sources/v${pkgver%.*}/$_pkgname-$pkgver.tar.gz") +sha512sums=('8daec6bd6f30507a4cefe9815cba9e8fa0174571db6e2b58cfa98a87a48ee99a262d284c19f81e0f5b2b2d6e5d806bf6cdf8a10ca81b22285d8a0902ce01febb') +b2sums=('aa735b27f7490ffd191002b83958073076c0c12671fc5273efd73dadca6cb2f0ba04bdb867484b096a54ee4677ed07ba59afacb1cc4dee31c779ee541f6c4d18') prepare() { - cd lilypond-$pkgver - - # python2 fix - for file in $(find . -name '*.py' -print); do - sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' $file - sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file - done - - patch -Np1 < $srcdir/no_fontforge-versioncheck.patch - rm -rf python/out/ + cd "$_pkgname-$pkgver" + autoconf --force --verbose } build() { - cd lilypond-$pkgver - - export PYTHON="python2" - export PYTHON_CONFIG="python2-config" - export GUILE=/usr/bin/guile1.8 - export GUILE_CONFIG=/usr/bin/guile-config1.8 - - ./autogen.sh --noconfigure - [[ -d build ]] || mkdir build - cd build - ../configure --prefix=/usr \ - --disable-documentation - - # FIXME: the extra LDFLAG should not be needed; - # this is a regression somewhere - make + cd "$_pkgname-$pkgver" + ./configure --prefix=/usr \ + GUILE_FLAVOR=guile-3.0 + make -j3 + make -j3 bytecode } package() { - cd lilypond-$pkgver/build - make DESTDIR="$pkgdir/" \ - vimdir="/usr/share/vim/vimfiles" install - - rm -rf "$pkgdir"/usr/share/man + depends+=('libfontconfig.so' 'libfreetype.so' 'libglib-2.0.so' + 'libgobject-2.0.so' 'libpangoft2-1.0.so' 'libpango-1.0.so') + cd "$_pkgname-$pkgver" + make DESTDIR="$pkgdir" vimdir="/usr/share/vim/vimfiles" install + make DESTDIR="$pkgdir" install-bytecode + install -vDm 644 LICENSE.OFL -t "${pkgdir}/usr/share/licenses/${pkgname}/" + install -vDm 644 {AUTHORS,NEWS}.txt README.md \ + -t "${pkgdir}/usr/share/doc/${pkgname}/" + # delete copied fonts, they are relied upon as optdepends + # rm "${pkgdir}/usr/share/lilypond/${pkgver}/fonts/otf/"{C059,Nimbus,texgyre}*.otf } diff --git a/no_fontforge-versioncheck.patch b/no_fontforge-versioncheck.patch deleted file mode 100644 index 010cdbe7abb3..000000000000 --- a/no_fontforge-versioncheck.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur lilypond-2.19.16.orig/configure.ac lilypond-2.19.16.new/configure.ac ---- lilypond-2.19.16.orig/configure.ac 2015-03-03 21:38:23.340077656 +0100 -+++ lilypond-2.19.16.new/configure.ac 2015-03-03 21:42:39.231862408 +0100 -@@ -186,7 +186,7 @@ - - STEPMAKE_PYTHON_DEVEL(REQUIRED, 2.4, 3.0) - --STEPMAKE_PATH_PROG(FONTFORGE, fontforge, REQUIRED, 20110222) -+STEPMAKE_PATH_PROG(FONTFORGE, fontforge, REQUIRED) - - STEPMAKE_PATH_PROG(T1ASM, t1asm, REQUIRED) - |