diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2015-06-09 18:47:53 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2015-06-09 18:47:53 +0000 |
| commit | 7389754ca90b69154929024a38fdf3e600bc4e44 (patch) | |
| tree | 719e988d65e114bb2721cb1072790341d7e01e7e /dev-libs | |
| parent | dev-db/pygresql -> dev-python/pygresql. (diff) | |
| download | gentoo-2-7389754ca90b69154929024a38fdf3e600bc4e44.tar.gz gentoo-2-7389754ca90b69154929024a38fdf3e600bc4e44.tar.bz2 gentoo-2-7389754ca90b69154929024a38fdf3e600bc4e44.zip | |
Fix build failure with Emacs 24.5, bug 545486.
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!)
Diffstat (limited to 'dev-libs')
| -rw-r--r-- | dev-libs/protobuf/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-libs/protobuf/files/protobuf-2.5.0-emacs-24.4.patch | 11 |
2 files changed, 9 insertions, 8 deletions
diff --git a/dev-libs/protobuf/ChangeLog b/dev-libs/protobuf/ChangeLog index edfe94844d2c..0ffc34896492 100644 --- a/dev-libs/protobuf/ChangeLog +++ b/dev-libs/protobuf/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/protobuf # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/ChangeLog,v 1.89 2015/05/17 20:18:20 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/ChangeLog,v 1.90 2015/06/09 18:47:53 ulm Exp $ + + 09 Jun 2015; Ulrich Müller <ulm@gentoo.org> + files/protobuf-2.5.0-emacs-24.4.patch: + Fix build failure with Emacs 24.5, bug 545486. 17 May 2015; Pacho Ramos <pacho@gentoo.org> protobuf-2.6.1-r3.ebuild: ppc64 stable wrt bug #528240 diff --git a/dev-libs/protobuf/files/protobuf-2.5.0-emacs-24.4.patch b/dev-libs/protobuf/files/protobuf-2.5.0-emacs-24.4.patch index 5154bd3a0999..77d624938243 100644 --- a/dev-libs/protobuf/files/protobuf-2.5.0-emacs-24.4.patch +++ b/dev-libs/protobuf/files/protobuf-2.5.0-emacs-24.4.patch @@ -4,14 +4,11 @@ http://debbugs.gnu.org/cgi/bugreport.cgi?bug=18845 --- protobuf-2.5.0/editors/protobuf-mode.el +++ protobuf-2.5.0/editors/protobuf-mode.el -@@ -66,6 +66,10 @@ +@@ -66,6 +66,7 @@ (require 'cc-mode) - + (eval-when-compile -+ (and (= emacs-major-version 24) -+ (= emacs-minor-version 4) -+ (null emacs-repository-version) -+ (require 'cl)) ++ (require 'cl) (require 'cc-langs) (require 'cc-fonts)) - + |