diff options
| author |   Tim Harder <radhermit@gentoo.org> | 2014-11-28 16:53:11 +0000 |
|---|---|---|
| committer | Tim Harder <radhermit@gentoo.org> | 2014-11-28 16:53:11 +0000 |
| commit | c2b3379a228a902b7cb198933f616429e598eede (patch) | |
| tree | f3cc96977f626539ce15f9ff763ffe690cac22f9 /dev-libs/protobuf | |
| parent | add subslot (diff) | |
| download | gentoo-2-c2b3379a228a902b7cb198933f616429e598eede.tar.gz gentoo-2-c2b3379a228a902b7cb198933f616429e598eede.tar.bz2 gentoo-2-c2b3379a228a902b7cb198933f616429e598eede.zip | |
Fix build with emacs-24.4 (bug #524100, patch by ulm).
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)
Diffstat (limited to 'dev-libs/protobuf')
| -rw-r--r-- | dev-libs/protobuf/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-libs/protobuf/files/protobuf-2.5.0-emacs-24.4.patch | 17 | ||||
| -rw-r--r-- | dev-libs/protobuf/protobuf-2.5.0-r2.ebuild | 5 | ||||
| -rw-r--r-- | dev-libs/protobuf/protobuf-2.6.1-r1.ebuild | 5 |
4 files changed, 30 insertions, 3 deletions
diff --git a/dev-libs/protobuf/ChangeLog b/dev-libs/protobuf/ChangeLog index 3891f2e804e2..b2076de3aaf4 100644 --- a/dev-libs/protobuf/ChangeLog +++ b/dev-libs/protobuf/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/protobuf # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/ChangeLog,v 1.73 2014/11/27 23:20:01 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/ChangeLog,v 1.74 2014/11/28 16:53:11 radhermit Exp $ + + 28 Nov 2014; Tim Harder <radhermit@gentoo.org> protobuf-2.5.0-r2.ebuild, + protobuf-2.6.1-r1.ebuild, +files/protobuf-2.5.0-emacs-24.4.patch: + Fix build with emacs-24.4 (bug #524100, patch by ulm). 27 Nov 2014; Tim Harder <radhermit@gentoo.org> protobuf-2.5.0-r2.ebuild, protobuf-2.6.1-r1.ebuild: 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 new file mode 100644 index 000000000000..5154bd3a0999 --- /dev/null +++ b/dev-libs/protobuf/files/protobuf-2.5.0-emacs-24.4.patch @@ -0,0 +1,17 @@ +Fix build with emacs-24.4. + +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 @@ + (require 'cc-mode) + + (eval-when-compile ++ (and (= emacs-major-version 24) ++ (= emacs-minor-version 4) ++ (null emacs-repository-version) ++ (require 'cl)) + (require 'cc-langs) + (require 'cc-fonts)) + diff --git a/dev-libs/protobuf/protobuf-2.5.0-r2.ebuild b/dev-libs/protobuf/protobuf-2.5.0-r2.ebuild index 31439d243af8..e817289b9095 100644 --- a/dev-libs/protobuf/protobuf-2.5.0-r2.ebuild +++ b/dev-libs/protobuf/protobuf-2.5.0-r2.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/dev-libs/protobuf/protobuf-2.5.0-r2.ebuild,v 1.3 2014/11/27 23:20:01 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/protobuf-2.5.0-r2.ebuild,v 1.4 2014/11/28 16:53:11 radhermit Exp $ EAPI=5 AUTOTOOLS_AUTORECONF=1 @@ -36,6 +36,9 @@ src_prepare() { # breaks Darwin, bug #472514 [[ ${CHOST} != *-darwin* ]] && epatch "${FILESDIR}"/${PN}-2.3.0-asneeded-2.patch + # fix build with emacs-24.4 (bug #524100) + epatch "${FILESDIR}"/${P}-emacs-24.4.patch + autotools-multilib_src_prepare if use python; then diff --git a/dev-libs/protobuf/protobuf-2.6.1-r1.ebuild b/dev-libs/protobuf/protobuf-2.6.1-r1.ebuild index 6b5218e84b71..05c33fc80c8e 100644 --- a/dev-libs/protobuf/protobuf-2.6.1-r1.ebuild +++ b/dev-libs/protobuf/protobuf-2.6.1-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/dev-libs/protobuf/protobuf-2.6.1-r1.ebuild,v 1.3 2014/11/27 23:20:01 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/protobuf-2.6.1-r1.ebuild,v 1.4 2014/11/28 16:53:11 radhermit Exp $ EAPI=5 AUTOTOOLS_AUTORECONF=1 @@ -37,6 +37,9 @@ src_prepare() { # breaks Darwin, bug #472514 [[ ${CHOST} != *-darwin* ]] && epatch "${FILESDIR}"/${PN}-2.3.0-asneeded-2.patch + # fix build with emacs-24.4 (bug #524100) + epatch "${FILESDIR}"/${PN}-2.5.0-emacs-24.4.patch + autotools-multilib_src_prepare if use python; then |