From a3574b9529a82018664ff6e810d7d81b2bb4eb75 Mon Sep 17 00:00:00 2001
From: Omar Vega Ramos <ovruni@gnu.org.pe>
Date: Sat, 22 Sep 2012 08:21:30 -0500
Subject: Adding abiword-2.8.6-glib-2.31.patch . Fix #70

---
 libre/abiword-libre/PKGBUILD                      |  7 +++++--
 libre/abiword-libre/abiword-2.8.6-glib-2.31.patch | 23 +++++++++++++++++++++++
 2 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 libre/abiword-libre/abiword-2.8.6-glib-2.31.patch

(limited to 'libre/abiword-libre')

diff --git a/libre/abiword-libre/PKGBUILD b/libre/abiword-libre/PKGBUILD
index 4286d258a..f62ca7d33 100644
--- a/libre/abiword-libre/PKGBUILD
+++ b/libre/abiword-libre/PKGBUILD
@@ -18,12 +18,14 @@ source=("http://www.abisource.com/downloads/${_pkgbase}/${pkgver}/source/${_pkgb
         'compat_libwpg_0_9.patch'
 	'abiword-2.8.6-no-undefined.patch'
         'abiword-2.8.6-libpng15.patch'
-        'liberation-fonts.patch')
+        'liberation-fonts.patch'
+        'abiword-2.8.6-glib-2.31.patch')
 md5sums=('f883b0a7f26229a9c66fd6a1a94381aa'
          '09446a2ebba8288fc611e88f7cf17298'
          '42e2614b6e0aad457d91f6ce20b6f225'
          '40e370e7e88c5437140ef18037abfbd3'
-         '880b17db6f249d977d2a7cd012d9ce02')
+         '880b17db6f249d977d2a7cd012d9ce02'
+         'a467caab414ec3eb72fc5d3b05f07eb8')
 
 build() {
   cd "${srcdir}/${_pkgbase}-${pkgver}"
@@ -33,6 +35,7 @@ build() {
   patch -Np1 -i "${srcdir}/abiword-2.8.6-no-undefined.patch"
   patch -Np0 -i "${srcdir}/abiword-2.8.6-libpng15.patch"
   patch -Np1 -i "${srcdir}/liberation-fonts.patch"
+  patch -Np1 -i "${srcdir}/abiword-2.8.6-glib-2.31.patch"
 
   libtoolize --force
   autoreconf
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..c43c4d05c
--- /dev/null
+++ b/libre/abiword-libre/abiword-2.8.6-glib-2.31.patch
@@ -0,0 +1,23 @@
+diff -Nur abiword-2.8.6.orig/src/af/util/xp/ut_go_file.h abiword-2.8.6/src/af/util/xp/ut_go_file.h
+--- abiword-2.8.6.orig/src/af/util/xp/ut_go_file.h	2009-08-27 08:27:10.000000000 -0500
++++ abiword-2.8.6/src/af/util/xp/ut_go_file.h	2012-09-22 03:36:55.774542745 -0500
+@@ -31,7 +31,6 @@
+ 
+ #include <glib.h>
+ #include <gsf/gsf.h>
+-#include <glib/gerror.h>
+ #include <time.h>
+ 
+ G_BEGIN_DECLS
+diff -Nur abiword-2.8.6.orig/goffice-bits/goffice/app/goffice-app.h abiword-2.8.6/goffice-bits/goffice/app/goffice-app.h
+--- abiword-2.8.6.orig/goffice-bits/goffice/app/goffice-app.h	2007-01-16 18:17:27.000000000 -0500
++++ abiword-2.8.6/goffice-bits/goffice/app/goffice-app.h	2012-09-22 03:35:46.741217566 -0500
+@@ -22,7 +22,7 @@
+ #ifndef GOFFICE_APP_H
+ #define GOFFICE_APP_H
+ 
+-#include <glib/gmacros.h>
++#include <glib.h>
+ 
+ G_BEGIN_DECLS
+ 
-- 
cgit v1.2.3-54-g00ecf