radhermit    14/11/28 16:53:11

  Modified:             ChangeLog protobuf-2.5.0-r2.ebuild
                        protobuf-2.6.1-r1.ebuild
  Log:
  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)

Revision  Changes    Path
1.74                 dev-libs/protobuf/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/protobuf/ChangeLog?rev=1.74&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/protobuf/ChangeLog?rev=1.74&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/protobuf/ChangeLog?r1=1.73&r2=1.74

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/protobuf/ChangeLog,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- ChangeLog   27 Nov 2014 23:20:01 -0000      1.73
+++ ChangeLog   28 Nov 2014 16:53:11 -0000      1.74
@@ -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 <[email protected]> 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 <[email protected]> protobuf-2.5.0-r2.ebuild,
   protobuf-2.6.1-r1.ebuild:



1.4                  dev-libs/protobuf/protobuf-2.5.0-r2.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/protobuf/protobuf-2.5.0-r2.ebuild?rev=1.4&view=markup
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
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/protobuf/protobuf-2.5.0-r2.ebuild?r1=1.3&r2=1.4

Index: protobuf-2.5.0-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/protobuf/protobuf-2.5.0-r2.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- protobuf-2.5.0-r2.ebuild    27 Nov 2014 23:20:01 -0000      1.3
+++ protobuf-2.5.0-r2.ebuild    28 Nov 2014 16:53:11 -0000      1.4
@@ -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 @@
        # 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



1.4                  dev-libs/protobuf/protobuf-2.6.1-r1.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/protobuf/protobuf-2.6.1-r1.ebuild?rev=1.4&view=markup
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
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/protobuf/protobuf-2.6.1-r1.ebuild?r1=1.3&r2=1.4

Index: protobuf-2.6.1-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/protobuf/protobuf-2.6.1-r1.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- protobuf-2.6.1-r1.ebuild    27 Nov 2014 23:20:01 -0000      1.3
+++ protobuf-2.6.1-r1.ebuild    28 Nov 2014 16:53:11 -0000      1.4
@@ -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 @@
        # 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




Reply via email to