From 5520f3ade7a78d45703200e501ad544525c937e2 Mon Sep 17 00:00:00 2001
From: Derek Atkins <derek@ihtfp.com>
Date: Sun, 27 Aug 2006 01:17:01 +0000
Subject: [PATCH] Patch goffice to deal properly with goffice.def

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@14737 57a11ea4-9604-0410-9ed3-97b8803252fd
---
 packaging/win32/goffice-0.3.0-patch.diff | 15 +++++++++++++--
 packaging/win32/install.sh               |  4 ----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/packaging/win32/goffice-0.3.0-patch.diff b/packaging/win32/goffice-0.3.0-patch.diff
index 6caa61f1b8..b35aed18b5 100644
--- a/packaging/win32/goffice-0.3.0-patch.diff
+++ b/packaging/win32/goffice-0.3.0-patch.diff
@@ -83,7 +83,7 @@ diff -ur goffice-0.3.0/goffice/utils/go-file.c goffice-0.3.0-mingw/goffice/utils
  	group_info = getgrgid (gid);
  
  	if (group_info == NULL)
-@@ -802,6 +815,9 @@
+@@ -802,7 +815,10 @@
  	(void) go_guess_encoding (name, strlen (name),
  				  NULL, &nameutf8);
  	return nameutf8;
@@ -95,7 +95,7 @@ diff -ur goffice-0.3.0/goffice/utils/go-file.c goffice-0.3.0-mingw/goffice/utils
  GOFilePermissions *
 --- goffice-0.3.0/configure.in~	Sat Aug 26 00:15:26 2006
 +++ goffice-0.3.0/configure.in	Sat Aug 26 00:53:34 2006
-@@ -93,6 +93,7 @@
+@@ -93,7 +93,8 @@
  	libxml-2.0		>= 2.4.12
  	pango			>= 1.8.1
  	pangoft2		>= 1.8.1
@@ -103,3 +103,14 @@ diff -ur goffice-0.3.0/goffice/utils/go-file.c goffice-0.3.0-mingw/goffice/utils
  	libart-2.0		>= 2.3.11
  "
  goffice_cairo_reqs="
+--- goffice-0.3.0/goffice/Makefile.am~	Sat Aug 26 20:52:04 2006
++++ goffice-0.3.0/goffice/Makefile.am	Sat Aug 26 20:58:53 2006
+@@ -73,7 +73,7 @@
+ 	data/local.def drawing/local.def graph/local.def \
+ 	gtk/local.def ms-compat/local.def utils/local.def
+ 	echo EXPORTS > $@ && \
+-	cat $^ | sort >> $@
++	cat $^ | sort | sed '/^go_doc_mark_not_modified$/d;/^go_plugin_init$/d;/^go_plugin_shutdown$/d' >> $@
+ 
+ if HAVE_LIBEXE
+ goffice_mslibdir = $(DESTDIR)$(libdir)
diff --git a/packaging/win32/install.sh b/packaging/win32/install.sh
index b57e8bd6e0..ccfce88190 100644
--- a/packaging/win32/install.sh
+++ b/packaging/win32/install.sh
@@ -550,10 +550,6 @@ function inst_goffice() {
 	    automake
 	    autoconf
 	    ./configure --prefix=$_GOFFICE_UDIR
-	    cp goffice/goffice.def goffice/goffice.def.bak
-	    cat goffice/goffice.def.bak \
-		| sed '/^go_doc_mark_not_modified$/d;/^go_plugin_init$/d;/^go_plugin_shutdown$/d' \
-		> goffice/goffice.def
 	    [ -f dumpdef.pl ] || cp -p ../libgsf-*/dumpdef.pl .
 	    [ -f $mydir/intltool-merge ] && \
 		( mv intltool-merge intltool-merge.bak ; \