r14737 - gnucash/trunk - Patch goffice to deal properly with goffice.def

[Derek Atkins]

Author: warlord
Date: 2006-08-26 21:17:01 -0400 (Sat, 26 Aug 2006)
New Revision: 14737
Trac: http://svn.gnucash.org/trac/changeset/14737

Modified:
   gnucash/trunk/
   gnucash/trunk/packaging/win32/goffice-0.3.0-patch.diff
   gnucash/trunk/packaging/win32/install.sh
Log:
Patch goffice to deal properly with goffice.def



Property changes on: gnucash/trunk
___________________________________________________________________
Name: svk:merge
   - d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk:13149
   + d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk:13150

Modified: gnucash/trunk/packaging/win32/goffice-0.3.0-patch.diff
===================================================================
--- gnucash/trunk/packaging/win32/goffice-0.3.0-patch.diff	2006-08-27 01:16:52 UTC (rev 14736)
+++ gnucash/trunk/packaging/win32/goffice-0.3.0-patch.diff	2006-08-27 01:17:01 UTC (rev 14737)
@@ -83,7 +83,7 @@
  	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 @@
  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 @@
  	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)

Modified: gnucash/trunk/packaging/win32/install.sh
===================================================================
--- gnucash/trunk/packaging/win32/install.sh	2006-08-27 01:16:52 UTC (rev 14736)
+++ gnucash/trunk/packaging/win32/install.sh	2006-08-27 01:17:01 UTC (rev 14737)
@@ -550,10 +550,6 @@
 	    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 ; \