Fix build with glib-2.32.

6 files changed, 50 insertions, 3 deletions

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
diff --git a/www/nspluginwrapper/distinfo b/www/nspluginwrapper/distinfo
index 28b4730a500..b2e63ce7109 100644
--- a/www/nspluginwrapper/distinfo
+++ b/www/nspluginwrapper/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2011/01/20 13:06:15 pooka Exp $
+$NetBSD: distinfo,v 1.10 2012/05/03 06:09:55 wiz Exp $
 
 SHA1 (nspluginwrapper-1.2.2.tar.bz2) = be581c39dcc1a8d9a5b3f81e4650f553a30cf249
 RMD160 (nspluginwrapper-1.2.2.tar.bz2) = d5aa265966f87c51bb9ea4f2a079a87b74fdcbf3
@@ -9,3 +9,4 @@ Size (nspluginwrapper-i386-1.2.2-1.x86_64.rpm) = 69425 bytes
 SHA1 (patch-aa) = 28f9e18e519337852cb47d04ed0c1cea76b3416d
 SHA1 (patch-ab) = 20dc1b6ff4036a0946dd469860eb9b6c129fdb7a
 SHA1 (patch-ac) = b42a1241abcbfc9344c810797785222cd79681ac
+SHA1 (patch-src_npw-player.c) = 14828d0644ce3823b89b373b36afdf29f9a563a1
diff --git a/www/nspluginwrapper/patches/patch-ac b/www/nspluginwrapper/patches/patch-ac
index b54c27c6685..53f554fd4f9 100644
--- a/www/nspluginwrapper/patches/patch-ac
+++ b/www/nspluginwrapper/patches/patch-ac
@@ -1,4 +1,4 @@
-	$NetBSD: patch-ac,v 1.3 2011/01/20 13:06:15 pooka Exp $
+$NetBSD: patch-ac,v 1.4 2012/05/03 06:09:55 wiz Exp $
 
 --- src/npw-viewer.sh.orig	2008-12-14 12:24:19.000000000 +0100
 +++ src/npw-viewer.sh	2011-01-19 12:20:26.000000000 +0100
diff --git a/www/nspluginwrapper/patches/patch-src_npw-player.c b/www/nspluginwrapper/patches/patch-src_npw-player.c
new file mode 100644
index 00000000000..64a2aaa434d
--- /dev/null
+++ b/www/nspluginwrapper/patches/patch-src_npw-player.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_npw-player.c,v 1.1 2012/05/03 06:09:55 wiz Exp $
+
+Adapt for glib-2.32.
+
+--- src/npw-player.c.orig	2009-01-02 08:54:10.000000000 +0000
++++ src/npw-player.c
+@@ -21,8 +21,6 @@
+ #include "sysdeps.h"
+ #include <unistd.h>
+ #include <glib.h>
+-#include <glib/gstdio.h>
+-#include <glib/gthread.h>
+ #include <gtk/gtk.h>
+ #include <gdk/gdkx.h>
+ #include <gdk/gdkkeysyms.h>