| 1 |
radhermit 14/11/28 16:53:11 |
| 2 |
|
| 3 |
Modified: ChangeLog protobuf-2.5.0-r2.ebuild |
| 4 |
protobuf-2.6.1-r1.ebuild |
| 5 |
Log: |
| 6 |
Fix build with emacs-24.4 (bug #524100, patch by ulm). |
| 7 |
|
| 8 |
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.74 dev-libs/protobuf/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/protobuf/ChangeLog?rev=1.74&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/protobuf/ChangeLog?rev=1.74&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/protobuf/ChangeLog?r1=1.73&r2=1.74 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/protobuf/ChangeLog,v |
| 20 |
retrieving revision 1.73 |
| 21 |
retrieving revision 1.74 |
| 22 |
diff -u -r1.73 -r1.74 |
| 23 |
--- ChangeLog 27 Nov 2014 23:20:01 -0000 1.73 |
| 24 |
+++ ChangeLog 28 Nov 2014 16:53:11 -0000 1.74 |
| 25 |
@@ -1,6 +1,10 @@ |
| 26 |
# ChangeLog for dev-libs/protobuf |
| 27 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/ChangeLog,v 1.73 2014/11/27 23:20:01 radhermit Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/ChangeLog,v 1.74 2014/11/28 16:53:11 radhermit Exp $ |
| 30 |
+ |
| 31 |
+ 28 Nov 2014; Tim Harder <radhermit@g.o> protobuf-2.5.0-r2.ebuild, |
| 32 |
+ protobuf-2.6.1-r1.ebuild, +files/protobuf-2.5.0-emacs-24.4.patch: |
| 33 |
+ Fix build with emacs-24.4 (bug #524100, patch by ulm). |
| 34 |
|
| 35 |
27 Nov 2014; Tim Harder <radhermit@g.o> protobuf-2.5.0-r2.ebuild, |
| 36 |
protobuf-2.6.1-r1.ebuild: |
| 37 |
|
| 38 |
|
| 39 |
|
| 40 |
1.4 dev-libs/protobuf/protobuf-2.5.0-r2.ebuild |
| 41 |
|
| 42 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/protobuf/protobuf-2.5.0-r2.ebuild?rev=1.4&view=markup |
| 43 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/protobuf/protobuf-2.5.0-r2.ebuild?rev=1.4&content-type=text/plain |
| 44 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/protobuf/protobuf-2.5.0-r2.ebuild?r1=1.3&r2=1.4 |
| 45 |
|
| 46 |
Index: protobuf-2.5.0-r2.ebuild |
| 47 |
=================================================================== |
| 48 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/protobuf/protobuf-2.5.0-r2.ebuild,v |
| 49 |
retrieving revision 1.3 |
| 50 |
retrieving revision 1.4 |
| 51 |
diff -u -r1.3 -r1.4 |
| 52 |
--- protobuf-2.5.0-r2.ebuild 27 Nov 2014 23:20:01 -0000 1.3 |
| 53 |
+++ protobuf-2.5.0-r2.ebuild 28 Nov 2014 16:53:11 -0000 1.4 |
| 54 |
@@ -1,6 +1,6 @@ |
| 55 |
# Copyright 1999-2014 Gentoo Foundation |
| 56 |
# Distributed under the terms of the GNU General Public License v2 |
| 57 |
-# $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 $ |
| 58 |
+# $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 $ |
| 59 |
|
| 60 |
EAPI=5 |
| 61 |
AUTOTOOLS_AUTORECONF=1 |
| 62 |
@@ -36,6 +36,9 @@ |
| 63 |
# breaks Darwin, bug #472514 |
| 64 |
[[ ${CHOST} != *-darwin* ]] && epatch "${FILESDIR}"/${PN}-2.3.0-asneeded-2.patch |
| 65 |
|
| 66 |
+ # fix build with emacs-24.4 (bug #524100) |
| 67 |
+ epatch "${FILESDIR}"/${P}-emacs-24.4.patch |
| 68 |
+ |
| 69 |
autotools-multilib_src_prepare |
| 70 |
|
| 71 |
if use python; then |
| 72 |
|
| 73 |
|
| 74 |
|
| 75 |
1.4 dev-libs/protobuf/protobuf-2.6.1-r1.ebuild |
| 76 |
|
| 77 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/protobuf/protobuf-2.6.1-r1.ebuild?rev=1.4&view=markup |
| 78 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/protobuf/protobuf-2.6.1-r1.ebuild?rev=1.4&content-type=text/plain |
| 79 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/protobuf/protobuf-2.6.1-r1.ebuild?r1=1.3&r2=1.4 |
| 80 |
|
| 81 |
Index: protobuf-2.6.1-r1.ebuild |
| 82 |
=================================================================== |
| 83 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/protobuf/protobuf-2.6.1-r1.ebuild,v |
| 84 |
retrieving revision 1.3 |
| 85 |
retrieving revision 1.4 |
| 86 |
diff -u -r1.3 -r1.4 |
| 87 |
--- protobuf-2.6.1-r1.ebuild 27 Nov 2014 23:20:01 -0000 1.3 |
| 88 |
+++ protobuf-2.6.1-r1.ebuild 28 Nov 2014 16:53:11 -0000 1.4 |
| 89 |
@@ -1,6 +1,6 @@ |
| 90 |
# Copyright 1999-2014 Gentoo Foundation |
| 91 |
# Distributed under the terms of the GNU General Public License v2 |
| 92 |
-# $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 $ |
| 93 |
+# $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 $ |
| 94 |
|
| 95 |
EAPI=5 |
| 96 |
AUTOTOOLS_AUTORECONF=1 |
| 97 |
@@ -37,6 +37,9 @@ |
| 98 |
# breaks Darwin, bug #472514 |
| 99 |
[[ ${CHOST} != *-darwin* ]] && epatch "${FILESDIR}"/${PN}-2.3.0-asneeded-2.patch |
| 100 |
|
| 101 |
+ # fix build with emacs-24.4 (bug #524100) |
| 102 |
+ epatch "${FILESDIR}"/${PN}-2.5.0-emacs-24.4.patch |
| 103 |
+ |
| 104 |
autotools-multilib_src_prepare |
| 105 |
|
| 106 |
if use python; then |
Archives