diff options
| author |   Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-04-20 17:35:20 +0000 |
|---|---|---|
| committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-04-20 17:35:20 +0000 |
| commit | 4d2323be59b4665ff18eaaf14cc0bab130fc0cd0 (patch) | |
| tree | 413cac1430b31e49313d7af113c08f095847021e /app-office/abiword | |
| parent | Drop RESTRICT I just used for testing. Drop unused inherit eutils. (diff) | |
| download | gentoo-2-4d2323be59b4665ff18eaaf14cc0bab130fc0cd0.tar.gz gentoo-2-4d2323be59b4665ff18eaaf14cc0bab130fc0cd0.tar.bz2 gentoo-2-4d2323be59b4665ff18eaaf14cc0bab130fc0cd0.zip | |
Fix another glib-2.32 header issue (bug #412735, thanks to Anton Kochkov fo reporting).
(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)
Diffstat (limited to 'app-office/abiword')
| -rw-r--r-- | app-office/abiword/ChangeLog | 7 | ||||
| -rw-r--r-- | app-office/abiword/files/abiword-2.8.6-glib-2.31.patch | 20 |
2 files changed, 26 insertions, 1 deletions
diff --git a/app-office/abiword/ChangeLog b/app-office/abiword/ChangeLog index c346220d1d65..e29ae769b7dd 100644 --- a/app-office/abiword/ChangeLog +++ b/app-office/abiword/ChangeLog @@ -1,6 +1,11 @@ # 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.257 2012/04/08 01:57:38 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/ChangeLog,v 1.258 2012/04/20 17:35:20 tetromino Exp $ + + 20 Apr 2012; Alexandre Rostovtsev <tetromino@gentoo.org> + files/abiword-2.8.6-glib-2.31.patch: + Fix another glib-2.32 header issue (bug #412735, thanks to Anton Kochkov for + reporting). 08 Apr 2012; Alexandre Rostovtsev <tetromino@gentoo.org> abiword-2.8.6-r2.ebuild, +files/abiword-2.8.6-glib-2.31.patch: 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 index df40dc7bdf4a..8b938cc25a7e 100644 --- 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 @@ -6,6 +6,13 @@ Changed paths: Bug 13197: only import glib.h Patch by Dominique Leuenberger. ------------------------------------------------------------------------ +r30602 | hub | 2012-01-30 02:00:38 -0500 (Mon, 30 Jan 2012) | 2 lines +Changed paths: + M /abiword/trunk/goffice-bits/goffice/app/goffice-app.h + +Bug 13247 - Fix glib headers. Patch by Funda Wang +(safe to backport) +------------------------------------------------------------------------ Index: src/af/util/xp/ut_go_file.h =================================================================== --- src/af/util/xp/ut_go_file.h (revision 30478) @@ -18,3 +25,16 @@ Index: src/af/util/xp/ut_go_file.h #include <time.h> G_BEGIN_DECLS +Index: goffice-bits/goffice/app/goffice-app.h +=================================================================== +--- goffice-bits/goffice/app/goffice-app.h (revision 30601) ++++ goffice-bits/goffice/app/goffice-app.h (revision 30602) +@@ -22,7 +22,7 @@ + #ifndef GOFFICE_APP_H + #define GOFFICE_APP_H + +-#include <glib/gmacros.h> ++#include <glib.h> + + G_BEGIN_DECLS + |