diff options
| author |   Fabio Erculiani <lxnay@gentoo.org> | 2010-02-22 18:50:41 +0000 |
|---|---|---|
| committer | Fabio Erculiani <lxnay@gentoo.org> | 2010-02-22 18:50:41 +0000 |
| commit | 604116fd264b4bcb97a886560aee393c1862af05 (patch) | |
| tree | 811a9a02fdc99ef85a6c2db08916b5dac8c07787 /app-office/abiword-plugins | |
| parent | Fix HOMEPAGE to a non-404 one, wrt bug #306407 by David <write2David@gmail.com>. (diff) | |
| download | gentoo-2-604116fd264b4bcb97a886560aee393c1862af05.tar.gz gentoo-2-604116fd264b4bcb97a886560aee393c1862af05.tar.bz2 gentoo-2-604116fd264b4bcb97a886560aee393c1862af05.zip | |
re-add previous glibc-2.10 patch, still required by package
(Portage version: 2.2_rc60/cvs/Linux x86_64)
Diffstat (limited to 'app-office/abiword-plugins')
| -rw-r--r-- | app-office/abiword-plugins/ChangeLog | 7 | ||||
| -rw-r--r-- | app-office/abiword-plugins/abiword-plugins-2.6.8.ebuild | 3 | ||||
| -rw-r--r-- | app-office/abiword-plugins/files/abiword-plugins-2.6.8-glibc-2.10.patch | 12 |
3 files changed, 20 insertions, 2 deletions
diff --git a/app-office/abiword-plugins/ChangeLog b/app-office/abiword-plugins/ChangeLog index 4f57e8a6362f..8e226b9af0b5 100644 --- a/app-office/abiword-plugins/ChangeLog +++ b/app-office/abiword-plugins/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-office/abiword-plugins # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/abiword-plugins/ChangeLog,v 1.69 2010/02/22 14:21:45 lxnay Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/abiword-plugins/ChangeLog,v 1.70 2010/02/22 18:50:40 lxnay Exp $ + + 22 Feb 2010; Fabio Erculiani <lxnay@gentoo.org> + abiword-plugins-2.6.8.ebuild, + +files/abiword-plugins-2.6.8-glibc-2.10.patch: + re-add previous glibc-2.10 patch, still required by package 22 Feb 2010; Fabio Erculiani <lxnay@gentoo.org> abiword-plugins-2.6.8.ebuild, diff --git a/app-office/abiword-plugins/abiword-plugins-2.6.8.ebuild b/app-office/abiword-plugins/abiword-plugins-2.6.8.ebuild index 13756cfde116..742f579bbcfb 100644 --- a/app-office/abiword-plugins/abiword-plugins-2.6.8.ebuild +++ b/app-office/abiword-plugins/abiword-plugins-2.6.8.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/abiword-plugins/abiword-plugins-2.6.8.ebuild,v 1.7 2010/02/22 14:21:45 lxnay Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/abiword-plugins/abiword-plugins-2.6.8.ebuild,v 1.8 2010/02/22 18:50:40 lxnay Exp $ EAPI=2 @@ -57,6 +57,7 @@ pkg_setup() { } src_prepare() { + epatch "${FILESDIR}"/${P}-glibc-2.10.patch epatch "${FILESDIR}"/${P}-glibc-2.10+api.patch } diff --git a/app-office/abiword-plugins/files/abiword-plugins-2.6.8-glibc-2.10.patch b/app-office/abiword-plugins/files/abiword-plugins-2.6.8-glibc-2.10.patch new file mode 100644 index 000000000000..6e2c5e1455ca --- /dev/null +++ b/app-office/abiword-plugins/files/abiword-plugins-2.6.8-glibc-2.10.patch @@ -0,0 +1,12 @@ +diff -Naurp abiword-plugins-2.6.8-orig/tools/abicommand/xp/AbiCommand.cpp abiword-plugins-2.6.8/tools/abicommand/xp/AbiCommand.cpp +--- abiword-plugins-2.6.8-orig/tools/abicommand/xp/AbiCommand.cpp 2007-10-11 14:05:55.000000000 -0600 ++++ abiword-plugins-2.6.8/tools/abicommand/xp/AbiCommand.cpp 2009-07-29 16:37:31.022705617 -0600 +@@ -551,7 +551,7 @@ AbiCommand::parseTokens (UT_Vector * pTo + UT_UTF8String *pCom1 = + const_cast < UT_UTF8String * >(static_cast < const UT_UTF8String * >(pToks->getNthItem (1))); + printf(" Filename %s \n",pCom1->utf8_str()); +- char *suffix = rindex (pCom1->utf8_str (), '.'); ++ const char *suffix = const_cast<const char*>(rindex (pCom1->utf8_str (), '.')); + + if (suffix != NULL) + { |