[arch-commits] Commit in lilypond/trunk (PKGBUILD)

[Antonio Rojas]

    Date: Tuesday, March 3, 2020 @ 14:58:53
  Author: arojas
Revision: 589776

Update to 2.20.0

Modified:
  lilypond/trunk/PKGBUILD

----------+
 PKGBUILD |   13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-03-03 13:25:03 UTC (rev 589775)
+++ PKGBUILD	2020-03-03 14:58:53 UTC (rev 589776)
@@ -5,7 +5,7 @@
 # Contributor: Robert Emil Berge <filoktetes at linuxophic.org>
 
 pkgname=lilypond
-pkgver=2.19.84
+pkgver=2.20.0
 pkgrel=1
 pkgdesc="An automated music engraving system"
 arch=('x86_64')
@@ -16,13 +16,13 @@
              'gsfonts' 'texi2html' 'dblatex' 'texlive-langcyrillic' 'imagemagick'
              'zip' 'rsync' 'netpbm' 'tex-gyre-fonts')
 options=('emptydirs')
-source=("http://lilypond.org/downloads/sources/v2.19/$pkgname-$pkgver.tar.gz"
+source=("http://lilypond.org/downloads/sources/v${pkgver%.*}/$pkgname-$pkgver.tar.gz"
 	lilyfontsize.patch
 	https://arch.p5n.pp.ru/~sergej/dl/2017/gsfonts/c059013l.{pfb,pfm,afm}
 	https://arch.p5n.pp.ru/~sergej/dl/2017/gsfonts/c059016l.{pfb,pfm,afm}
 	https://arch.p5n.pp.ru/~sergej/dl/2017/gsfonts/c059033l.{pfb,pfm,afm}
 	https://arch.p5n.pp.ru/~sergej/dl/2017/gsfonts/c059036l.{pfb,pfm,afm})
-sha256sums=('94dcc66447f24966f28eda72c79e1ec16143b8ea4a537cc9f97d017cc0c0dd11'
+sha256sums=('595901323fbc88d3039ca4bdbc2d8c5ce46b182edcb3ea9c0940eba849bba661'
             '17b86b7a0b09b73cb5cf8751464571cf6a785c0b1a23db425cc828855a9d8ae6'
             '34218d1c2710553f528cf8296b37eff98119b174aa48e454dc41ad31f855232c'
             'aaf8da7af542c6de7b8a0954a3dbc282dd61fc7c80fd0cf1df31da3aad0aa576'
@@ -46,11 +46,14 @@
     sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file
   done
 
-  sed -i 's|GUILE_CFLAGS=.*|GUILE_CFLAGS="`pkg-config --cflags guile-1.8`"|' configure
-  sed -i 's|GUILE_LDFLAGS=.*|GUILE_LDFLAGS="`pkg-config --libs guile-1.8`"|' configure
+#  sed -i 's|GUILE_CFLAGS=.*|GUILE_CFLAGS="`pkg-config --cflags guile-1.8`"|' configure
+#  sed -i 's|GUILE_LDFLAGS=.*|GUILE_LDFLAGS="`pkg-config --libs guile-1.8`"|' configure
+  sed -e 's|1.82, 1.82|1.82|g' -i configure.ac # Remove version constraint on texi2html
 
   rm -rf lily/out/ python/out/
   patch -p1 -i "$srcdir/lilyfontsize.patch"
+
+  ./autogen.sh
 }
 
 build() {