summaryrefslogtreecommitdiffstats
path: root/main/abiword/abiword-2.8.6-glib-2.31.patch
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2012-04-26 06:22:01 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2012-04-26 06:22:01 +0000
commit0a2fec687d36aa7c0a33423e042fec345d9d699b (patch)
tree89403104e747006ba95efb56d3a09bf5fabe510d /main/abiword/abiword-2.8.6-glib-2.31.patch
parente3debc639a5f22b20a8683ade2421ff3fd72eb9d (diff)
downloadaports-0a2fec687d36aa7c0a33423e042fec345d9d699b.tar.bz2
aports-0a2fec687d36aa7c0a33423e042fec345d9d699b.tar.xz
main/abiword: build fix for glib-2.32
Diffstat (limited to 'main/abiword/abiword-2.8.6-glib-2.31.patch')
-rw-r--r--main/abiword/abiword-2.8.6-glib-2.31.patch40
1 files changed, 40 insertions, 0 deletions
diff --git a/main/abiword/abiword-2.8.6-glib-2.31.patch b/main/abiword/abiword-2.8.6-glib-2.31.patch
new file mode 100644
index 000000000..beff2289f
--- /dev/null
+++ b/main/abiword/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
+