main/abiword: build fix for glib-2.32

main/abiword/APKBUILD

 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=abiword
 pkgver=2.8.6
-pkgrel=7
+pkgrel=8
 pkgdesc="A fully-featured word processor"
 url="http://www.abisource.com"
 arch="all"
@@ -31,6 +31,7 @@ done
 source="http://www.abisource.com/downloads/$pkgname/$pkgver/source/$pkgname-$pkgver.tar.gz
 	abiword-png15.patch
 	abiword-2.8.6-no-undefined.patch
+	abiword-2.8.6-glib-2.31.patch
 	"
 
 prepare() {
@@ -84,4 +85,5 @@ plugins() {
 
 md5sums="f883b0a7f26229a9c66fd6a1a94381aa  abiword-2.8.6.tar.gz
 1d0bb11ed10b431ab312173de81d12c4  abiword-png15.patch
-42e2614b6e0aad457d91f6ce20b6f225  abiword-2.8.6-no-undefined.patch"
+42e2614b6e0aad457d91f6ce20b6f225  abiword-2.8.6-no-undefined.patch
+2cd22b0c06cf1d285731e5bade666c26  abiword-2.8.6-glib-2.31.patch"

main/abiword/abiword-2.8.6-glib-2.31.patch

+------------------------------------------------------------------------
+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
+