From 92aca7c9223fa641f7378bff6f95ae9e94bcdb5e Mon Sep 17 00:00:00 2001
From: wiz <wiz@pkgsrc.org>
Date: Thu, 3 May 2012 06:09:55 +0000
Subject: Fix build with glib-2.32.

---
 editors/abiword/distinfo                                  |  4 +++-
 .../patches/patch-goffice-bits_goffice_app_goffice-app.h  | 15 +++++++++++++++
 .../abiword/patches/patch-src_af_util_xp_ut__go__file.h   | 14 ++++++++++++++
 3 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 editors/abiword/patches/patch-goffice-bits_goffice_app_goffice-app.h
 create mode 100644 editors/abiword/patches/patch-src_af_util_xp_ut__go__file.h

(limited to 'editors')

diff --git a/editors/abiword/distinfo b/editors/abiword/distinfo
index e016d204952..b645ab1a60d 100644
--- a/editors/abiword/distinfo
+++ b/editors/abiword/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.62 2011/02/01 10:48:14 wiz Exp $
+$NetBSD: distinfo,v 1.63 2012/05/03 06:16:42 wiz Exp $
 
 SHA1 (abiword-2.8.6.tar.gz) = 998f69d038000b3fc027d4259548f02d67c8d0df
 RMD160 (abiword-2.8.6.tar.gz) = caabab25d197f9553ea12376de36fc7f5a771a58
@@ -9,6 +9,8 @@ SHA1 (patch-ac) = a82fd781195e9ff52dbc33258fd4774cd23fe5c9
 SHA1 (patch-ad) = 48ff4fcce593f9996e90cce718b2f774b271d5a3
 SHA1 (patch-ae) = ec3bb0a00100fea97f46b3a25440d7a4e46e30eb
 SHA1 (patch-af) = fc6927eb963c4be956825d1656e8957b358ed1ad
+SHA1 (patch-goffice-bits_goffice_app_goffice-app.h) = 894647ea5d2176db1793673befe703f5be603278
 SHA1 (patch-plugins_bmp_xp_ie__impGraphic__BMP.cpp) = 65852f6f934c9fdf2aa9bf02d0a2ad66b5c2db09
 SHA1 (patch-plugins_garble_xp_abiword-garble-png.cpp) = c9b4b7030fa038da9ba37b5489d8d8571a0e6c77
 SHA1 (patch-sa) = 29ee7e9891b11773217ec73bbda01e2591e78b56
+SHA1 (patch-src_af_util_xp_ut__go__file.h) = 07a9d580ca9f6b5c1e8814d182d9f56d3f3a7e72
diff --git a/editors/abiword/patches/patch-goffice-bits_goffice_app_goffice-app.h b/editors/abiword/patches/patch-goffice-bits_goffice_app_goffice-app.h
new file mode 100644
index 00000000000..c0a03ed52c0
--- /dev/null
+++ b/editors/abiword/patches/patch-goffice-bits_goffice_app_goffice-app.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-goffice-bits_goffice_app_goffice-app.h,v 1.1 2012/05/03 06:16:42 wiz Exp $
+
+Fix build with glib-2.32.
+
+--- goffice-bits/goffice/app/goffice-app.h.orig	2007-01-16 23:17:27.000000000 +0000
++++ goffice-bits/goffice/app/goffice-app.h
+@@ -22,7 +22,7 @@
+ #ifndef GOFFICE_APP_H
+ #define GOFFICE_APP_H
+ 
+-#include <glib/gmacros.h>
++#include <glib.h>
+ 
+ G_BEGIN_DECLS
+ 
diff --git a/editors/abiword/patches/patch-src_af_util_xp_ut__go__file.h b/editors/abiword/patches/patch-src_af_util_xp_ut__go__file.h
new file mode 100644
index 00000000000..1663572522d
--- /dev/null
+++ b/editors/abiword/patches/patch-src_af_util_xp_ut__go__file.h
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_af_util_xp_ut__go__file.h,v 1.1 2012/05/03 06:16:42 wiz Exp $
+
+Fix build with glib-2.32.
+
+--- src/af/util/xp/ut_go_file.h.orig	2009-08-27 13:27:10.000000000 +0000
++++ src/af/util/xp/ut_go_file.h
+@@ -31,7 +31,6 @@
+ 
+ #include <glib.h>
+ #include <gsf/gsf.h>
+-#include <glib/gerror.h>
+ #include <time.h>
+ 
+ G_BEGIN_DECLS
-- 
cgit v1.2.3