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 | 38173de7fc9c13ffa54ec2c708b8fce8468068b2 (patch) | |
| tree | 35260295ce92829cf2e9854d492a6b84f8b27571 | |
| parent | Fixed tests, bug 357157. Thanks to Ian Delaney (diff) | |
| download | gentoo-2-38173de7fc9c13ffa54ec2c708b8fce8468068b2.tar.gz gentoo-2-38173de7fc9c13ffa54ec2c708b8fce8468068b2.tar.bz2 gentoo-2-38173de7fc9c13ffa54ec2c708b8fce8468068b2.zip | |
plugin-configure.m4 patching was skipped by error, thanks a lot to Cody Schafer for reporting bug #394897.
(Portage version: 2.1.10.40/cvs/Linux x86_64)
| -rw-r--r-- | app-office/abiword/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/abiword/files/abiword-2.8.6-libwpd.patch | 22 |
2 files changed, 27 insertions, 1 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/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= |