Add patch from bug #119942 to fix compile with newer versions of poppler. Thanks to everybody on that bug for their time and work.

(Portage version: 2.1_pre5-r4)

5 files changed, 59 insertions, 16 deletions

diff --git a/app-office/abiword-plugins/ChangeLog b/app-office/abiword-plugins/ChangeLog
index fe1b90874dfe..987ceceeb8b5 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-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword-plugins/ChangeLog,v 1.11 2006/02/22 00:16:25 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword-plugins/ChangeLog,v 1.12 2006/03/09 18:25:30 joem Exp $
+
+  09 Mar 2006; Joe McCann <joem@gentoo.org> +files/poppler_abi_change.patch,
+  abiword-plugins-2.4.2.ebuild:
+  Add patch from bug #119942 to fix compile with newer versions of poppler.
+  Thanks to everybody on that bug for their time and work.
 
   21 Feb 2006; Aron Griffis <agriffis@gentoo.org>
   abiword-plugins-2.4.2.ebuild:
diff --git a/app-office/abiword-plugins/Manifest b/app-office/abiword-plugins/Manifest
index ab26a25d2aca..039aaf431e01 100644
--- a/app-office/abiword-plugins/Manifest
+++ b/app-office/abiword-plugins/Manifest
@@ -1,20 +1,33 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 b7a15d1b536f3e999761c9ddbe80ee62 ChangeLog 2193
+MD5 ddbf06e2da041daaa06f8f5928170b84 ChangeLog 2438
+RMD160 b7ed3eaa9398ff9ba4e187c9f8c19c440f1ae3e7 ChangeLog 2438
+SHA256 75e937c76939074155006d7430f0b71f9ff06fe134e9524ec4b46adf48e687b2 ChangeLog 2438
 MD5 e88aea36421897bd94592e363e18ef69 abiword-plugins-2.4.1-r1.ebuild 1638
+RMD160 e9173c5bbf3b5cdeafbe16f884cb8a2ace92c31c abiword-plugins-2.4.1-r1.ebuild 1638
+SHA256 294658f3c09ee99e848632ec7b50ab3dd66a7c8bf3f18bef14073579911c62e1 abiword-plugins-2.4.1-r1.ebuild 1638
 MD5 611125dc4e37101c182f962cb89bd6f4 abiword-plugins-2.4.1-r2.ebuild 2269
-MD5 30c4290f16aa0332f62c264739f63ba4 abiword-plugins-2.4.2.ebuild 2059
+RMD160 26886d3bda7d439fd1a6e500a16721d67560c9ea abiword-plugins-2.4.1-r2.ebuild 2269
+SHA256 d1369823da8a740ffedd9e448f4aaa44e061cd64455015a1e65fa317e497b574 abiword-plugins-2.4.1-r2.ebuild 2269
+MD5 346ee571fea1fb67d006c0c006cecba7 abiword-plugins-2.4.2.ebuild 2149
+RMD160 572afade5e0030901ed9adebbc9153250a5ca105 abiword-plugins-2.4.2.ebuild 2149
+SHA256 00b023d7ceac583eeda52d744c7a321f497720ca83eacc3964d7387f1a4408d6 abiword-plugins-2.4.2.ebuild 2149
 MD5 d24a48680d49eefc71e38167a3a5c1e3 files/abiword-plugins-2.4.1-goffice.patch 2837
+RMD160 da4c38938573d109559b0a9d0b4f898a4681d0b5 files/abiword-plugins-2.4.1-goffice.patch 2837
+SHA256 990f4845abaf5cdb22640a4e2a727ccd64dacf43bb7e4468953258ac0f4bbe1d files/abiword-plugins-2.4.1-goffice.patch 2837
 MD5 221600d690252654411fd4651bdf8ef6 files/abiword-plugins-2.4.2-gcc41.patch 581
+RMD160 cb40198836690e5f9bcd8aa5e9e19b820b6f95ce files/abiword-plugins-2.4.2-gcc41.patch 581
+SHA256 5b97cc59e9b5cdfe432649b1162f0742b2e7f54933cab0544fb29eda48e7ca64 files/abiword-plugins-2.4.2-gcc41.patch 581
 MD5 c20fafc315b3ee5486c3d8ab489e84b1 files/digest-abiword-plugins-2.4.1-r1 68
+RMD160 6dadede09062cc0be975176c3c57dc23bc945a82 files/digest-abiword-plugins-2.4.1-r1 68
+SHA256 8233329f89aa53a40f361149707c94b147afe2c630987f5bd3263f65e8697920 files/digest-abiword-plugins-2.4.1-r1 68
 MD5 c20fafc315b3ee5486c3d8ab489e84b1 files/digest-abiword-plugins-2.4.1-r2 68
-MD5 1e204780e303e366641a44d07fa9cce5 files/digest-abiword-plugins-2.4.2 68
+RMD160 6dadede09062cc0be975176c3c57dc23bc945a82 files/digest-abiword-plugins-2.4.1-r2 68
+SHA256 8233329f89aa53a40f361149707c94b147afe2c630987f5bd3263f65e8697920 files/digest-abiword-plugins-2.4.1-r2 68
+MD5 044a4f35a0cada9beb0dd0d531d40349 files/digest-abiword-plugins-2.4.2 250
+RMD160 a22cb0d2b18e912ab1ff46a83c78fc94e5dbc0a1 files/digest-abiword-plugins-2.4.2 250
+SHA256 f3107a4919c07769ed2547507378b37ce8610b5eaf9a649eaff03fba5dbbca23 files/digest-abiword-plugins-2.4.2 250
+MD5 42e891bf245c1e9041e1b66a65dfc770 files/poppler_abi_change.patch 766
+RMD160 982e40c24d73111356501ec8687011f4f489c2c7 files/poppler_abi_change.patch 766
+SHA256 a0a76849b595daee8369c0f3c81ce8f814e39c1225bb4b316e60b4dd30d0b500 files/poppler_abi_change.patch 766
 MD5 48bd81fe7d336ec791cfef178ede4ed3 metadata.xml 349
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFD+61iJrHF4yAQTrARApvqAJ9cWMIpRMYp6+83mKHmFdLfb0ZPsACgi6Vm
-txOP5vecT2aPInrhdG8ohX4=
-=PjX8
------END PGP SIGNATURE-----
+RMD160 b782e878883a03e37cf4752a0bf38b0d4d25a182 metadata.xml 349
+SHA256 66b5ad324389a05141464b971b3671f97d9d3e7aa64f583dd3520b5f1dcffd07 metadata.xml 349
diff --git a/app-office/abiword-plugins/abiword-plugins-2.4.2.ebuild b/app-office/abiword-plugins/abiword-plugins-2.4.2.ebuild
index 8a0219639451..7c22713887a8 100644
--- a/app-office/abiword-plugins/abiword-plugins-2.4.2.ebuild
+++ b/app-office/abiword-plugins/abiword-plugins-2.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.4.2.ebuild,v 1.2 2006/02/22 00:16:25 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword-plugins/abiword-plugins-2.4.2.ebuild,v 1.3 2006/03/09 18:25:30 joem Exp $
 
 inherit eutils
 
@@ -31,7 +31,7 @@ RDEPEND="=app-office/abiword-${PV}
 		>=gnome-extra/libgda-1.2
 		>=gnome-extra/libgnomedb-1.2 )
 	math? ( >=x11-libs/gtkmathview-0.7.5 )
-	pdf? ( >=app-text/poppler-0.4 )
+	pdf? ( >=app-text/poppler-0.5.0-r1 )
 	readline? ( sys-libs/readline )
 	thesaurus? ( >=app-text/aiksaurus-1.2 )
 	wordperfect? ( >=app-text/libwpd-0.8 )
@@ -41,6 +41,12 @@ RDEPEND="=app-office/abiword-${PV}
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.9"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/poppler_abi_change.patch
+}
+
 src_compile() {
 	local myconf="--enable-all \
 		--with-abiword=${WORKDIR}/abiword-${PV}/abi \
diff --git a/app-office/abiword-plugins/files/digest-abiword-plugins-2.4.2 b/app-office/abiword-plugins/files/digest-abiword-plugins-2.4.2
index 97d98056a1a4..3fce9b5e6438 100644
--- a/app-office/abiword-plugins/files/digest-abiword-plugins-2.4.2
+++ b/app-office/abiword-plugins/files/digest-abiword-plugins-2.4.2
@@ -1 +1,3 @@
 MD5 935f1218eab7ff96b7a23cfeba4e76d1 abiword-2.4.2.tar.bz2 24729796
+RMD160 1b30dd7da238bd282abcce814a0b4d7c93e17199 abiword-2.4.2.tar.bz2 24729796
+SHA256 6a5921f9ab593637008bc0d5411ef9d8a689a4c89d9f7b273236331b14f66933 abiword-2.4.2.tar.bz2 24729796
diff --git a/app-office/abiword-plugins/files/poppler_abi_change.patch b/app-office/abiword-plugins/files/poppler_abi_change.patch
new file mode 100644
index 000000000000..1dd38ebfcf86
--- /dev/null
+++ b/app-office/abiword-plugins/files/poppler_abi_change.patch
@@ -0,0 +1,17 @@
+===================================================================
+RCS file: /home/cvs/cvsroot/abiword-plugins/wp/impexp/pdf/xp/ie_imp_PDF.cpp,v
+retrieving revision 1.2
+retrieving revision 1.3
+diff -u -r1.2 -r1.3
+--- abiword-plugins/wp/impexp/pdf/xp/ie_imp_PDF.cpp	2005/06/29 02:22:13	1.2
++++ abiword-plugins/wp/impexp/pdf/xp/ie_imp_PDF.cpp	2006/01/22 01:24:52	1.3
+@@ -75,7 +75,7 @@
+       UT_tmpnam(temporary_file);
+ 
+       TextOutputDev *textOut = new TextOutputDev(temporary_file, gFalse, gFalse, gFalse);
+-      doc->displayPages(textOut, 1, doc->getNumPages(), 72, 72, 0, gTrue, gFalse);
++      doc->displayPages(textOut, 1, doc->getNumPages(), 72, 72, 0, gTrue, gFalse, gFalse);
+       delete textOut;
+ 
+       IE_Imp_Text txt_imp(getDoc(), "UTF-8");      
+