From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id F399F1382C5 for ; Sat, 17 Feb 2018 12:01:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 374D6E0992; Sat, 17 Feb 2018 12:01:02 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 10F5BE0992 for ; Sat, 17 Feb 2018 12:01:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 97928335C38 for ; Sat, 17 Feb 2018 12:01:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2B98F1D4 for ; Sat, 17 Feb 2018 12:00:59 +0000 (UTC) From: "Miroslav Šulc" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Miroslav Šulc" Message-ID: <1518868793.cb700cf3a8b38490fc2a9e9368b8720045a2ea81.fordfrog@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/files/, media-sound/lilypond/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/lilypond/files/lilypond-9999-programming_error.patch media-sound/lilypond/lilypond-9999.ebuild X-VCS-Directories: media-sound/lilypond/ media-sound/lilypond/files/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: cb700cf3a8b38490fc2a9e9368b8720045a2ea81 X-VCS-Branch: master Date: Sat, 17 Feb 2018 12:00:59 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 96db8959-362d-458d-b7d4-1dcfe04f06d9 X-Archives-Hash: f0aa826eb281fb57968c266be49ca556 commit: cb700cf3a8b38490fc2a9e9368b8720045a2ea81 Author: Miroslav Šulc gentoo org> AuthorDate: Sat Feb 17 11:59:53 2018 +0000 Commit: Miroslav Šulc gentoo 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]