More updates to the win32 build script.

- We need autotools before libgsf
- update the goffice build rule (but still not enabled)
- add the goffice patch.   Expand the patch.
- turn off the INTLTOOL_XML_RULE in the goffice makefiles.


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@14726 57a11ea4-9604-0410-9ed3-97b8803252fd

packaging/win32/custom.sh

@@ -84,6 +84,7 @@ LIBGSF_DIR=$GLOBAL_DIR\\libgsf
 
 GOFFICE_URL="$GNOME_MIRROR/sources/goffice/0.3/goffice-0.3.0.tar.bz2"
 GOFFICE_DIR=$GLOBAL_DIR\\goffice
+GOFFICE_PATCH=`pwd`/goffice-0.3.0-patch.diff
 
 SVN_URL="http://subversion.tigris.org/files/documents/15/32856/svn-1.3.2-setup.exe"
 SVN_DIR=$GLOBAL_DIR\\svn
@@ -100,8 +101,8 @@ add_step inst_guile
 add_step inst_glade
 add_step inst_gwrap
 add_step inst_gnome
-add_step inst_libgsf
 add_step inst_autotools
+add_step inst_libgsf
 add_step inst_svn
 add_step svn_up
 add_step inst_gnucash

packaging/win32/goffice-0.3.0-patch.diff

@@ -0,0 +1,105 @@
+diff -ur goffice-0.3.0/configure.in goffice-0.3.0-mingw/configure.in
+--- goffice-0.3.0/configure.in	Mon Apr 17 19:15:44 2006
++++ goffice-0.3.0-mingw/configure.in	Fri Aug 25 14:32:11 2006
+@@ -226,6 +226,8 @@
+ AM_CONDITIONAL(WITH_WIN32, test $with_win32 = yes)
+ AM_CONDITIONAL(HAVE_LIBEXE, test x$LIBEXE = xyes)
+ 
++AC_CHECK_HEADERS([pwd.h grp.h])
++
+ dnl *****************************
+ dnl FIXME: perhaps declare with AC_ARG_VAR?
+ dnl	   If we use the initial value of a variable, we have to make it precious.
+diff -ur goffice-0.3.0/goffice/utils/go-file.c goffice-0.3.0-mingw/goffice/utils/go-file.c
+--- goffice-0.3.0/goffice/utils/go-file.c	Wed Mar 29 15:41:37 2006
++++ goffice-0.3.0-mingw/goffice/utils/go-file.c	Fri Aug 25 13:11:41 2006
+@@ -44,8 +44,12 @@
+ #include <string.h>
+ #include <stdlib.h>
+ #include <unistd.h>
+-#include <pwd.h>
+-#include <grp.h>
++#ifdef HAVE_PWD_H
++# include <pwd.h>
++#endif
++#ifdef HAVE_GRP_H
++# include <grp.h>
++#endif
+ #include <time.h>
+ /* ------------------------------------------------------------------------- */
+ 
+@@ -675,11 +679,13 @@
+ {
+ 	gboolean error = FALSE;
+ 	guint uid = 0;
++	gboolean islocal = FALSE;
++#ifdef HAVE_PWD_H
+ 	struct passwd *password_info;
+ 	const char *name;
+ 	gsize namelen;
+ 	char *nameutf8;
+-	gboolean islocal = FALSE;
++#endif
+ 
+ #ifdef GOFFICE_WITH_GNOME
+ 	GnomeVFSFileInfo *file_info;
+@@ -718,6 +724,7 @@
+ 		return g_strdup (_("remote user"));
+ 	}
+ 
++#ifdef HAVE_PWD_H
+ 	password_info = getpwuid (uid);
+ 
+ 	if (password_info == NULL)
+@@ -739,6 +746,9 @@
+ 		nameutf8[--namelen] = 0;
+ 
+ 	return nameutf8;
++#else
++	return NULL;
++#endif
+ }
+ 
+ /*
+@@ -750,10 +760,12 @@
+ {
+ 	gboolean error = FALSE;
+ 	guint gid = 0;
+-	struct group *group_info;
+ 	gboolean islocal = FALSE;
++#ifdef HAVE_GRP_H
++	struct group *group_info;
+ 	const char *name;
+ 	char *nameutf8;
++#endif
+ 
+ #ifdef GOFFICE_WITH_GNOME
+ 	GnomeVFSFileInfo *file_info;
+@@ -793,6 +805,7 @@
+ 		return g_strdup (_("remote"));
+ 	}
+ 
++#ifdef HAVE_GRP_H
+ 	group_info = getgrgid (gid);
+ 
+ 	if (group_info == NULL)
+@@ -802,6 +815,9 @@
+ 	(void) go_guess_encoding (name, strlen (name),
+ 				  NULL, &nameutf8);
+ 	return nameutf8;
++#else
++	return NULL;
++#endif
+ }
+ 
+ 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 @@
+ 	libxml-2.0		>= 2.4.12
+ 	pango			>= 1.8.1
+ 	pangoft2		>= 1.8.1
++	freetype2		>= 2.1.0
+ 	libart-2.0		>= 2.3.11
+ "
+ goffice_cairo_reqs="

packaging/win32/install.sh

@@ -540,7 +540,14 @@ function inst_goffice() {
 	smart_wget $GOFFICE_URL $DOWNLOAD_DIR
 	tar -xjpf $DOWNLOAD_UDIR/goffice-*.tar.bz2 -C $TMP_UDIR
 	qpushd $TMP_UDIR/goffice-*
+	    cp configure.in configure.in.bak
+	    cat configure.in.bak | sed '/AC_PROG_INTLTOOL/s#)$#,[no-xml])#' > configure.in
+	    [ -n "$GOFFICE_PATCH" -a -f "$GOFFICE_PATCH" ] && \
+		patch -p1 < $GOFFICE_PATCH
+	    autoconf
 	    ./configure --prefix=$_GOFFICE_UDIR
+	    find . -name Makefile.am | xargs sed -i -e '/INTLTOOL_XML_RULE/d'
+	    [ -f dumpdef.pl ] || cp -p ../libgsf-*/dumpdef.pl .
 	    make
 	    make install
 	qpopd