diff options
| -rw-r--r-- | graphics/lilypond/lilypond.SlackBuild | 29 | ||||
| -rw-r--r-- | graphics/lilypond/patches/detect-fontforge.diff | 12 |
2 files changed, 12 insertions, 29 deletions
diff --git a/graphics/lilypond/lilypond.SlackBuild b/graphics/lilypond/lilypond.SlackBuild index 3126e327436bf..70e31a9fb41d3 100644 --- a/graphics/lilypond/lilypond.SlackBuild +++ b/graphics/lilypond/lilypond.SlackBuild @@ -2,25 +2,25 @@ # Slackware build script for lilypond -# Copyright 2012-2016 Kyle Guinn <elyk03@gmail.com>, USA +# Copyright 2012-2020 Kyle Guinn <elyk03@gmail.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is # permitted provided that the following conditions are met: # # 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. +# notice, this list of conditions and the following disclaimer. # -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=lilypond VERSION=${VERSION:-2.18.2} @@ -67,11 +67,6 @@ cd $PRGNAM-$VERSION chown -R root:root . chmod -R u+w,go-w,a+rX-st . -# configure does some sed-fu on `fontforge --version` and is finding a git hash -# instead of a version/date since at least fontforge-20141014. -# This appears to detect the fontforge build date, which should be good enough. -patch -p1 < $CWD/patches/detect-fontforge.diff - # Move the vim syntax highlighting files to where vim can find them. sed -i '/^vimdir/s|=.*|= $(datadir)/vim/vimfiles|' config.make.in diff --git a/graphics/lilypond/patches/detect-fontforge.diff b/graphics/lilypond/patches/detect-fontforge.diff deleted file mode 100644 index 1d3e546dc5cf6..0000000000000 --- a/graphics/lilypond/patches/detect-fontforge.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/configure b/configure ---- a/configure -+++ b/configure -@@ -9810,7 +9810,7 @@ - - if test -z "$_ver"; then - ## If empty, try date [fontforge] -- eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 | grep '[0-9]\{6,8\}' \ -+ eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 | grep 'libfontforge [0-9]\{6,8\}' \ - | head -n 1 \ - | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" - fi |