r18090 - gnucash/trunk/packaging/win32 - Win32: Add aqbanking-3.8.1 patch to fix a compiler error.

[Christian Stimming]

Author: cstim
Date: 2009-05-27 09:49:25 -0400 (Wed, 27 May 2009)
New Revision: 18090
Trac: http://svn.gnucash.org/trac/changeset/18090

Added:
   gnucash/trunk/packaging/win32/aqbanking-3.8.1-patch.diff
Modified:
   gnucash/trunk/packaging/win32/defaults.sh
   gnucash/trunk/packaging/win32/install.sh
Log:
Win32: Add aqbanking-3.8.1 patch to fix a compiler error.

Added: gnucash/trunk/packaging/win32/aqbanking-3.8.1-patch.diff
===================================================================
--- gnucash/trunk/packaging/win32/aqbanking-3.8.1-patch.diff	                        (rev 0)
+++ gnucash/trunk/packaging/win32/aqbanking-3.8.1-patch.diff	2009-05-27 13:49:25 UTC (rev 18090)
@@ -0,0 +1,15 @@
+diff --git a/src/frontends/qbanking/lib/dialogs/qbimporter.cpp b/src/frontends/qbanking/lib/dialogs/qbimporter.cpp
+index 630df18..c1061c6 100644
+--- a/src/frontends/qbanking/lib/dialogs/qbimporter.cpp
++++ b/src/frontends/qbanking/lib/dialogs/qbimporter.cpp
+@@ -850,7 +850,9 @@ bool QBImporter::_readFile(const QString &fname){
+     // conversion operator "QCString::operator const char * ()
+     // const" that will correctly convert the QCString to the
+     // const char*
+-    fd=open(fname.local8Bit().data(), O_RDONLY);
++    fd = ::open(fname.local8Bit().data(), O_RDONLY);
++    // Note: We need to write ::open() to avoid an ambiguity with
++    // QDialog::open().
+     if (fd==-1) {
+       qs=QWidget::tr("Could not open file \"%1\": %2")
+ 	.arg(fname)

Modified: gnucash/trunk/packaging/win32/defaults.sh
===================================================================
--- gnucash/trunk/packaging/win32/defaults.sh	2009-05-24 20:36:12 UTC (rev 18089)
+++ gnucash/trunk/packaging/win32/defaults.sh	2009-05-27 13:49:25 UTC (rev 18090)
@@ -274,6 +274,7 @@
     set_default AQBANKING_URL "$SF_MIRROR/aqbanking/aqbanking-2.3.3.tar.gz"
 else
     set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=19&file=01&dummy=aqbanking-3.8.1.tar.gz"
+    set_default AQBANKING_PATCH `pwd`/aqbanking-3.8.1-patch.diff
 fi
 set_default AQBANKING_DIR $GLOBAL_DIR\\aqbanking
 set_default AQBANKING_WITH_QT yes

Modified: gnucash/trunk/packaging/win32/install.sh
===================================================================
--- gnucash/trunk/packaging/win32/install.sh	2009-05-24 20:36:12 UTC (rev 18089)
+++ gnucash/trunk/packaging/win32/install.sh	2009-05-27 13:49:25 UTC (rev 18090)
@@ -985,6 +985,8 @@
             fi
             if test x$AQBANKING_WITH_QT = xyes; then
                 inst_qt4
+                [ -n "$AQBANKING_PATCH" -a -f "$AQBANKING_PATCH" ] && \
+                    patch -p1 < $AQBANKING_PATCH
                 ./configure ${HOST_XCOMPILE} \
                     --with-gwen-dir=${_GWENHYWFAR_UDIR} \
                     --with-xmlmerge=${XMLMERGE} \