diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2014-11-19 17:27:02 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2014-11-19 17:27:02 +0000 |
| commit | 1570518b8b106c75cb9151509fee877de27dfdbb (patch) | |
| tree | 6191770738dd4db6e7236f50cf073c33dc88e9d9 /app-emacs | |
| parent | clean old python impl, add pypy3 support (diff) | |
| download | gentoo-2-1570518b8b106c75cb9151509fee877de27dfdbb.tar.gz gentoo-2-1570518b8b106c75cb9151509fee877de27dfdbb.tar.bz2 gentoo-2-1570518b8b106c75cb9151509fee877de27dfdbb.zip | |
Fix build failure with Emacs 24.4, bug 528374.
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!)
Diffstat (limited to 'app-emacs')
| -rw-r--r-- | app-emacs/csharp-mode/ChangeLog | 6 | ||||
| -rw-r--r-- | app-emacs/csharp-mode/csharp-mode-0.7.0-r1.ebuild | 3 | ||||
| -rw-r--r-- | app-emacs/csharp-mode/files/csharp-mode-0.7.0-emacs-24.4.patch | 15 |
3 files changed, 22 insertions, 2 deletions
diff --git a/app-emacs/csharp-mode/ChangeLog b/app-emacs/csharp-mode/ChangeLog index 0650ffbddc66..2c7cd3a2a70e 100644 --- a/app-emacs/csharp-mode/ChangeLog +++ b/app-emacs/csharp-mode/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-emacs/csharp-mode # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emacs/csharp-mode/ChangeLog,v 1.14 2014/06/07 11:07:02 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emacs/csharp-mode/ChangeLog,v 1.15 2014/11/19 17:27:02 ulm Exp $ + + 19 Nov 2014; Ulrich Müller <ulm@gentoo.org> csharp-mode-0.7.0-r1.ebuild, + +files/csharp-mode-0.7.0-emacs-24.4.patch: + Fix build failure with Emacs 24.4, bug 528374. 07 Jun 2014; Ulrich Müller <ulm@gentoo.org> csharp-mode-0.7.0-r1.ebuild: Remove redundant NEED_EMACS assignment. diff --git a/app-emacs/csharp-mode/csharp-mode-0.7.0-r1.ebuild b/app-emacs/csharp-mode/csharp-mode-0.7.0-r1.ebuild index 44dd0268d9d3..1f64f123085e 100644 --- a/app-emacs/csharp-mode/csharp-mode-0.7.0-r1.ebuild +++ b/app-emacs/csharp-mode/csharp-mode-0.7.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emacs/csharp-mode/csharp-mode-0.7.0-r1.ebuild,v 1.4 2014/06/07 11:07:02 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emacs/csharp-mode/csharp-mode-0.7.0-r1.ebuild,v 1.5 2014/11/19 17:27:02 ulm Exp $ EAPI=5 @@ -14,4 +14,5 @@ LICENSE="GPL-2+" SLOT="0" KEYWORDS="amd64 ~ppc x86" +ELISP_PATCHES="${P}-emacs-24.4.patch" SITEFILE="50${PN}-gentoo.el" diff --git a/app-emacs/csharp-mode/files/csharp-mode-0.7.0-emacs-24.4.patch b/app-emacs/csharp-mode/files/csharp-mode-0.7.0-emacs-24.4.patch new file mode 100644 index 000000000000..1bbc0d2d3a45 --- /dev/null +++ b/app-emacs/csharp-mode/files/csharp-mode-0.7.0-emacs-24.4.patch @@ -0,0 +1,15 @@ +https://bugs.gentoo.org/528374 + +--- a/csharp-mode.el ++++ b/csharp-mode.el +@@ -125,6 +125,10 @@ + (stringp byte-compile-dest-file)) + (cons (file-name-directory byte-compile-dest-file) load-path) + load-path))) ++ (and (= emacs-major-version 24) ++ (= emacs-minor-version 4) ++ (null emacs-repository-version) ++ (require 'cl)) + (load "cc-mode" nil t) + (load "cc-fonts" nil t) + (load "cc-langs" nil t))) |