From cae878f460424a967b65459ce441658f0934389f Mon Sep 17 00:00:00 2001
From: Damien Goutte-Gattat <dgouttegattat@incenp.org>
Date: Thu, 28 Nov 2019 22:06:35 +0000
Subject: [PATCH] ap/lilypond:  Updated.

---
 ap/lilypond/checksums                             |  2 ++
 .../lilypond-2.18.2-1.documentation.tar.bz2.sha1  |  1 -
 .../lilypond-2.18.2-fontforge-version-check.diff  | 12 ------------
 ap/lilypond/lilypond-2.18.2.tar.gz.sha1           |  1 -
 ap/lilypond/lilypond.SlackBuild                   | 15 +++++++++------
 5 files changed, 11 insertions(+), 20 deletions(-)
 create mode 100644 ap/lilypond/checksums
 delete mode 100644 ap/lilypond/lilypond-2.18.2-1.documentation.tar.bz2.sha1
 delete mode 100644 ap/lilypond/lilypond-2.18.2-fontforge-version-check.diff
 delete mode 100644 ap/lilypond/lilypond-2.18.2.tar.gz.sha1

diff --git a/ap/lilypond/checksums b/ap/lilypond/checksums
new file mode 100644
index 00000000..4a7efef1
--- /dev/null
+++ b/ap/lilypond/checksums
@@ -0,0 +1,2 @@
+329d733765b0ba7be1878ae3f457dbbb875cc2840d2b75af4afc48c9454fba07  lilypond-2.18.2.tar.gz
+e3d7474200448c9677925ccf4f90982ca87e8f789e143afdc6bf397f0e368b99  lilypond-2.18.2-1.documentation.tar.bz2
diff --git a/ap/lilypond/lilypond-2.18.2-1.documentation.tar.bz2.sha1 b/ap/lilypond/lilypond-2.18.2-1.documentation.tar.bz2.sha1
deleted file mode 100644
index c61a7eaf..00000000
--- a/ap/lilypond/lilypond-2.18.2-1.documentation.tar.bz2.sha1
+++ /dev/null
@@ -1 +0,0 @@
-82b0b1213eb8e39cc9e6014b450d4cc1159ebd4a  lilypond-2.18.2-1.documentation.tar.bz2
diff --git a/ap/lilypond/lilypond-2.18.2-fontforge-version-check.diff b/ap/lilypond/lilypond-2.18.2-fontforge-version-check.diff
deleted file mode 100644
index 49350dc2..00000000
--- a/ap/lilypond/lilypond-2.18.2-fontforge-version-check.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur lilypond-2.18.2.orig/aclocal.m4 lilypond-2.18.2/aclocal.m4
---- lilypond-2.18.2.orig/aclocal.m4	2014-03-17 16:29:16.000000000 +0100
-+++ lilypond-2.18.2/aclocal.m4	2015-07-20 23:48:09.857819701 +0200
-@@ -42,7 +42,7 @@
- 
-     if test -z "$_ver"; then
-         ## If empty, try date [fontforge]
--        eval _ver=\"\`("$1" --version || "$1" -V) 2>&1 | grep '[0-9]\{6,8\}' \
-+        eval _ver=\"\`("$1" --version || "$1" -V) 2>&1 | grep 'libfontforge [0-9]\{6,8\}' \
- 	    | head -n 1 \
- 	    | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\"
-     fi
diff --git a/ap/lilypond/lilypond-2.18.2.tar.gz.sha1 b/ap/lilypond/lilypond-2.18.2.tar.gz.sha1
deleted file mode 100644
index fedc44ff..00000000
--- a/ap/lilypond/lilypond-2.18.2.tar.gz.sha1
+++ /dev/null
@@ -1 +0,0 @@
-09d3a1e0e9fadeb8ef6e279227a2b30812c7ee9b  lilypond-2.18.2.tar.gz
diff --git a/ap/lilypond/lilypond.SlackBuild b/ap/lilypond/lilypond.SlackBuild
index d8ba2065..4f37dba7 100755
--- a/ap/lilypond/lilypond.SlackBuild
+++ b/ap/lilypond/lilypond.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 # Build script for Slackware
-# Copyright (C) 2009,2010,2011,2012,2015 Damien Goutte-Gattat
+# Copyright (C) 2009-2012,2015,2019 Damien Goutte-Gattat
 #
 # Redistribution and use of this script, with or without modifications,
 # ispermitted provided that the following conditions are met:
@@ -24,7 +24,7 @@
 #
 # Latest LilyPond sourcecode is available at: <http://lilypond.org/>.
 #
-# Depends: xap/fontforge, ap/t1utils, d/guile1
+# Depends: d/guile1, xap/fontforge
 
 # Source package infos
 NAMESRC=${NAMESRC:-lilypond}
@@ -83,8 +83,7 @@ if [ ! -r $ARCHDOC ]; then
     wget -c -O $ARCHDOC.part "$WGETDOC"
     mv $ARCHDOC.part $ARCHDOC
 fi
-sha1sum -c $ARCHIVE.sha1
-sha1sum -c $ARCHDOC.sha1
+sha256sum -c checksums
 NAME=$(tar ft $ARCHIVE | head -n 1 | cut -d / -f 1)
 
 # Extract
@@ -92,8 +91,6 @@ cd $TMP
 echo "Building $ARCHIVE..."
 tar xf $CWD/$ARCHIVE
 cd $NAME
-patch -p 1 < $CWD/lilypond-2.18.2-fontforge-version-check.diff
-./autogen.sh --noconf
 mkdir build && cd build
 GUILE=/usr/bin/guile1 \
 GUILE_CONFIG=/usr/bin/guile1-config \
@@ -143,6 +140,12 @@ find $PKG/usr/info -type f -exec gzip -9 '{}' \;
 # Copy slack-desc file
 install -D -m 644 $CWD/slack-desc $PKG/install/slack-desc
 
+# Add dependency infos
+cat <<EOF > $PKG/install/slack-required
+fontforge
+guile1
+EOF
+
 # Package the tree
 cd $PKG
 mkdir -p $OUT