summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabio Erculiani <lxnay@gentoo.org>2010-02-22 14:21:46 +0000
committerFabio Erculiani <lxnay@gentoo.org>2010-02-22 14:21:46 +0000
commit554f38e0311f127cb4af823acb0fd45e86b24a32 (patch)
treec61763420b6693d8bbf2c9bf5588ed2745e987f8 /app-office/abiword-plugins
parentFix building with jpeg-8 (conflicting type of jpeg_mem_src) wrt #306345, than... (diff)
downloadgentoo-2-554f38e0311f127cb4af823acb0fd45e86b24a32.tar.gz
gentoo-2-554f38e0311f127cb4af823acb0fd45e86b24a32.tar.bz2
gentoo-2-554f38e0311f127cb4af823acb0fd45e86b24a32.zip
update glibc 2.10 patch, apply API changes to make abiword-plugins compile on x86
(Portage version: 2.2_rc60/cvs/Linux x86_64)
Diffstat (limited to 'app-office/abiword-plugins')
-rw-r--r--app-office/abiword-plugins/ChangeLog9
-rw-r--r--app-office/abiword-plugins/abiword-plugins-2.6.8.ebuild4
-rw-r--r--app-office/abiword-plugins/files/abiword-plugins-2.6.8-glibc-2.10+api.patch30
-rw-r--r--app-office/abiword-plugins/files/abiword-plugins-2.6.8-glibc-2.10.patch12
4 files changed, 40 insertions, 15 deletions
diff --git a/app-office/abiword-plugins/ChangeLog b/app-office/abiword-plugins/ChangeLog
index 71f5185dd381..4f57e8a6362f 100644
--- a/app-office/abiword-plugins/ChangeLog
+++ b/app-office/abiword-plugins/ChangeLog
@@ -1,6 +1,13 @@
# 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.68 2010/02/10 23:02:47 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword-plugins/ChangeLog,v 1.69 2010/02/22 14:21:45 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+api.patch,
+ -files/abiword-plugins-2.6.8-glibc-2.10.patch:
+ update glibc 2.10 patch, apply API changes to make abiword-plugins compile
+ on x86
10 Feb 2010; Samuli Suominen <ssuominen@gentoo.org>
abiword-plugins-2.4.6.ebuild, abiword-plugins-2.6.4.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 96273ece4e72..13756cfde116 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.6 2010/02/10 23:02:47 ssuominen Exp $
+# $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 $
EAPI=2
@@ -57,7 +57,7 @@ pkg_setup() {
}
src_prepare() {
- epatch "${FILESDIR}"/${P}-glibc-2.10.patch
+ epatch "${FILESDIR}"/${P}-glibc-2.10+api.patch
}
src_configure(){
diff --git a/app-office/abiword-plugins/files/abiword-plugins-2.6.8-glibc-2.10+api.patch b/app-office/abiword-plugins/files/abiword-plugins-2.6.8-glibc-2.10+api.patch
new file mode 100644
index 000000000000..9d238e2f87e0
--- /dev/null
+++ b/app-office/abiword-plugins/files/abiword-plugins-2.6.8-glibc-2.10+api.patch
@@ -0,0 +1,30 @@
+diff -Nurp abiword-plugins-2.6.8.orig/wp/impexp/xhtml/xp/ie_imp_MHT.cpp abiword-plugins-2.6.8/wp/impexp/xhtml/xp/ie_imp_MHT.cpp
+--- abiword-plugins-2.6.8.orig/wp/impexp/xhtml/xp/ie_imp_MHT.cpp 2007-06-19 11:42:33.000000000 +0000
++++ abiword-plugins-2.6.8/wp/impexp/xhtml/xp/ie_imp_MHT.cpp 2009-08-06 19:35:52.000000000 +0000
+@@ -235,7 +235,7 @@ UT_Error IE_Imp_MHT::importFile (const c
+ }
+ else if (m_document->isHTML4 ())
+ {
+- import_status = importHTML4 (szFilename);
++ import_status = importHTML4 (const_cast<char *>(szFilename));
+ }
+ else import_status = UT_ERROR;
+ }
+@@ -323,7 +323,7 @@ UT_Error IE_Imp_MHT::importXHTML (const
+
+ setReader (&wrapper);
+
+- return IE_Imp_XHTML::importFile (szFilename);
++ return IE_Imp_XHTML::importFile (szFilename, sizeof(szFilename));
+ }
+
+ UT_Error IE_Imp_MHT::importHTML4 (const char * szFilename)
+@@ -351,7 +351,7 @@ UT_Error IE_Imp_MHT::importHTML4 (const
+ UT_HTML parser;
+ setParser (&parser);
+
+- e = IE_Imp_XHTML::importFile (szFilename);
++ e = IE_Imp_XHTML::importFile (szFilename, sizeof(szFilename));
+
+ setParser (0);
+ setReader (0);
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
deleted file mode 100644
index 6e2c5e1455ca..000000000000
--- a/app-office/abiword-plugins/files/abiword-plugins-2.6.8-glibc-2.10.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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)
- {