summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiroslav Šulc <fordfrog@gentoo.org>2019-10-28 11:35:11 +0100
committerMiroslav Šulc <fordfrog@gentoo.org>2019-10-28 11:35:32 +0100
commitb86de0942126d6005b21f34a2a93ed2ad07d400e (patch)
treedc9622337962410d6176ab5753dc174248158df7 /media-sound
parentmedia-video/smplayer: Removed old (diff)
downloadgentoo-b86de0942126d6005b21f34a2a93ed2ad07d400e.tar.gz
gentoo-b86de0942126d6005b21f34a2a93ed2ad07d400e.tar.bz2
gentoo-b86de0942126d6005b21f34a2a93ed2ad07d400e.zip
media-sound/lilypond-{2.19.80-r1,9999}: fix #681630
Closes: https://bugs.gentoo.org/681630 Package-Manager: Portage-2.3.78, Repoman-2.3.17 Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
Diffstat (limited to 'media-sound')
-rw-r--r--media-sound/lilypond/files/lilypond-2.19.80-fontforge-version.patch16
-rw-r--r--media-sound/lilypond/lilypond-2.19.80-r1.ebuild5
-rw-r--r--media-sound/lilypond/lilypond-9999.ebuild7
3 files changed, 25 insertions, 3 deletions
diff --git a/media-sound/lilypond/files/lilypond-2.19.80-fontforge-version.patch b/media-sound/lilypond/files/lilypond-2.19.80-fontforge-version.patch
new file mode 100644
index 00000000000..4e2c2ce77c1
--- /dev/null
+++ b/media-sound/lilypond/files/lilypond-2.19.80-fontforge-version.patch
@@ -0,0 +1,16 @@
+The version test fails for two reasons:
+* fontforge --version does not print anything that resembles what the configure
+ script expects a version to look like
+* fontforge fails to print a version if it cannot connect to an X display
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -236,7 +236,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)
+
diff --git a/media-sound/lilypond/lilypond-2.19.80-r1.ebuild b/media-sound/lilypond/lilypond-2.19.80-r1.ebuild
index 1a358dd52c2..3e23b2dfe64 100644
--- a/media-sound/lilypond/lilypond-2.19.80-r1.ebuild
+++ b/media-sound/lilypond/lilypond-2.19.80-r1.ebuild
@@ -55,7 +55,10 @@ DEPEND="${RDEPEND}
# Correct output data for tests isn't bundled with releases
RESTRICT="test"
-PATCHES=( "${FILESDIR}"/${P}-remove-ly-protect.patch )
+PATCHES=(
+ "${FILESDIR}"/${P}-remove-ly-protect.patch
+ "${FILESDIR}"/${P}-fontforge-version.patch
+)
DOCS=( DEDICATION HACKING README.txt ROADMAP )
diff --git a/media-sound/lilypond/lilypond-9999.ebuild b/media-sound/lilypond/lilypond-9999.ebuild
index 93bb8d785b9..4d591c81e09 100644
--- a/media-sound/lilypond/lilypond-9999.ebuild
+++ b/media-sound/lilypond/lilypond-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -22,7 +22,10 @@ SLOT="0"
LANGS=" ca cs da de el eo es fi fr it ja nl ru sv tr uk vi zh_TW"
IUSE="debug emacs guile2 profile vim-syntax"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-PATCHES=(${FILESDIR}/$P-programming_error.patch)
+PATCHES=(
+ "${FILESDIR}"/$P-programming_error.patch
+ "${FILESDIR}"/${PN}-2.19.80-fontforge-version.patch
+)
RDEPEND=">=app-text/ghostscript-gpl-8.15
>=dev-scheme/guile-1.8.2:12[deprecated,regex]