diff options
author | Justin Lecher <jlec@gentoo.org> | 2015-03-20 06:48:05 +0000 |
---|---|---|
committer | Justin Lecher <jlec@gentoo.org> | 2015-03-20 06:48:05 +0000 |
commit | ef1bdad5de37133fe9551d2fbdf90233974488ad (patch) | |
tree | b25d3957803a2df6737b3ddf006152f7703485bb /app-dicts | |
parent | Version bump. (diff) | |
download | gentoo-2-ef1bdad5de37133fe9551d2fbdf90233974488ad.tar.gz gentoo-2-ef1bdad5de37133fe9551d2fbdf90233974488ad.tar.bz2 gentoo-2-ef1bdad5de37133fe9551d2fbdf90233974488ad.zip |
Readd patch as binary file to stop CVS mangling it, bug #543798
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)
Diffstat (limited to 'app-dicts')
-rw-r--r-- | app-dicts/wordnet/ChangeLog | 7 | ||||
-rw-r--r-- | app-dicts/wordnet/files/wordnet-3.0-src_stubs_c.patch (renamed from app-dicts/wordnet/files/wordnet-3.0-stubs_c.patch) | 4 | ||||
-rw-r--r-- | app-dicts/wordnet/wordnet-3.0-r4.ebuild | 4 |
3 files changed, 10 insertions, 5 deletions
diff --git a/app-dicts/wordnet/ChangeLog b/app-dicts/wordnet/ChangeLog index 30838a00660b..31c0eec4ee88 100644 --- a/app-dicts/wordnet/ChangeLog +++ b/app-dicts/wordnet/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-dicts/wordnet # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-dicts/wordnet/ChangeLog,v 1.27 2015/03/19 14:32:00 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-dicts/wordnet/ChangeLog,v 1.28 2015/03/20 06:48:05 jlec Exp $ + + 20 Mar 2015; Justin Lecher <jlec@gentoo.org> + +files/wordnet-3.0-src_stubs_c.patch, -files/wordnet-3.0-stubs_c.patch, + wordnet-3.0-r4.ebuild: + Readd patch as binary file to stop CVS mangling it, bug #543798 *wordnet-3.0-r4 (19 Mar 2015) diff --git a/app-dicts/wordnet/files/wordnet-3.0-stubs_c.patch b/app-dicts/wordnet/files/wordnet-3.0-src_stubs_c.patch index e2d11561dca5..29c42dea9c35 100644 --- a/app-dicts/wordnet/files/wordnet-3.0-stubs_c.patch +++ b/app-dicts/wordnet/files/wordnet-3.0-src_stubs_c.patch @@ -5,8 +5,8 @@ diff -urNad wordnet-3.0/src/stubs.c.orig wordnet-3.0/src/stubs.c #include <tk.h> #include <wn.h> --static char *Id = "$Id: wordnet-3.0-stubs_c.patch,v 1.1 2015/03/19 14:32:00 jlec Exp $"; -+static const char Id[] = "$Id: wordnet-3.0-stubs_c.patch,v 1.1 2015/03/19 14:32:00 jlec Exp $"; +-static char *Id = "$Id: stubs.c,v 1.7 2005/04/29 19:01:57 wn Exp $"; ++static const char Id[] = "$Id: stubs.c,v 1.7 2005/04/29 19:01:57 wn Exp $"; static char resultbuf[SEARCHBUF]; diff --git a/app-dicts/wordnet/wordnet-3.0-r4.ebuild b/app-dicts/wordnet/wordnet-3.0-r4.ebuild index b2ca67bda496..602bf3020ca8 100644 --- a/app-dicts/wordnet/wordnet-3.0-r4.ebuild +++ b/app-dicts/wordnet/wordnet-3.0-r4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-dicts/wordnet/wordnet-3.0-r4.ebuild,v 1.1 2015/03/19 14:32:00 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-dicts/wordnet/wordnet-3.0-r4.ebuild,v 1.2 2015/03/20 06:48:05 jlec Exp $ EAPI=5 @@ -38,7 +38,7 @@ PATCHES=( "${FILESDIR}"/${P}-tcl8.6.patch "${FILESDIR}"/${P}-format-security.patch - "${FILESDIR}"/${P}-stubs_c.patch + "${FILESDIR}"/${P}-src_stubs_c.patch ) src_prepare() { epatch ${PATCHES[@]} |