gnucash-on-windows master: Multiple changes pushed
John Ralls
jralls at code.gnucash.org
Sat Jun 29 21:27:09 EDT 2024
Updated via https://github.com/Gnucash/gnucash-on-windows/commit/58023c71 (commit)
via https://github.com/Gnucash/gnucash-on-windows/commit/a13f1cdb (commit)
from https://github.com/Gnucash/gnucash-on-windows/commit/0f294e76 (commit)
commit 58023c71114c102e9173364ee41b7ba86c216ac0
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Jun 29 17:03:02 2024 -0700
Package GnuCash 5.7.
diff --git a/extra_dist/getperl.vbs b/extra_dist/getperl.vbs
index 4214c95..b586365 100644
--- a/extra_dist/getperl.vbs
+++ b/extra_dist/getperl.vbs
@@ -9,7 +9,7 @@ Dim fso: Set fso = CreateObject("Scripting.FileSystemObject")
Dim tempFolder: tempFolder = fso.GetSpecialFolder(TemporaryFolder)
strHDLocation = Wscript.Arguments.Item(0)
-strVersion = "5.32.1.1"
+strVersion = "5.38.2.2"
' Set your settings
strFileURL = "https://strawberryperl.com/download/" & strVersion & "/strawberry-perl-" & strVersion & "-32bit.msi"
diff --git a/gnucash.modules b/gnucash.modules
index cb00966..7d21465 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -246,8 +246,8 @@
<cmake id="gnucash"
cmakeargs="-DCMAKE_BUILD_TYPE=Debug -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DGTEST_ROOT=$SRCROOT/googletest">
- <branch module="project/gnucash/gnucash%20%28stable%29/5.6/gnucash-5.6.tar.bz2"
- repo="sourceforge" version="5.6" checkoutdir="gnucash-5.6"/>
+ <branch module="project/gnucash/gnucash%20%28stable%29/5.6/gnucash-5.7.tar.bz2"
+ repo="sourceforge" version="5.7" checkoutdir="gnucash-5.7"/>
<dependencies>
<dep package="libofx"/>
<dep package="aqbanking"/>
@@ -298,8 +298,8 @@
</cmake>
<cmake id="gnucash-docs">
- <branch module="project/gnucash/gnucash%20%28stable%29/5.6/gnucash-docs-5.6.tar.gz"
- version="5.6" repo="sourceforge"/>
+ <branch module="project/gnucash/gnucash%20%28stable%29/5.7/gnucash-docs-5.7.tar.gz"
+ version="5.7" repo="sourceforge"/>
</cmake>
<cmake id="gnucash-unstable-docs">
commit a13f1cdba47f181c40c3d0a66786392e568ecf15
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Jun 29 16:56:46 2024 -0700
Restore AQBanking and Gwenywfar to release versions for the GnuCash 5.7 release.
diff --git a/gnucash.modules b/gnucash.modules
index 94f2897..cb00966 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -131,8 +131,9 @@
<autotools id="gwenhywfar" autogen-sh="configure"
autogenargs="--with-guis='gtk3' --enable-local-install --disable-binreloc PKG_CONFIG='pkg-config --dont-define-prefix'">
- <branch module="518/gwenhywfar-5.11.2beta.tar.gz" version="5.11.2beta"
+ <branch module="501/gwenhywfar-5.10.2.tar.gz" version="5.10.2"
repo="aqbanking">
+ <patch file="gwenhywfar-bug-274.patch" strip="1"/>
</branch>
<dependencies>
<dep package="gcrypt"/>
@@ -151,8 +152,7 @@
<autotools id="aqbanking" autogen-sh="autoreconf" makeargs="-j1"
autogenargs="--enable-local-install">
- <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 module="499/aqbanking-6.5.4.tar.gz" repo="aqbanking" version="6.5.4">
</branch>
<dependencies>
<dep package="gwenhywfar"/>
@@ -169,7 +169,7 @@
</branch>
<dependencies>
<dep package="libofx"/>
- <dep package="gwenhywfar-git"/>
+ <dep package="gwenhywfar-svn"/>
<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
new file mode 100644
index 0000000..3bc0faa
--- /dev/null
+++ b/patches/aqbanking-5.99-strndup.patch
@@ -0,0 +1,29 @@
+--- 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
deleted file mode 100644
index bf5ff75..0000000
--- a/patches/aqbanking-6.5.11-fix-aqgivve.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- 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/gwenhywfar-bug-274.patch b/patches/gwenhywfar-bug-274.patch
new file mode 100644
index 0000000..5099406
--- /dev/null
+++ b/patches/gwenhywfar-bug-274.patch
@@ -0,0 +1,26 @@
+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:
extra_dist/getperl.vbs | 2 +-
gnucash.modules | 16 ++++----
patches/aqbanking-5.99-strndup.patch | 29 ++++++++++++++
patches/aqbanking-6.5.11-fix-aqgivve.patch | 62 ------------------------------
patches/gwenhywfar-bug-274.patch | 26 +++++++++++++
5 files changed, 64 insertions(+), 71 deletions(-)
create mode 100644 patches/aqbanking-5.99-strndup.patch
delete mode 100644 patches/aqbanking-6.5.11-fix-aqgivve.patch
create mode 100644 patches/gwenhywfar-bug-274.patch
More information about the gnucash-changes
mailing list