r18336 - gnucash/trunk/packaging/win32 - Win32 build: Add patch for gwenhywfar-3.11.0 so that this compiles correctly.

[Christian Stimming]

Author: cstim
Date: 2009-09-23 04:31:49 -0400 (Wed, 23 Sep 2009)
New Revision: 18336
Trac: http://svn.gnucash.org/trac/changeset/18336

Added:
   gnucash/trunk/packaging/win32/aqbanking-4.1.6-patch.diff
   gnucash/trunk/packaging/win32/gwenhywfar-3.11.0-patch.diff
Modified:
   gnucash/trunk/packaging/win32/defaults.sh
Log:
Win32 build: Add patch for gwenhywfar-3.11.0 so that this compiles correctly.

Added: gnucash/trunk/packaging/win32/aqbanking-4.1.6-patch.diff
===================================================================
--- gnucash/trunk/packaging/win32/aqbanking-4.1.6-patch.diff	                        (rev 0)
+++ gnucash/trunk/packaging/win32/aqbanking-4.1.6-patch.diff	2009-09-23 08:31:49 UTC (rev 18336)
@@ -0,0 +1,28 @@
+From ba9cf4b5f7ad999381d9cfa8bf4048ec4afb4b96 Mon Sep 17 00:00:00 2001
+From: christian <christian at 5c42a225-8b10-0410-9873-89b7810ad06e>
+Date: Tue, 22 Sep 2009 19:31:39 +0000
+Subject: [PATCH] Add linking of libofxparser.la into ofx plugin again.
+
+Was probably accidentally removed in r1753.
+
+git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@1758 5c42a225-8b10-0410-9873-89b7810ad06e
+---
+ src/plugins/imexporters/ofx/Makefile.am |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/plugins/imexporters/ofx/Makefile.am b/src/plugins/imexporters/ofx/Makefile.am
+index ca89db1..5ea7496 100644
+--- a/src/plugins/imexporters/ofx/Makefile.am
++++ b/src/plugins/imexporters/ofx/Makefile.am
+@@ -18,7 +18,7 @@ imexporterplugin_LTLIBRARIES=ofx.la
+ imexporterplugin_DATA=ofx.xml
+ 
+ ofx_la_SOURCES=ofx.c
+-ofx_la_LIBADD=$(aqbanking_internal_libs) $(gwenhywfar_libs)
++ofx_la_LIBADD = parser/libofxparser.la $(aqbanking_internal_libs) $(gwenhywfar_libs)
+ ofx_la_LDFLAGS = -no-undefined @STRIPALL@ -module -avoid-version
+ 
+ 
+-- 
+1.6.1.rc3.51.g5832d
+

Modified: gnucash/trunk/packaging/win32/defaults.sh
===================================================================
--- gnucash/trunk/packaging/win32/defaults.sh	2009-09-23 08:27:58 UTC (rev 18335)
+++ gnucash/trunk/packaging/win32/defaults.sh	2009-09-23 08:31:49 UTC (rev 18336)
@@ -264,7 +264,7 @@
     set_default GWENHYWFAR_URL "$SF_MIRROR/gwenhywfar/gwenhywfar-2.6.2.tar.gz"
 else
     set_default GWENHYWFAR_URL "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=28&file=01&dummy=gwenhywfar-3.11.0.tar.gz"
-    #set_default GWENHYWFAR_PATCH `pwd`/gwenhywfar-3.6.0-patch.diff
+    set_default GWENHYWFAR_PATCH `pwd`/gwenhywfar-3.11.0-patch.diff
 fi
 set_default GWENHYWFAR_DIR $GLOBAL_DIR\\gwenhywfar
 

Added: gnucash/trunk/packaging/win32/gwenhywfar-3.11.0-patch.diff
===================================================================
--- gnucash/trunk/packaging/win32/gwenhywfar-3.11.0-patch.diff	                        (rev 0)
+++ gnucash/trunk/packaging/win32/gwenhywfar-3.11.0-patch.diff	2009-09-23 08:31:49 UTC (rev 18336)
@@ -0,0 +1,27 @@
+From a31de9bb25ddb34cc5d53736d11b58e67a0e65f8 Mon Sep 17 00:00:00 2001
+From: christian <christian at 70169cfe-8b10-0410-8925-dcb4b91034d8>
+Date: Tue, 22 Sep 2009 18:31:55 +0000
+Subject: [PATCH] Win32: Add configure check for RC executable.
+
+git-svn-id: https://devel.aqbanking.de/svn/gwenhywfar/trunk@1597 70169cfe-8b10-0410-8925-dcb4b91034d8
+---
+ configure.ac |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 38fb73f..7b00908 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -187,6 +187,9 @@ AC_PROG_INSTALL
+ 
+ AC_LIBTOOL_WIN32_DLL
+ AC_LIBTOOL_RC
++# Newer libtool doesn't have AC_LIBTOOL_RC anymore.  Need to check for
++# $(RC) by ourselves.
++AC_CHECK_TOOL([RC], [windres], [no])
+ AC_PROG_LIBTOOL
+ AC_PROG_AWK
+ AC_CHECK_PROG(USE_DOT,dot,YES,NO)
+-- 
+1.6.1.rc3.51.g5832d
+