gnucash-on-windows master: Aqbanking-6.5.11beta needs Gwenhywfar-5.11.2beta, different patch for aqgivve.
John Ralls
jralls at code.gnucash.org
Sat Jun 22 18:37:34 EDT 2024
Updated via https://github.com/Gnucash/gnucash-on-windows/commit/0f294e76 (commit)
from https://github.com/Gnucash/gnucash-on-windows/commit/47418006 (commit)
commit 0f294e7666005ba75305d4af8b55db05d850cf08
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Jun 22 15:37:14 2024 -0700
Aqbanking-6.5.11beta needs Gwenhywfar-5.11.2beta, different patch for aqgivve.
diff --git a/gnucash.modules b/gnucash.modules
index 5bf9bb7..94f2897 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -131,9 +131,8 @@
<autotools id="gwenhywfar" autogen-sh="configure"
autogenargs="--with-guis='gtk3' --enable-local-install --disable-binreloc PKG_CONFIG='pkg-config --dont-define-prefix'">
- <branch module="501/gwenhywfar-5.10.2.tar.gz" version="5.10.2"
+ <branch module="518/gwenhywfar-5.11.2beta.tar.gz" version="5.11.2beta"
repo="aqbanking">
- <patch file="gwenhywfar-bug-274.patch" strip="1"/>
</branch>
<dependencies>
<dep package="gcrypt"/>
@@ -152,8 +151,8 @@
<autotools id="aqbanking" autogen-sh="autoreconf" makeargs="-j1"
autogenargs="--enable-local-install">
- <branch module="514/aqbanking-6.5.11beta.tar.gz" repo="aqbanking" version="6.5.8beta">
- <patch file="aqbanking-6.5.8beta-no-aqgivve.patch" strip="1"/>
+ <branch module="524/aqbanking-6.5.11beta.tar.gz" repo="aqbanking" version="6.5.11beta">
+ <patch file="aqbanking-6.5.11-fix-aqgivve.patch" strip="1"/>
</branch>
<dependencies>
<dep package="gwenhywfar"/>
@@ -170,7 +169,7 @@
</branch>
<dependencies>
<dep package="libofx"/>
- <dep package="gwenhywfar-svn"/>
+ <dep package="gwenhywfar-git"/>
<dep package="gmp"/>
<dep package="xmlsec"/>
<dep package="libchipcard"/>
diff --git a/patches/aqbanking-5.99-strndup.patch b/patches/aqbanking-5.99-strndup.patch
deleted file mode 100644
index 3bc0faa..0000000
--- a/patches/aqbanking-5.99-strndup.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/src/libs/plugins/backends/aqfints/transportlayer/transport.c 2019-09-21 08:53:32.000000000 -0700
-+++ b/src/libs/plugins/backends/aqfints/transportlayer/transport.c 2019-09-22 10:34:04.486430000 -0700
-@@ -17,6 +17,26 @@
- /* code headers */
-
- /* macro functions */
-+static char *my_strndup(const char *src, size_t n)
-+{
-+ int len;
-+
-+ len=strlen(src);
-+ if (len<n)
-+ return strdup(src);
-+ else {
-+ char *cpy;
-+
-+ cpy=(char *) malloc(n+1);
-+ assert(cpy);
-+ memmove(cpy, src, n);
-+ cpy[n]=0;
-+ return cpy;
-+ }
-+}
-+
-+#define strndup my_strndup
-+
- GWEN_INHERIT_FUNCTIONS(AQFINTS_TRANSPORT)
-
-
diff --git a/patches/aqbanking-6.5.11-fix-aqgivve.patch b/patches/aqbanking-6.5.11-fix-aqgivve.patch
new file mode 100644
index 0000000..bf5ff75
--- /dev/null
+++ b/patches/aqbanking-6.5.11-fix-aqgivve.patch
@@ -0,0 +1,62 @@
+--- a/src/libs/plugins/backends/aqgivve/cardsdialog.c 2024-04-28 06:54:15.000000000 -0700
++++ b/src/libs/plugins/backends/aqgivve/cardsdialog.c 2024-06-22 14:32:30.624058500 -0700
+@@ -57,7 +57,7 @@
+
+
+
+-void _freeData(void *bp, void *p)
++void GWENHYWFAR_CB _freeData(void *bp, void *p)
+ {
+ AG_CARDS_DIALOG *xdlg;
+
+@@ -88,7 +88,7 @@
+
+
+
+-int _dlgSignalHandler(GWEN_DIALOG *dlg, GWEN_DIALOG_EVENTTYPE t, const char *sender)
++int GWENHYWFAR_CB _dlgSignalHandler(GWEN_DIALOG *dlg, GWEN_DIALOG_EVENTTYPE t, const char *sender)
+ {
+ switch (t) {
+ case GWEN_DialogEvent_TypeInit :
+
+--- a/src/libs/plugins/backends/aqgivve/provider_request.c 2024-03-19 14:48:38.000000000 -0700
++++ b/src/libs/plugins/backends/aqgivve/provider_request.c 2024-06-22 14:34:01.041737100 -0700
+@@ -48,14 +48,14 @@
+
+
+
+-void _freeData(void *bp, void *p)
++void GWENHYWFAR_CB _freeData(void *bp, void *p)
+ {
+ free(p);
+ }
+
+
+
+-int _cbInitSyncIo(GWEN_HTTP_SESSION *sess, GWEN_SYNCIO *sio)
++int GWENHYWFAR_CB _cbInitSyncIo(GWEN_HTTP_SESSION *sess, GWEN_SYNCIO *sio)
+ {
+ AG_HTTP_SESSION_HEADER *xsess;
+
+
+--- a/src/libs/plugins/backends/aqgivve/userdialog.c 2024-01-07 11:29:43.000000000 -0800
++++ b/src/libs/plugins/backends/aqgivve/userdialog.c 2024-06-22 14:35:30.632390300 -0700
+@@ -42,7 +42,7 @@
+
+
+
+-void _freeData(void *bp, void *p)
++void GWENHYWFAR_CB _freeData(void *bp, void *p)
+ {
+ }
+
+@@ -98,7 +98,7 @@
+
+
+
+-int _dlgSignalHandler(GWEN_DIALOG *dlg, GWEN_DIALOG_EVENTTYPE t, const char *sender)
++int GWENHYWFAR_CB _dlgSignalHandler(GWEN_DIALOG *dlg, GWEN_DIALOG_EVENTTYPE t, const char *sender)
+ {
+ switch (t) {
+ case GWEN_DialogEvent_TypeInit :
+
diff --git a/patches/aqbanking-6.5.8beta-no-aqgivve.patch b/patches/aqbanking-6.5.8beta-no-aqgivve.patch
deleted file mode 100644
index 0f039ec..0000000
--- a/patches/aqbanking-6.5.8beta-no-aqgivve.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-$ diff -u configure.ac~ configure.ac
---- a/configure.ac 2024-03-19 14:49:47.000000000 -0700
-+++ b/configure.ac 2024-04-19 15:26:08.337623400 -0700
-@@ -238,7 +238,7 @@
- )
-
- if test "$aqbanking_backends" = "all"; then
-- aqbanking_backends="aqhbci aqofxconnect aqebics aqpaypal aqnone aqgivve"
-+ aqbanking_backends="aqhbci aqofxconnect aqebics aqpaypal aqnone"
- fi
-
- for f in ${aqbanking_backends}; do
-
diff --git a/patches/gwenhywfar-bug-274.patch b/patches/gwenhywfar-bug-274.patch
deleted file mode 100644
index 5099406..0000000
--- a/patches/gwenhywfar-bug-274.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 2524a27c4b765ada7b78992416e9d4fd0e5930b6 Mon Sep 17 00:00:00 2001
-From: John Ralls <jralls at ceridwen.us>
-Date: Sun, 21 Aug 2022 16:00:43 -0700
-Subject: [PATCH] Fix MAX_PATH build failure
-
-_MAX_PATH, not MAX_PATH
----
- src/sio/syncio_tls.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/sio/syncio_tls.c b/src/sio/syncio_tls.c
-index d5715c79..7e45ffa4 100644
---- a/src/sio/syncio_tls.c
-+++ b/src/sio/syncio_tls.c
-@@ -530,7 +530,7 @@ int GWEN_SyncIo_Tls_Prepare(GWEN_SYNCIO *sio)
- /* try to find OpenSSL certificates */
- # ifdef OS_WIN32
- if (trustFileSet==0) {
-- char defaultPath[2*MAX_PATH+1];
-+ char defaultPath[2*_MAX_PATH+1];
- const char *defaultFile = "ca-bundle.crt";
- GWEN_STRINGLIST *paths;
- GWEN_BUFFER *nbuf;
---
-2.32.1 (Apple Git-133)
-
Summary of changes:
gnucash.modules | 9 ++--
patches/aqbanking-5.99-strndup.patch | 29 -------------
patches/aqbanking-6.5.11-fix-aqgivve.patch | 62 ++++++++++++++++++++++++++++
patches/aqbanking-6.5.8beta-no-aqgivve.patch | 13 ------
patches/gwenhywfar-bug-274.patch | 26 ------------
5 files changed, 66 insertions(+), 73 deletions(-)
delete mode 100644 patches/aqbanking-5.99-strndup.patch
create mode 100644 patches/aqbanking-6.5.11-fix-aqgivve.patch
delete mode 100644 patches/aqbanking-6.5.8beta-no-aqgivve.patch
delete mode 100644 patches/gwenhywfar-bug-274.patch
More information about the gnucash-changes
mailing list