commit:     cb700cf3a8b38490fc2a9e9368b8720045a2ea81
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 17 11:59:53 2018 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Feb 17 11:59:53 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb700cf3

media-sound/lilypond: fixed bug causing lilypond does not compile 
(programming_error does not return value)

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 .../lilypond/files/lilypond-9999-programming_error.patch    | 13 +++++++++++++
 media-sound/lilypond/lilypond-9999.ebuild                   |  1 +
 2 files changed, 14 insertions(+)

diff --git a/media-sound/lilypond/files/lilypond-9999-programming_error.patch 
b/media-sound/lilypond/files/lilypond-9999-programming_error.patch
new file mode 100644
index 00000000000..f2b85164a6e
--- /dev/null
+++ b/media-sound/lilypond/files/lilypond-9999-programming_error.patch
@@ -0,0 +1,13 @@
+diff --git a/lily/general-scheme.cc b/lily/general-scheme.cc
+index d25e6c9ef8..2fd2e4a4fa 100644
+--- a/lily/general-scheme.cc
++++ b/lily/general-scheme.cc
+@@ -275,7 +275,7 @@ LY_DEFINE (ly_protects, "ly:protects",
+ #if SCM_MAJOR_VERSION < 2 || SCM_MAJOR_VERSION == 2 && SCM_MINOR_VERSION < 1
+   return scm_protects;
+ #else
+-  return programming_error ("ly:protects is not supported in Guile 2.1");
++  programming_error ("ly:protects is not supported in Guile 2.1");
+ #endif
+ }
+ 

diff --git a/media-sound/lilypond/lilypond-9999.ebuild 
b/media-sound/lilypond/lilypond-9999.ebuild
index 27bfc06997d..e24a72ba576 100644
--- a/media-sound/lilypond/lilypond-9999.ebuild
+++ b/media-sound/lilypond/lilypond-9999.ebuild
@@ -22,6 +22,7 @@ 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)
 
 RDEPEND=">=app-text/ghostscript-gpl-8.15
        >=dev-scheme/guile-1.8.2:12[deprecated,regex]

Reply via email to