diff options
| author |   Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-04-08 01:57:38 +0000 |
|---|---|---|
| committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-04-08 01:57:38 +0000 |
| commit | a5a21f0c4d10298970601addbf244046e9d1bfa1 (patch) | |
| tree | b8c2ae49ce01029cf396c791fc8c8ec0ea5d209a /app-office/abiword | |
| parent | marked x86 per bug 410983 (diff) | |
| download | gentoo-2-a5a21f0c4d10298970601addbf244046e9d1bfa1.tar.gz gentoo-2-a5a21f0c4d10298970601addbf244046e9d1bfa1.tar.bz2 gentoo-2-a5a21f0c4d10298970601addbf244046e9d1bfa1.zip | |
Fix building with >=glib-2.31 (bug #406249).
(Portage version: 2.2.0_alpha99/cvs/Linux x86_64)
Diffstat (limited to 'app-office/abiword')
| -rw-r--r-- | app-office/abiword/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/abiword/abiword-2.8.6-r2.ebuild | 3 | ||||
| -rw-r--r-- | app-office/abiword/files/abiword-2.8.6-glib-2.31.patch | 20 |
3 files changed, 27 insertions, 2 deletions
diff --git a/app-office/abiword/ChangeLog b/app-office/abiword/ChangeLog index 87d30c171860..c346220d1d65 100644 --- a/app-office/abiword/ChangeLog +++ b/app-office/abiword/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-office/abiword # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/ChangeLog,v 1.256 2012/03/17 05:46:11 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/ChangeLog,v 1.257 2012/04/08 01:57:38 tetromino Exp $ + + 08 Apr 2012; Alexandre Rostovtsev <tetromino@gentoo.org> + abiword-2.8.6-r2.ebuild, +files/abiword-2.8.6-glib-2.31.patch: + Fix building with >=glib-2.31 (bug #406249). 17 Mar 2012; Samuli Suominen <ssuominen@gentoo.org> -abiword-2.8.6-r1.ebuild: old diff --git a/app-office/abiword/abiword-2.8.6-r2.ebuild b/app-office/abiword/abiword-2.8.6-r2.ebuild index dc30c61c5850..943c73e16905 100644 --- a/app-office/abiword/abiword-2.8.6-r2.ebuild +++ b/app-office/abiword/abiword-2.8.6-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.8.6-r2.ebuild,v 1.6 2012/02/12 14:34:00 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.8.6-r2.ebuild,v 1.7 2012/04/08 01:57:38 tetromino Exp $ EAPI="4" GCONF_DEBUG="yes" @@ -90,6 +90,7 @@ src_prepare() { epatch "${FILESDIR}"/${P}-libpng15.patch epatch "${FILESDIR}"/${P}-gcc46.patch epatch "${FILESDIR}"/${P}-libwpd.patch + epatch "${FILESDIR}"/${P}-glib-2.31.patch # install icon to pixmaps (bug #220097) sed 's:$(datadir)/icons:$(datadir)/pixmaps:' \ diff --git a/app-office/abiword/files/abiword-2.8.6-glib-2.31.patch b/app-office/abiword/files/abiword-2.8.6-glib-2.31.patch new file mode 100644 index 000000000000..df40dc7bdf4a --- /dev/null +++ b/app-office/abiword/files/abiword-2.8.6-glib-2.31.patch @@ -0,0 +1,20 @@ +------------------------------------------------------------------------ +r30479 | hub | 2011-11-29 00:39:09 -0500 (Tue, 29 Nov 2011) | 2 lines +Changed paths: + M /abiword/trunk/src/af/util/xp/ut_go_file.h + +Bug 13197: only import glib.h +Patch by Dominique Leuenberger. +------------------------------------------------------------------------ +Index: src/af/util/xp/ut_go_file.h +=================================================================== +--- src/af/util/xp/ut_go_file.h (revision 30478) ++++ src/af/util/xp/ut_go_file.h (revision 30479) +@@ -31,7 +31,6 @@ + + #include <glib.h> + #include <gsf/gsf.h> +-#include <glib/gerror.h> + #include <time.h> + + G_BEGIN_DECLS |