| 1 |
commit: cb700cf3a8b38490fc2a9e9368b8720045a2ea81 |
| 2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Feb 17 11:59:53 2018 +0000 |
| 4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Feb 17 11:59:53 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb700cf3 |
| 7 |
|
| 8 |
media-sound/lilypond: fixed bug causing lilypond does not compile (programming_error does not return value) |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
| 11 |
|
| 12 |
.../lilypond/files/lilypond-9999-programming_error.patch | 13 +++++++++++++ |
| 13 |
media-sound/lilypond/lilypond-9999.ebuild | 1 + |
| 14 |
2 files changed, 14 insertions(+) |
| 15 |
|
| 16 |
diff --git a/media-sound/lilypond/files/lilypond-9999-programming_error.patch b/media-sound/lilypond/files/lilypond-9999-programming_error.patch |
| 17 |
new file mode 100644 |
| 18 |
index 00000000000..f2b85164a6e |
| 19 |
--- /dev/null |
| 20 |
+++ b/media-sound/lilypond/files/lilypond-9999-programming_error.patch |
| 21 |
@@ -0,0 +1,13 @@ |
| 22 |
+diff --git a/lily/general-scheme.cc b/lily/general-scheme.cc |
| 23 |
+index d25e6c9ef8..2fd2e4a4fa 100644 |
| 24 |
+--- a/lily/general-scheme.cc |
| 25 |
++++ b/lily/general-scheme.cc |
| 26 |
+@@ -275,7 +275,7 @@ LY_DEFINE (ly_protects, "ly:protects", |
| 27 |
+ #if SCM_MAJOR_VERSION < 2 || SCM_MAJOR_VERSION == 2 && SCM_MINOR_VERSION < 1 |
| 28 |
+ return scm_protects; |
| 29 |
+ #else |
| 30 |
+- return programming_error ("ly:protects is not supported in Guile 2.1"); |
| 31 |
++ programming_error ("ly:protects is not supported in Guile 2.1"); |
| 32 |
+ #endif |
| 33 |
+ } |
| 34 |
+ |
| 35 |
|
| 36 |
diff --git a/media-sound/lilypond/lilypond-9999.ebuild b/media-sound/lilypond/lilypond-9999.ebuild |
| 37 |
index 27bfc06997d..e24a72ba576 100644 |
| 38 |
--- a/media-sound/lilypond/lilypond-9999.ebuild |
| 39 |
+++ b/media-sound/lilypond/lilypond-9999.ebuild |
| 40 |
@@ -22,6 +22,7 @@ SLOT="0" |
| 41 |
LANGS=" ca cs da de el eo es fi fr it ja nl ru sv tr uk vi zh_TW" |
| 42 |
IUSE="debug emacs guile2 profile vim-syntax" |
| 43 |
REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
| 44 |
+PATCHES=(${FILESDIR}/$P-programming_error.patch) |
| 45 |
|
| 46 |
RDEPEND=">=app-text/ghostscript-gpl-8.15 |
| 47 |
>=dev-scheme/guile-1.8.2:12[deprecated,regex] |
Archives