diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2011-12-17 10:25:27 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2011-12-17 10:25:27 +0000 |
| commit | 4293c337c52386d8c7d0d71267d5d46cbc276dac (patch) | |
| tree | b7e22950be5f3d616d7f60726302b3186fa09ac7 | |
| parent | Fixed tests, bug 357157. Thanks to Ian Delaney (diff) | |
| download | historical-4293c337c52386d8c7d0d71267d5d46cbc276dac.tar.gz historical-4293c337c52386d8c7d0d71267d5d46cbc276dac.tar.bz2 historical-4293c337c52386d8c7d0d71267d5d46cbc276dac.zip | |
plugin-configure.m4 patching was skipped by error, thanks a lot to Cody Schafer for reporting bug #394897.
Package-Manager: portage-2.1.10.40/cvs/Linux x86_64
| -rw-r--r-- | app-office/abiword/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/abiword/Manifest | 10 | ||||
| -rw-r--r-- | app-office/abiword/files/abiword-2.8.6-libwpd.patch | 22 |
3 files changed, 32 insertions, 6 deletions
diff --git a/app-office/abiword/ChangeLog b/app-office/abiword/ChangeLog index 0ae14a0d32ba..e808a634a81b 100644 --- a/app-office/abiword/ChangeLog +++ b/app-office/abiword/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-office/abiword # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/ChangeLog,v 1.249 2011/12/04 20:03:03 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/ChangeLog,v 1.250 2011/12/17 10:25:27 pacho Exp $ + + 17 Dec 2011; Pacho Ramos <pacho@gentoo.org> files/abiword-2.8.6-libwpd.patch: + plugin-configure.m4 patching was skipped by error, thanks a lot to Cody + Schafer for reporting bug #394897. *abiword-2.8.6-r2 (04 Dec 2011) diff --git a/app-office/abiword/Manifest b/app-office/abiword/Manifest index fdb2bcd8ab6e..928c1224471d 100644 --- a/app-office/abiword/Manifest +++ b/app-office/abiword/Manifest @@ -3,16 +3,16 @@ Hash: SHA1 AUX abiword-2.8.6-gcc46.patch 557 RMD160 406dbd7dc80f374e9a163684b494de9a504c09a7 SHA1 159b1cd0b9354868ab86f851b64a03dae7d254dc SHA256 78e3b3be4340022f57246e88948d947bfd031819664edce965a40d7a518862a3 AUX abiword-2.8.6-libpng15.patch 3710 RMD160 7de98b2183cd21a6d538bea8fba86a1c4d35a21e SHA1 646736e4e71a92574f4ccb7bc17ae422a13f04c2 SHA256 a5ea99ba7aa00ebc3a669d6cbd019b172e576df6b2eb8349505ed18576e10e90 -AUX abiword-2.8.6-libwpd.patch 14344 RMD160 c564396d23fc94881c64cde1d39e724a80cf8e4d SHA1 2a1030485a33fac481a822f1f83cce5d5f535468 SHA256 4318aa2e9754902eb31d65cb94be68bf870c2250bfa82564e84f4eb04f413b9c +AUX abiword-2.8.6-libwpd.patch 15024 RMD160 2f48380cae981624cc44c552391c4a7fcd076872 SHA1 38f7074905afcdd2dbc8a6b9a8f6da080f7200d0 SHA256 92f89f04633f67d0568160e701815a5daf0a2de03608a1a3bd5b8f7e7f4f0fea DIST abiword-2.8.6.tar.gz 9218827 RMD160 caabab25d197f9553ea12376de36fc7f5a771a58 SHA1 998f69d038000b3fc027d4259548f02d67c8d0df SHA256 d99089a63a6cfc1a6a4a026be9278028d47d224088d24b1853acb67e95683a15 EBUILD abiword-2.8.6-r1.ebuild 4635 RMD160 1685482e91ff79c7d0f580a5eaa862ae280686db SHA1 60f8eab53b786a3ef95b3acfe3be643295b49732 SHA256 9ffd64c34aa45e8042f88021d9fb97ae59176596a74821e09104e010f91e6fff EBUILD abiword-2.8.6-r2.ebuild 4580 RMD160 5be59b95e4061545bd522a66fe537111dc12a710 SHA1 e628d3114cc83e09ab3caff20648be80fac6fbd8 SHA256 6576e7339e3b1ba10223765894af9b4109bfc7c48b96d43b32c45e5eb12be8a9 -MISC ChangeLog 33622 RMD160 4ff9951a3d0d4d5948c3145e8d4fbd74d9e379af SHA1 5f9f5cadaef251dc240d83083933fab2a18c971c SHA256 8d06fe1695f866fd6cbaf72eb0e7b0952ae2d17d22f601fd7e81ed32b326c1a1 +MISC ChangeLog 33814 RMD160 30d8c61f5dfa2ab4f9629f95616d92c74e284f48 SHA1 102f6cc490ba11d03bd52b4c48f872f65b2cee59 SHA256 52860ad0192be69c9cc4fc7e31927c765da5e7b425428ef12c3e5f1ca5f8fe78 MISC metadata.xml 879 RMD160 df1f57e78a294b266ece583d9c04e685fc6f2b53 SHA1 8876780818c62eb42318ba47ef68c15cc80a2a10 SHA256 68442b26d087af39be60f2b41749ae53e94073770449f80bf8f6fd2286e0be84 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk7b0f4ACgkQCaWpQKGI+9TYMACeK7XoPNda+X0CYDzzKKSsYmyM -tRkAniNvd53eZAikYg7izwZUiiLq9L7X -=xlJu +iEYEARECAAYFAk7sbhwACgkQCaWpQKGI+9Qa/QCdGM6Nu8LEckyJ7tE0rAIYBeZ3 +OHAAoIRFh9xLaw2+n6DMKY4cJElo7opt +=CYHW -----END PGP SIGNATURE----- diff --git a/app-office/abiword/files/abiword-2.8.6-libwpd.patch b/app-office/abiword/files/abiword-2.8.6-libwpd.patch index a3f4a474e5a5..a4765e00c739 100644 --- a/app-office/abiword/files/abiword-2.8.6-libwpd.patch +++ b/app-office/abiword/files/abiword-2.8.6-libwpd.patch @@ -389,3 +389,25 @@ if test "$enable_wpg" != ""; then +--- plugin-configure.m4~ 2010-06-13 23:17:27.000000000 +0200 ++++ plugin-configure.m4 2011-12-17 11:02:51.870252482 +0100 +@@ -794,7 +794,7 @@ + AC_SUBST([OPENXML_LIBS]) + + +-wpg_pkgs="$gsf_req libwpg-0.1 >= 0.1.0 libwpd-0.8 >= 0.8.0" ++wpg_pkgs="$gsf_req libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= -0.9.0" + wpg_deps="no" + + if test "$enable_wpg" != ""; then +@@ -1497,8 +1497,8 @@ + AC_SUBST([EML_LIBS]) + + +-wordperfect_pkgs="libwpd-0.8 >= 0.8.0 $gsf_req" +-wordperfect_wps_pkgs='libwps-0.1 >= 0.1.0' ++wordperfect_pkgs="libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0 $gsf_req" ++wordperfect_wps_pkgs='libwps-0.2 >= 0.2.0' + wordperfect_deps="no" + + WORDPERFECT_CFLAGS= |