# 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,
AUX abiword-plugins-2.4.6-poppler-0.6-api.patch 452 RMD160 e3557bc1e3fec284e5b68459514e8973b3f24cdf SHA1 536669f3b353347ada9af4b28da51a2e98a1217f SHA256 18738b2bb410b8116be9a766aaeedddc1c1dc879668ccf77b16313e064594abc
-AUX abiword-plugins-2.6.8-glibc-2.10.patch 742 RMD160 a30d9041f47febc295cc2617430995da085be290 SHA1 b468c5684c334805be26c12321f4c063c78aa333 SHA256 3a5f7858c300edcc17d6e941e253062add63cda45e29d6a7e411a8f63e675faa
+AUX abiword-plugins-2.6.8-glibc-2.10+api.patch 1120 RMD160 90a1030fba5ace55752acac4fda78bf535657ee2 SHA1 60dcdf6676da1b1bbdf12108a864ae45867404ef SHA256 d159b215b069b38f83df6155091d8eeaa686ff1f075464b756116d3b140b44bd
AUX poppler_abi_change.patch 766 RMD160 982e40c24d73111356501ec8687011f4f489c2c7 SHA1 11889099d30cd64bc04140a0d2ef4dac775d2649 SHA256 a0a76849b595daee8369c0f3c81ce8f814e39c1225bb4b316e60b4dd30d0b500
DIST abiword-2.4.6.tar.bz2 24994889 RMD160 ca56800d811b3aca0af6b2fb6cd70cbea29ab792 SHA1 3011d221d09336f09f4bb0732add3405961a8623 SHA256 1ca509814d1ce939c98f2776f95351a2a6ea216d12c20be30d40eefd13f43020
DIST abiword-2.6.4.tar.gz 9277200 RMD160 d6949e6ee0e55f1ecfd0512252bcf5f46fbef02d SHA1 2629ad6cd98fd6a263d41dfe4f9bcf80d95c3873 SHA256 4d2d7a6b69b00ffe603a136a9df7ecda9f43448c7bc723503e76eaec9ab8e9fe
EBUILD abiword-plugins-2.6.4.ebuild 2639 RMD160 427a9fffc3ec88e68e4f89a6fda95f9fbaafa97d SHA1 c95c954c5992e0f6d30af2cddf0d57ce9b938a11 SHA256 b4b534569edfcfbc3ad1958c3c460242ec4bc6ba5c466e1e8b3703f4f5dc4af9
EBUILD abiword-plugins-2.6.5.ebuild 2620 RMD160 9c8a68c76642455fc9155e5bc0f88e7940543fb1 SHA1 442541135f8209b0b12108c61248715c8cf0b9e2 SHA256 24bcb42cc224ab4c0d19d7d39c414f59dc4fe7df62f171a5c997ab7e211e5bd6
EBUILD abiword-plugins-2.6.6.ebuild 2620 RMD160 9f9d4fce93817c52193a5b98c45eb1005d2b49ad SHA1 6f428b55db2eb1ae3ca203e12d75a68ccd12f403 SHA256 b798d7872e389a572a2303ecfd930af5f6f0e90b2a4592db413278f9d0d98026
-EBUILD abiword-plugins-2.6.8.ebuild 2731 RMD160 4abf06008de107b7295d9554808320a998bef2f4 SHA1 e53fce4bbda30602532c5e74eb691b161e2eb79b SHA256 db5549ee3ca23b516190122c025a3d4d56b2d8d160206d22a467beb76e497c69
-MISC ChangeLog 11003 RMD160 7504a24aff7c335b70189ae55d1c77443fd75530 SHA1 63274f69a6868eb103b21f87bb4ccf8efc1580c7 SHA256 6f351d9ad0832d5adc24910f8811a997e72e5b632f562476961d2223cc9b0449
+EBUILD abiword-plugins-2.6.8.ebuild 2731 RMD160 2d4f3aaf4cfc338d1cda9f97e9307a324d6c64b0 SHA1 ed7d4c4f120bf372a680c53a2d650c91eddec1bc SHA256 18994d0c908be1f25f0c3c60b2f5ddc353cf759b55cec9f0cd9d9434dccce690
+MISC ChangeLog 11270 RMD160 183ddaada75fa8da801baa228960297ad1eca0b4 SHA1 ca365d9590d523b36e95861c493b97a3528a77a6 SHA256 9e00b037e8c08ce10b9aaf0d0e97919435ac78b6c714980f4aac2f93f640f0f9
MISC metadata.xml 661 RMD160 62a7f8bf572706492707cd13a3f2a0dca0ab02d4 SHA1 115f7b8afd4ddb817eada35ee7eb1f97487814fa SHA256 718687d15e1374defd90a1261a3d8b647d23db314eb321ef9d918771ec2c7c1e
# 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
}
src_prepare() {
- epatch "${FILESDIR}"/${P}-glibc-2.10.patch
+ epatch "${FILESDIR}"/${P}-glibc-2.10+api.patch
}
src_configure(){
--- /dev/null
+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);
+++ /dev/null
-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)
- {