diff options
| author | Márcio Alexandre Silva Delgado <coadde@lavabit.com> | 2013-02-14 12:13:51 -0200 |
|---|---|---|
| committer | Márcio Alexandre Silva Delgado <coadde@lavabit.com> | 2013-02-14 12:13:51 -0200 |
| commit | f67b20d8da80cc120dcfea0d3405de74a8e5f84a (patch) | |
| tree | 2d57e7cdc4772adc20017980fda13f1267cfc127 /libre/abiword-libre/abiword-2.8.6-glib-2.31.patch | |
| parent | 327433a2a7ae50151dcf0e6f6840a3eb5c065808 (diff) | |
| parent | 9e33e61c00e3da5565b47e16b6618ab98c9ea38f (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre
Diffstat (limited to 'libre/abiword-libre/abiword-2.8.6-glib-2.31.patch')
| -rw-r--r-- | libre/abiword-libre/abiword-2.8.6-glib-2.31.patch | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/libre/abiword-libre/abiword-2.8.6-glib-2.31.patch b/libre/abiword-libre/abiword-2.8.6-glib-2.31.patch new file mode 100644 index 000000000..8b938cc25 --- /dev/null +++ b/libre/abiword-libre/abiword-2.8.6-glib-2.31.patch @@ -0,0 +1,40 @@ +------------------------------------------------------------------------ +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. +------------------------------------------------------------------------ +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) ++++ 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 +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 + |