From 817841acffec91eac162e7805b171e863f10dfe5 Mon Sep 17 00:00:00 2001 From: Christian Stimming Date: Tue, 2 Jun 2009 08:04:27 +0000 Subject: [PATCH] Update aqbanking version to 3.8.3, which means one patch isn't needed anymore. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18101 57a11ea4-9604-0410-9ed3-97b8803252fd --- packaging/win32/aqbanking-3.8.1-patch.diff | 15 --------------- packaging/win32/defaults.sh | 3 +-- packaging/win32/install.sh | 2 -- 3 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 packaging/win32/aqbanking-3.8.1-patch.diff diff --git a/packaging/win32/aqbanking-3.8.1-patch.diff b/packaging/win32/aqbanking-3.8.1-patch.diff deleted file mode 100644 index 1cd2577419..0000000000 --- a/packaging/win32/aqbanking-3.8.1-patch.diff +++ /dev/null @@ -1,15 +0,0 @@ -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) diff --git a/packaging/win32/defaults.sh b/packaging/win32/defaults.sh index 7037bb4be7..be571679ce 100644 --- a/packaging/win32/defaults.sh +++ b/packaging/win32/defaults.sh @@ -273,8 +273,7 @@ set_default KTOBLZCHECK_URL "$SF_MIRROR/ktoblzcheck/ktoblzcheck-1.20.tar.gz" if [ "$AQBANKING3" != "yes" ]; then 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 + set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=35&file=01&dummy=aqbanking-3.8.3.tar.gz" fi set_default AQBANKING_DIR $GLOBAL_DIR\\aqbanking set_default AQBANKING_WITH_QT yes diff --git a/packaging/win32/install.sh b/packaging/win32/install.sh index 3e8698f0dc..71547d4f8c 100755 --- a/packaging/win32/install.sh +++ b/packaging/win32/install.sh @@ -985,8 +985,6 @@ function inst_aqbanking() { 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} \