diff options
| author |   Jonathan Scruggs <j.scruggs@gmail.com> | 2018-01-10 18:48:12 +0000 |
|---|---|---|
| committer |   Amy Liffey <amynka@gentoo.org> | 2018-01-10 23:43:25 +0100 |
| commit | 554ac2c79d1ba54ed79eb87cbb511e5c48f86230 (patch) | |
| tree | 114f3ab7d430d50db98f2ab02b74e896a7cfc8bb /media-sound/lilypond/files | |
| parent | media-libs/gegl-0.2.0-r5: fix ffmpeg/libav support (diff) | |
| download | gentoo-554ac2c79d1ba54ed79eb87cbb511e5c48f86230.tar.gz gentoo-554ac2c79d1ba54ed79eb87cbb511e5c48f86230.tar.bz2 gentoo-554ac2c79d1ba54ed79eb87cbb511e5c48f86230.zip | |
media-sound/lilypond: Add patch to remove ly protects
The function was causing errors errors with Guile v2.2. The patch
is based on the discussion from the developers here:
http://lists.gnu.org/archive/html/guile-user/2017-03/msg00042.html
Remove linguas logic.
Closes: #6822
Closes: https://bugs.gentoo.org/642962
Closes: https://bugs.gentoo.org/640554
Diffstat (limited to 'media-sound/lilypond/files')
| -rw-r--r-- | media-sound/lilypond/files/lilypond-2.19.80-remove-ly-protect.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/media-sound/lilypond/files/lilypond-2.19.80-remove-ly-protect.patch b/media-sound/lilypond/files/lilypond-2.19.80-remove-ly-protect.patch new file mode 100644 index 000000000000..d21b0a413a12 --- /dev/null +++ b/media-sound/lilypond/files/lilypond-2.19.80-remove-ly-protect.patch @@ -0,0 +1,39 @@ +diff -purN a/lily/general-scheme.cc b/lily/general-scheme.cc +--- a/lily/general-scheme.cc 2017-10-15 17:42:11.000000000 +0100 ++++ b/lily/general-scheme.cc 2018-01-10 16:20:08.129066507 +0000 +@@ -267,6 +267,8 @@ LY_DEFINE (ly_dimension_p, "ly:dimension + /* + Debugging mem leaks: + */ ++ ++/* + LY_DEFINE (ly_protects, "ly:protects", + 0, 0, 0, (), + "Return hash of protected objects.") +@@ -278,6 +280,7 @@ LY_DEFINE (ly_protects, "ly:protects", + return programming_error ("ly:protects is not supported in Guile 2.1"); + #endif + } ++*/ + + LY_DEFINE (ly_gettext, "ly:gettext", + 1, 0, 0, (SCM original), +diff -purN a/scm/lily.scm b/scm/lily.scm +--- a/scm/lily.scm 2017-10-15 17:42:11.000000000 +0100 ++++ b/scm/lily.scm 2018-01-10 16:22:54.914457450 +0000 +@@ -836,10 +836,11 @@ messages into errors.") + + (define-public (dump-gc-protects) + (set! gc-protect-stat-count (1+ gc-protect-stat-count)) +- (let* ((protects (sort (hash-table->alist (ly:protects)) +- (lambda (a b) +- (< (object-address (car a)) +- (object-address (car b)))))) ++ (let* (;(protects (sort (hash-table->alist (ly:protects)) ++ ; (lambda (a b) ++ ; (< (object-address (car a)) ++ ; (object-address (car b)))))) ++ (protects '()) + (out-file-name (string-append + "gcstat-" (number->string gc-protect-stat-count) + ".scm")) |