gnucash-on-windows master: Multiple changes pushed

John Ralls jralls at code.gnucash.org
Thu Apr 28 16:14:00 EDT 2022


Updated	 via  https://github.com/Gnucash/gnucash-on-windows/commit/15f086c2 (commit)
	 via  https://github.com/Gnucash/gnucash-on-windows/commit/1caf603a (commit)
	from  https://github.com/Gnucash/gnucash-on-windows/commit/fdd77418 (commit)



commit 15f086c229fade5cf1753bd640c73642668d0e67
Author: John Ralls <jralls at ceridwen.us>
Date:   Thu Apr 28 13:13:34 2022 -0700

    Update libofx to 0.10.5

diff --git a/gnucash.modules b/gnucash.modules
index 1b16f9e..f946820 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -213,10 +213,11 @@
   </autotools>
 
   <autotools id="libofx" autogen-sh='autoreconf'>
-    <branch repo="sourceforge" module="libofx/libofx-0.10.3.tar.gz"
-	    version="0.10.3">
-      <patch file="libofx-namespace-std.patch" strip="1"/>
-      <patch file="libofx-build-once.patch" strip="1"/>
+    <branch repo="github-tar"
+	    module="libofx/libofx/releases/download/0.10.5/libofx-0.10.5.tar.gz"
+	    version="0.10.5">
+      <!--patch file="libofx-namespace-std.patch" strip="1"/>
+      <patch file="libofx-build-once.patch" strip="1"/-->
     </branch>
     <dependencies>
       <dep package="OpenSP"/>

commit 1caf603afdf2980b86bbd283fda99f7022384089
Author: John Ralls <jralls at ceridwen.us>
Date:   Thu Apr 28 11:58:17 2022 -0700

    Update to aqbanking-6.5.0 and gwenhywfar-5.9.0
    
    https://aquamaniac.de/rdm/news/32,
    https://aquamaniac.de/rdm/projects/gwenhywfar/activity?from=2022-02-15

diff --git a/gnucash.modules b/gnucash.modules
index d24a3e5..1b16f9e 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -143,9 +143,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="396/gwenhywfar-5.7.4.tar.gz" version="5.7.4"
+    <branch module="415/gwenhywfar-5.9.0.tar.gz" version="5.9.0"
             repo="aqbanking">
-      <patch file="gwenhywfar-5.7.4-typemaker2-Makefiles.patch" strip="1"/>
     </branch>
     <dependencies>
       <dep package="gcrypt"/>
@@ -173,7 +172,7 @@
 
   <autotools id="aqbanking" autogen-sh="autoreconf" makeargs="-j1"
 	     autogenargs="--enable-local-install">
-    <branch module="394/aqbanking-6.4.0.tar.gz" repo="aqbanking" version="6.4.0">
+    <branch module="435/aqbanking-6.5.0.tar.gz" repo="aqbanking" version="6.5.0">
     </branch>
     <dependencies>
       <dep package="gwenhywfar"/>
diff --git a/patches/gwenhywfar-4.20.1-clean-targets.patch b/patches/gwenhywfar-4.20.1-clean-targets.patch
deleted file mode 100644
index a490b62..0000000
--- a/patches/gwenhywfar-4.20.1-clean-targets.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.in	2019-08-08 15:42:36.000000000 -0700
-+++ b/Makefile.in	2019-08-12 14:57:37.642988300 -0700
-@@ -1212,7 +1212,7 @@
- clean-local: clean-local-check
- .PHONY: clean-local
- clean-local-check:
--	rm -rf apidoc gwenhywfar4
-+	rm -rf apidoc
- 
- listdoc.h: $(top_builddir)/admin/mklistdoc
- 	admin/mklistdoc -v -I $(top_srcdir)/src/base `find "$(top_builddir)/gwenhywfar4/gwenhywfar" -name "*.h" | LC_ALL=C sort` >listdoc.h
diff --git a/patches/gwenhywfar-4.99.20-db.c.patch b/patches/gwenhywfar-4.99.20-db.c.patch
deleted file mode 100644
index c723eb8..0000000
--- a/patches/gwenhywfar-4.99.20-db.c.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/parser/db.c	2019-09-29 10:36:22.000000000 -0700
-+++ b/src/parser/db.c	2019-10-03 09:33:38.194129400 -0700
-@@ -1960,7 +1960,7 @@
- 
- 
- 
--int _replaceVarsCb(void *cbPtr, const char *name, int index, int maxLen, GWEN_BUFFER *dstBuf)
-+int GWENHYWFAR_CB _replaceVarsCb(void *cbPtr, const char *name, int index, int maxLen, GWEN_BUFFER *dstBuf)
- {
-   GWEN_DB_NODE *db;
-   int rv;
diff --git a/patches/gwenhywfar-5.5.0-GWENHYWFAR_CB.patch b/patches/gwenhywfar-5.5.0-GWENHYWFAR_CB.patch
deleted file mode 100644
index 0da5480..0000000
--- a/patches/gwenhywfar-5.5.0-GWENHYWFAR_CB.patch
+++ /dev/null
@@ -1,502 +0,0 @@
-From c5dae810a6ee8323ccdcbf50c27a654186bba644 Mon Sep 17 00:00:00 2001
-From: John Ralls <jralls at ceridwen.us>
-Date: Thu, 11 Feb 2021 12:52:11 -0800
-Subject: [PATCH] Consistently use GWENHYWFAR_CB in callback decls and defs.
-
-To permit successful compilation on Microsoft Windows.
-
-Fixes https://www.aquamaniac.de/rdm/issues/231
----
- src/gui/gui_be.h      | 18 ++++++++--------
- src/gui/gui_dialogs.c | 20 ++++++++---------
- src/gui/gui_p.h       | 18 ++++++++--------
- src/gui/nogui.c       | 50 +++++++++++++++++++++----------------------
- test/testthread.c     |  4 ++--
- 5 files changed, 55 insertions(+), 55 deletions(-)
-
-diff --git a/src/gui/gui_be.h b/src/gui/gui_be.h
-index dc7d82c1..3e1a70d5 100644
---- a/src/gui/gui_be.h
-+++ b/src/gui/gui_be.h
-@@ -346,7 +346,7 @@ GWEN_GUI_GETSYNCIO_FN GWEN_Gui_SetGetSyncIoFn(GWEN_GUI *gui, GWEN_GUI_GETSYNCIO_
-  * Please see @ref GWEN_Gui_MessageBox for details.
-  *
-  */
--typedef int (*GWEN_GUI_MESSAGEBOX_FN)(GWEN_GUI *gui,
-+typedef int GWENHYWFAR_CB(*GWEN_GUI_MESSAGEBOX_FN)(GWEN_GUI *gui,
-                                       uint32_t flags,
-                                       const char *title,
-                                       const char *text,
-@@ -359,7 +359,7 @@ typedef int (*GWEN_GUI_MESSAGEBOX_FN)(GWEN_GUI *gui,
-  * Please see @ref GWEN_Gui_InputBox for details.
-  *
-  */
--typedef int (*GWEN_GUI_INPUTBOX_FN)(GWEN_GUI *gui,
-+typedef int GWENHYWFAR_CB(*GWEN_GUI_INPUTBOX_FN)(GWEN_GUI *gui,
-                                     uint32_t flags,
-                                     const char *title,
-                                     const char *text,
-@@ -372,7 +372,7 @@ typedef int (*GWEN_GUI_INPUTBOX_FN)(GWEN_GUI *gui,
-  * Please see @ref GWEN_Gui_ShowBox for details.
-  *
-  */
--typedef uint32_t (*GWEN_GUI_SHOWBOX_FN)(GWEN_GUI *gui,
-+typedef uint32_t GWENHYWFAR_CB(*GWEN_GUI_SHOWBOX_FN)(GWEN_GUI *gui,
-                                         uint32_t flags,
-                                         const char *title,
-                                         const char *text,
-@@ -382,13 +382,13 @@ typedef uint32_t (*GWEN_GUI_SHOWBOX_FN)(GWEN_GUI *gui,
-  * Please see @ref GWEN_Gui_HideBox for details.
-  *
-  */
--typedef void (*GWEN_GUI_HIDEBOX_FN)(GWEN_GUI *gui, uint32_t id);
-+typedef void GWENHYWFAR_CB(*GWEN_GUI_HIDEBOX_FN)(GWEN_GUI *gui, uint32_t id);
- 
- /**
-  * Please see @ref GWEN_Gui_ProgressStart for details.
-  *
-  */
--typedef uint32_t (*GWEN_GUI_PROGRESS_START_FN)(GWEN_GUI *gui,
-+typedef uint32_t GWENHYWFAR_CB(*GWEN_GUI_PROGRESS_START_FN)(GWEN_GUI *gui,
-                                                uint32_t progressFlags,
-                                                const char *title,
-                                                const char *text,
-@@ -399,7 +399,7 @@ typedef uint32_t (*GWEN_GUI_PROGRESS_START_FN)(GWEN_GUI *gui,
-  * Please see @ref GWEN_Gui_ProgressAdvance for details.
-  *
-  */
--typedef int (*GWEN_GUI_PROGRESS_ADVANCE_FN)(GWEN_GUI *gui,
-+typedef int GWENHYWFAR_CB(*GWEN_GUI_PROGRESS_ADVANCE_FN)(GWEN_GUI *gui,
-                                             uint32_t id,
-                                             uint64_t progress);
- 
-@@ -408,7 +408,7 @@ typedef int (*GWEN_GUI_PROGRESS_ADVANCE_FN)(GWEN_GUI *gui,
-  * Please see @ref GWEN_Gui_ProgressSetTotal for details.
-  *
-  */
--typedef int (*GWEN_GUI_PROGRESS_SETTOTAL_FN)(GWEN_GUI *gui,
-+typedef int GWENHYWFAR_CB(*GWEN_GUI_PROGRESS_SETTOTAL_FN)(GWEN_GUI *gui,
-                                              uint32_t id,
-                                              uint64_t total);
- 
-@@ -416,7 +416,7 @@ typedef int (*GWEN_GUI_PROGRESS_SETTOTAL_FN)(GWEN_GUI *gui,
-  * Please see @ref GWEN_Gui_ProgressLog for details.
-  *
-  */
--typedef int (*GWEN_GUI_PROGRESS_LOG_FN)(GWEN_GUI *gui,
-+typedef int GWENHYWFAR_CB(*GWEN_GUI_PROGRESS_LOG_FN)(GWEN_GUI *gui,
-                                         uint32_t id,
-                                         GWEN_LOGGER_LEVEL level,
-                                         const char *text);
-@@ -424,7 +424,7 @@ typedef int (*GWEN_GUI_PROGRESS_LOG_FN)(GWEN_GUI *gui,
-  * Please see @ref GWEN_Gui_ProgressEnd for details.
-  *
-  */
--typedef int (*GWEN_GUI_PROGRESS_END_FN)(GWEN_GUI *gui, uint32_t id);
-+typedef int GWENHYWFAR_CB(*GWEN_GUI_PROGRESS_END_FN)(GWEN_GUI *gui, uint32_t id);
- /*@}*/
- 
- 
-diff --git a/src/gui/gui_dialogs.c b/src/gui/gui_dialogs.c
-index 83a15fdc..0dd97075 100644
---- a/src/gui/gui_dialogs.c
-+++ b/src/gui/gui_dialogs.c
-@@ -43,7 +43,7 @@ void GWEN_Gui_UseDialogs(GWEN_GUI *gui)
- 
- 
- 
--int GWEN_Gui_ShowProgress(GWEN_PROGRESS_DATA *pd)
-+int GWENHYWFAR_CB GWEN_Gui_ShowProgress(GWEN_PROGRESS_DATA *pd)
- {
-   GWEN_PROGRESS_DATA *highest=NULL;
-   GWEN_PROGRESS_DATA *t;
-@@ -132,7 +132,7 @@ void GWEN_Gui_DialogBased_CheckShow(GWEN_UNUSED GWEN_GUI *gui, GWEN_PROGRESS_DAT
- 
- 
- 
--uint32_t GWEN_Gui_DialogBased_ProgressStart(GWEN_GUI *gui,
-+uint32_t GWENHYWFAR_CB GWEN_Gui_DialogBased_ProgressStart(GWEN_GUI *gui,
-                                          uint32_t progressFlags,
-                                          const char *title,
-                                          const char *text,
-@@ -179,7 +179,7 @@ uint32_t GWEN_Gui_DialogBased_ProgressStart(GWEN_GUI *gui,
- 
- 
- 
--int GWEN_Gui_DialogBased_ProgressEnd(GWEN_GUI *gui, uint32_t pid)
-+int GWENHYWFAR_CB GWEN_Gui_DialogBased_ProgressEnd(GWEN_GUI *gui, uint32_t pid)
- {
-   GWEN_PROGRESS_DATA *pd;
-   /*uint32_t parentPid=0;*/
-@@ -296,7 +296,7 @@ int GWEN_Gui_DialogBased_ProgressEnd(GWEN_GUI *gui, uint32_t pid)
- 
- 
- 
--int GWEN_Gui_DialogBased_ProgressAdvance(GWEN_GUI *gui, uint32_t pid, uint64_t progress)
-+int GWENHYWFAR_CB GWEN_Gui_DialogBased_ProgressAdvance(GWEN_GUI *gui, uint32_t pid, uint64_t progress)
- {
-   GWEN_PROGRESS_DATA *pd;
-   int aborted=0;
-@@ -347,7 +347,7 @@ int GWEN_Gui_DialogBased_ProgressAdvance(GWEN_GUI *gui, uint32_t pid, uint64_t p
- 
- 
- 
--int GWEN_Gui_DialogBased_ProgressSetTotal(GWEN_GUI *gui, uint32_t pid, uint64_t total)
-+int GWENHYWFAR_CB GWEN_Gui_DialogBased_ProgressSetTotal(GWEN_GUI *gui, uint32_t pid, uint64_t total)
- {
-   GWEN_PROGRESS_DATA *pd;
-   int aborted=0;
-@@ -394,7 +394,7 @@ int GWEN_Gui_DialogBased_ProgressSetTotal(GWEN_GUI *gui, uint32_t pid, uint64_t
- 
- 
- 
--int GWEN_Gui_DialogBased_ProgressLog(GWEN_GUI *gui,
-+int GWENHYWFAR_CB GWEN_Gui_DialogBased_ProgressLog(GWEN_GUI *gui,
-                                   uint32_t pid,
-                                   GWEN_LOGGER_LEVEL level,
-                                   const char *text)
-@@ -452,7 +452,7 @@ int GWEN_Gui_DialogBased_ProgressLog(GWEN_GUI *gui,
- 
- 
- 
--int GWEN_Gui_DialogBased_InputBox(GWEN_UNUSED GWEN_GUI *gui,
-+int GWENHYWFAR_CB GWEN_Gui_DialogBased_InputBox(GWEN_UNUSED GWEN_GUI *gui,
-                                uint32_t flags,
-                                const char *title,
-                                const char *text,
-@@ -494,7 +494,7 @@ int GWEN_Gui_DialogBased_InputBox(GWEN_UNUSED GWEN_GUI *gui,
- 
- 
- 
--int GWEN_Gui_DialogBased_MessageBox(GWEN_UNUSED GWEN_GUI *gui,
-+int GWENHYWFAR_CB GWEN_Gui_DialogBased_MessageBox(GWEN_UNUSED GWEN_GUI *gui,
-                                  uint32_t flags,
-                                  const char *title,
-                                  const char *text,
-@@ -520,7 +520,7 @@ int GWEN_Gui_DialogBased_MessageBox(GWEN_UNUSED GWEN_GUI *gui,
- 
- 
- 
--uint32_t GWEN_Gui_DialogBased_ShowBox(GWEN_GUI *gui,
-+uint32_t GWENHYWFAR_CB GWEN_Gui_DialogBased_ShowBox(GWEN_GUI *gui,
-                                    uint32_t flags,
-                                    const char *title,
-                                    const char *text,
-@@ -554,7 +554,7 @@ uint32_t GWEN_Gui_DialogBased_ShowBox(GWEN_GUI *gui,
- 
- 
- 
--void GWEN_Gui_DialogBased_HideBox(GWEN_GUI *gui, uint32_t id)
-+void GWENHYWFAR_CB GWEN_Gui_DialogBased_HideBox(GWEN_GUI *gui, uint32_t id)
- {
-   GWEN_DIALOG *dlg;
- 
-diff --git a/src/gui/gui_p.h b/src/gui/gui_p.h
-index 3cb928da..71204966 100644
---- a/src/gui/gui_p.h
-+++ b/src/gui/gui_p.h
-@@ -109,22 +109,22 @@ static int GWENHYWFAR_CB GWEN_Gui_CheckCertBuiltIn(GWEN_GUI *gui,
- 
- static void GWEN_Gui_DialogBased_CheckShow(GWEN_GUI *gui, GWEN_PROGRESS_DATA *pd);
- 
--static uint32_t GWEN_Gui_DialogBased_ProgressStart(GWEN_GUI *gui,
-+static uint32_t GWENHYWFAR_CB GWEN_Gui_DialogBased_ProgressStart(GWEN_GUI *gui,
-                                                 uint32_t progressFlags,
-                                                 const char *title,
-                                                 const char *text,
-                                                 uint64_t total,
-                                                 uint32_t guiid);
--static int GWEN_Gui_DialogBased_ProgressEnd(GWEN_GUI *gui, uint32_t pid);
--static int GWEN_Gui_DialogBased_ProgressAdvance(GWEN_GUI *gui, uint32_t pid, uint64_t progress);
--static int GWEN_Gui_DialogBased_ProgressSetTotal(GWEN_GUI *gui, uint32_t pid, uint64_t total);
-+static int GWENHYWFAR_CB GWEN_Gui_DialogBased_ProgressEnd(GWEN_GUI *gui, uint32_t pid);
-+static int GWENHYWFAR_CB GWEN_Gui_DialogBased_ProgressAdvance(GWEN_GUI *gui, uint32_t pid, uint64_t progress);
-+static int GWENHYWFAR_CB GWEN_Gui_DialogBased_ProgressSetTotal(GWEN_GUI *gui, uint32_t pid, uint64_t total);
- 
--static int GWEN_Gui_DialogBased_ProgressLog(GWEN_GUI *gui,
-+static int GWENHYWFAR_CB GWEN_Gui_DialogBased_ProgressLog(GWEN_GUI *gui,
-                                          uint32_t pid,
-                                          GWEN_LOGGER_LEVEL level,
-                                          const char *text);
- 
--static int GWEN_Gui_DialogBased_InputBox(GWEN_GUI *gui,
-+static int GWENHYWFAR_CB GWEN_Gui_DialogBased_InputBox(GWEN_GUI *gui,
-                                       uint32_t flags,
-                                       const char *title,
-                                       const char *text,
-@@ -133,7 +133,7 @@ static int GWEN_Gui_DialogBased_InputBox(GWEN_GUI *gui,
-                                       int maxLen,
-                                       uint32_t guiid);
- 
--static int GWEN_Gui_DialogBased_MessageBox(GWEN_GUI *gui,
-+static int GWENHYWFAR_CB GWEN_Gui_DialogBased_MessageBox(GWEN_GUI *gui,
-                                         uint32_t flags,
-                                         const char *title,
-                                         const char *text,
-@@ -142,12 +142,12 @@ static int GWEN_Gui_DialogBased_MessageBox(GWEN_GUI *gui,
-                                         const char *b3,
-                                         uint32_t guiid);
- 
--static uint32_t GWEN_Gui_DialogBased_ShowBox(GWEN_GUI *gui,
-+static uint32_t GWENHYWFAR_CB GWEN_Gui_DialogBased_ShowBox(GWEN_GUI *gui,
-                                           uint32_t flags,
-                                           const char *title,
-                                           const char *text,
-                                           uint32_t guiid);
--static void GWEN_Gui_DialogBased_HideBox(GWEN_GUI *gui, uint32_t id);
-+static void GWENHYWFAR_CB GWEN_Gui_DialogBased_HideBox(GWEN_GUI *gui, uint32_t id);
- 
- static int GWENHYWFAR_CB GWEN_Gui_Internal_GetSyncIo(GWEN_GUI *gui, const char *url,
-                                                      const char *defaultProto,
-diff --git a/src/gui/nogui.c b/src/gui/nogui.c
-index 69d5fbe6..f88c2c53 100644
---- a/src/gui/nogui.c
-+++ b/src/gui/nogui.c
-@@ -219,7 +219,7 @@ GWEN_GUI *GWEN_NoGui_new(void)
- 
- 
- 
--void _freeData(GWEN_UNUSED void *bp, void *p)
-+void GWENHYWFAR_CB _freeData(GWEN_UNUSED void *bp, void *p)
- {
-   GWEN_GUI_NOGUI *xgui;
- 
-@@ -230,7 +230,7 @@ void _freeData(GWEN_UNUSED void *bp, void *p)
- 
- 
- 
--int _messageBox(GWEN_UNUSED GWEN_GUI *gui,
-+int GWENHYWFAR_CB _messageBox(GWEN_UNUSED GWEN_GUI *gui,
-                 GWEN_UNUSED uint32_t flags,
-                 GWEN_UNUSED const char *title,
-                 GWEN_UNUSED const char *text,
-@@ -244,7 +244,7 @@ int _messageBox(GWEN_UNUSED GWEN_GUI *gui,
- 
- 
- 
--int _inputBox(GWEN_UNUSED GWEN_GUI *gui,
-+int GWENHYWFAR_CB _inputBox(GWEN_UNUSED GWEN_GUI *gui,
-               GWEN_UNUSED uint32_t flags,
-               GWEN_UNUSED const char *title,
-               GWEN_UNUSED const char *text,
-@@ -258,7 +258,7 @@ int _inputBox(GWEN_UNUSED GWEN_GUI *gui,
- 
- 
- 
--uint32_t _showBox(GWEN_UNUSED GWEN_GUI *gui,
-+uint32_t GWENHYWFAR_CB _showBox(GWEN_UNUSED GWEN_GUI *gui,
-                   GWEN_UNUSED uint32_t flags,
-                   GWEN_UNUSED const char *title,
-                   GWEN_UNUSED const char *text,
-@@ -269,13 +269,13 @@ uint32_t _showBox(GWEN_UNUSED GWEN_GUI *gui,
- 
- 
- 
--void _hideBox(GWEN_UNUSED GWEN_GUI *gui, GWEN_UNUSED uint32_t id)
-+void GWENHYWFAR_CB _hideBox(GWEN_UNUSED GWEN_GUI *gui, GWEN_UNUSED uint32_t id)
- {
- }
- 
- 
- 
--uint32_t _progressStart(GWEN_UNUSED GWEN_GUI *gui,
-+uint32_t GWENHYWFAR_CB _progressStart(GWEN_UNUSED GWEN_GUI *gui,
-                         GWEN_UNUSED uint32_t progressFlags,
-                         GWEN_UNUSED const char *title,
-                         GWEN_UNUSED const char *text,
-@@ -287,7 +287,7 @@ uint32_t _progressStart(GWEN_UNUSED GWEN_GUI *gui,
- 
- 
- 
--int _progressAdvance(GWEN_UNUSED GWEN_GUI *gui,
-+int GWENHYWFAR_CB _progressAdvance(GWEN_UNUSED GWEN_GUI *gui,
-                      GWEN_UNUSED uint32_t pid,
-                      GWEN_UNUSED uint64_t progress)
- {
-@@ -296,7 +296,7 @@ int _progressAdvance(GWEN_UNUSED GWEN_GUI *gui,
- 
- 
- 
--int _progressSetTotal(GWEN_UNUSED GWEN_GUI *gui,
-+int GWENHYWFAR_CB _progressSetTotal(GWEN_UNUSED GWEN_GUI *gui,
-                       GWEN_UNUSED uint32_t pid,
-                       GWEN_UNUSED uint64_t total)
- {
-@@ -305,7 +305,7 @@ int _progressSetTotal(GWEN_UNUSED GWEN_GUI *gui,
- 
- 
- 
--int _progressLog(GWEN_UNUSED GWEN_GUI *gui,
-+int GWENHYWFAR_CB _progressLog(GWEN_UNUSED GWEN_GUI *gui,
-                  GWEN_UNUSED uint32_t pid,
-                  GWEN_UNUSED GWEN_LOGGER_LEVEL level,
-                  GWEN_UNUSED const char *text)
-@@ -315,7 +315,7 @@ int _progressLog(GWEN_UNUSED GWEN_GUI *gui,
- 
- 
- 
--int _progressEnd(GWEN_UNUSED GWEN_GUI *gui,
-+int GWENHYWFAR_CB _progressEnd(GWEN_UNUSED GWEN_GUI *gui,
-                  GWEN_UNUSED uint32_t pid)
- {
-   return 0;
-@@ -323,7 +323,7 @@ int _progressEnd(GWEN_UNUSED GWEN_GUI *gui,
- 
- 
- 
--int _print(GWEN_UNUSED GWEN_GUI *gui,
-+int GWENHYWFAR_CB _print(GWEN_UNUSED GWEN_GUI *gui,
-            GWEN_UNUSED const char *docTitle,
-            GWEN_UNUSED const char *docType,
-            GWEN_UNUSED const char *descr,
-@@ -335,7 +335,7 @@ int _print(GWEN_UNUSED GWEN_GUI *gui,
- 
- 
- 
--int _getPassword(GWEN_UNUSED GWEN_GUI *gui,
-+int GWENHYWFAR_CB _getPassword(GWEN_UNUSED GWEN_GUI *gui,
-                  GWEN_UNUSED uint32_t flags,
-                  GWEN_UNUSED const char *token,
-                  GWEN_UNUSED const char *title,
-@@ -352,7 +352,7 @@ int _getPassword(GWEN_UNUSED GWEN_GUI *gui,
- 
- 
- 
--int _setPasswordStatus(GWEN_UNUSED GWEN_GUI *gui,
-+int GWENHYWFAR_CB _setPasswordStatus(GWEN_UNUSED GWEN_GUI *gui,
-                        GWEN_UNUSED const char *token,
-                        GWEN_UNUSED const char *pin,
-                        GWEN_UNUSED GWEN_GUI_PASSWORD_STATUS status,
-@@ -363,7 +363,7 @@ int _setPasswordStatus(GWEN_UNUSED GWEN_GUI *gui,
- 
- 
- 
--int _logHook(GWEN_UNUSED GWEN_GUI *gui,
-+int GWENHYWFAR_CB _logHook(GWEN_UNUSED GWEN_GUI *gui,
-              GWEN_UNUSED const char *logDomain,
-              GWEN_UNUSED GWEN_LOGGER_LEVEL priority,
-              GWEN_UNUSED const char *s)
-@@ -373,7 +373,7 @@ int _logHook(GWEN_UNUSED GWEN_GUI *gui,
- 
- 
- 
--int _waitForSockets(GWEN_UNUSED GWEN_GUI *gui,
-+int GWENHYWFAR_CB _waitForSockets(GWEN_UNUSED GWEN_GUI *gui,
-                     GWEN_UNUSED GWEN_SOCKET_LIST2 *readSockets,
-                     GWEN_UNUSED GWEN_SOCKET_LIST2 *writeSockets,
-                     GWEN_UNUSED int msecs,
-@@ -384,7 +384,7 @@ int _waitForSockets(GWEN_UNUSED GWEN_GUI *gui,
- 
- 
- 
--int _checkCert(GWEN_UNUSED GWEN_GUI *gui,
-+int GWENHYWFAR_CB _checkCert(GWEN_UNUSED GWEN_GUI *gui,
-                GWEN_UNUSED const GWEN_SSLCERTDESCR *cert,
-                GWEN_UNUSED GWEN_SYNCIO *sio,
-                GWEN_UNUSED uint32_t guiid)
-@@ -394,7 +394,7 @@ int _checkCert(GWEN_UNUSED GWEN_GUI *gui,
- 
- 
- 
--int _keyDataFromTextOpenSsl(GWEN_UNUSED GWEN_GUI *gui,
-+int GWENHYWFAR_CB _keyDataFromTextOpenSsl(GWEN_UNUSED GWEN_GUI *gui,
-                             GWEN_UNUSED const char *text,
-                             GWEN_UNUSED unsigned char *buffer,
-                             GWEN_UNUSED unsigned int bufLength)
-@@ -404,7 +404,7 @@ int _keyDataFromTextOpenSsl(GWEN_UNUSED GWEN_GUI *gui,
- 
- 
- 
--int _execDialog(GWEN_UNUSED GWEN_GUI *gui,
-+int GWENHYWFAR_CB _execDialog(GWEN_UNUSED GWEN_GUI *gui,
-                 GWEN_UNUSED GWEN_DIALOG *dlg,
-                 GWEN_UNUSED uint32_t guiid)
- {
-@@ -413,7 +413,7 @@ int _execDialog(GWEN_UNUSED GWEN_GUI *gui,
- 
- 
- 
--int _openDialog(GWEN_UNUSED GWEN_GUI *gui,
-+int GWENHYWFAR_CB _openDialog(GWEN_UNUSED GWEN_GUI *gui,
-                 GWEN_UNUSED GWEN_DIALOG *dlg,
-                 GWEN_UNUSED uint32_t guiid)
- {
-@@ -422,7 +422,7 @@ int _openDialog(GWEN_UNUSED GWEN_GUI *gui,
- 
- 
- 
--int _closeDialog(GWEN_UNUSED GWEN_GUI *gui,
-+int GWENHYWFAR_CB _closeDialog(GWEN_UNUSED GWEN_GUI *gui,
-                  GWEN_UNUSED GWEN_DIALOG *dlg)
- {
-   return 0;
-@@ -430,7 +430,7 @@ int _closeDialog(GWEN_UNUSED GWEN_GUI *gui,
- 
- 
- 
--int _runDialog(GWEN_UNUSED GWEN_GUI *gui,
-+int GWENHYWFAR_CB _runDialog(GWEN_UNUSED GWEN_GUI *gui,
-                GWEN_UNUSED GWEN_DIALOG *dlg,
-                GWEN_UNUSED int timeout)
- {
-@@ -439,7 +439,7 @@ int _runDialog(GWEN_UNUSED GWEN_GUI *gui,
- 
- 
- 
--int _readDialogPrefs(GWEN_UNUSED GWEN_GUI *gui,
-+int GWENHYWFAR_CB _readDialogPrefs(GWEN_UNUSED GWEN_GUI *gui,
-                      GWEN_UNUSED const char *groupName,
-                      GWEN_UNUSED const char *altName,
-                      GWEN_UNUSED GWEN_DB_NODE **pDb)
-@@ -449,7 +449,7 @@ int _readDialogPrefs(GWEN_UNUSED GWEN_GUI *gui,
- 
- 
- 
--int _writeDialogPrefs(GWEN_UNUSED GWEN_GUI *gui,
-+int GWENHYWFAR_CB _writeDialogPrefs(GWEN_UNUSED GWEN_GUI *gui,
-                       GWEN_UNUSED const char *groupName,
-                       GWEN_UNUSED GWEN_DB_NODE *db)
- {
-@@ -458,7 +458,7 @@ int _writeDialogPrefs(GWEN_UNUSED GWEN_GUI *gui,
- 
- 
- 
--int _getFilename(GWEN_UNUSED GWEN_GUI *gui,
-+int GWENHYWFAR_CB _getFilename(GWEN_UNUSED GWEN_GUI *gui,
-                  GWEN_UNUSED const char *caption,
-                  GWEN_UNUSED GWEN_GUI_FILENAME_TYPE fnt,
-                  GWEN_UNUSED uint32_t flags,
-@@ -471,7 +471,7 @@ int _getFilename(GWEN_UNUSED GWEN_GUI *gui,
- 
- 
- 
--int _getSyncio(GWEN_UNUSED GWEN_GUI *gui,
-+int GWENHYWFAR_CB _getSyncio(GWEN_UNUSED GWEN_GUI *gui,
-                GWEN_UNUSED const char *url,
-                GWEN_UNUSED const char *defaultProto,
-                GWEN_UNUSED int defaultPort,
-diff --git a/test/testthread.c b/test/testthread.c
-index 4b24ee57..63d63530 100644
---- a/test/testthread.c
-+++ b/test/testthread.c
-@@ -49,7 +49,7 @@ GWEN_THREAD *TestThread_new(int threadId, int loops)
- 
- 
- 
--void _freeData(GWEN_UNUSED void *bp, void *p)
-+void GWENHYWFAR_CB _freeData(GWEN_UNUSED void *bp, void *p)
- {
-   TEST_THREAD *xthr;
- 
-@@ -59,7 +59,7 @@ void _freeData(GWEN_UNUSED void *bp, void *p)
- 
- 
- 
--void _threadRun_cb(GWEN_UNUSED GWEN_THREAD *thr)
-+void GWENHYWFAR_CB _threadRun_cb(GWEN_UNUSED GWEN_THREAD *thr)
- {
-   GWEN_GUI *gui;
-   TEST_THREAD *xthr;
--- 
-2.30.0
-
diff --git a/patches/gwenhywfar-5.5.0-fix-build.patch b/patches/gwenhywfar-5.5.0-fix-build.patch
deleted file mode 100644
index 84a41fc..0000000
--- a/patches/gwenhywfar-5.5.0-fix-build.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 2de35501f7efec42a7593f8266a7f605b3404a3c Mon Sep 17 00:00:00 2001
-From: John Ralls <jralls at ceridwen.us>
-Date: Tue, 9 Feb 2021 16:33:57 -0800
-Subject: [PATCH] Correct type mismatch for _threadRun_cb.
-
-Fixes https://www.aquamaniac.de/rdm/issues/230
----
- src/os/windows/gwenthread.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/os/windows/gwenthread.c b/src/os/windows/gwenthread.c
-index 1e672cbd..b1d81abd 100644
---- a/src/os/windows/gwenthread.c
-+++ b/src/os/windows/gwenthread.c
-@@ -154,7 +154,7 @@ GWEN_THREAD_RUN_FN GWEN_Thread_SetRunFn(GWEN_THREAD *thr, GWEN_THREAD_RUN_FN fn)
- 
- 
- 
--DWORD _threadRun_cb(LPVOID lpParam)
-+DWORD WINAPI _threadRun_cb(LPVOID lpParam)
- {
-   GWEN_THREAD *thr;
- 
--- 
-2.24.3 (Apple Git-128)
-
diff --git a/patches/gwenhywfar-5.7.4-typemaker2-Makefiles.patch b/patches/gwenhywfar-5.7.4-typemaker2-Makefiles.patch
deleted file mode 100644
index d58026a..0000000
--- a/patches/gwenhywfar-5.7.4-typemaker2-Makefiles.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/tools/typemaker2/Makefile.in	2021-11-13 10:12:21.000000000 -0800
-+++ b/tools/typemaker2/Makefile.in	2021-11-24 13:31:46.720542300 -0800
-@@ -125,8 +125,9 @@
- am__DEPENDENCIES_1 =
- @IS_WINDOWS_TRUE at am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
- typemaker2_DEPENDENCIES =  \
-+	c/libtm2_c.la \
- 	$(top_builddir)/src/$(gwenhywfar_internal_libname) \
--	c/libtm2_c.la $(am__DEPENDENCIES_2)
-+	$(am__DEPENDENCIES_2)
- AM_V_lt = $(am__v_lt_ at AM_V@)
- am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
- am__v_lt_0 = --silent
-@@ -560,8 +561,10 @@
- 
- 
- #  tm_enum.c
--typemaker2_LDADD = $(top_builddir)/src/$(gwenhywfar_internal_libname) \
--	c/libtm2_c.la $(am__append_1)
-+typemaker2_LDADD = \
-+	c/libtm2_c.la \
-+	$(top_builddir)/src/$(gwenhywfar_internal_libname) \
-+	$(am__append_1)
- @IS_WINDOWS_TRUE at typemaker2_LDFLAGS = -mconsole
- EXTRA_DIST = $(typefiles)
- all: all-recursive
---- a/tools/typemaker2/c/Makefile.in	2021-11-13 10:12:21.000000000 -0800
-+++ b/tools/typemaker2/c/Makefile.in	2021-11-24 13:39:45.614600400 -0800
-@@ -456,7 +456,7 @@
- with_gui_gtk2 = @with_gui_gtk2@
- with_gui_gtk3 = @with_gui_gtk3@
- with_gui_qt4 = @with_gui_qt4@
--INCLUDES = @all_includes@ -I$(top_builddir) -I../ -I../../ -I$(top_srcdir)/tools -I$(gwenhywfar_symlinkdir)
-+INCLUDES = @all_includes@ -I$(top_builddir) -I${srcdir}/../ -I${srcdir}/../../ -I$(top_srcdir)/tools -I$(gwenhywfar_symlinkdir)
- noinst_LTLIBRARIES = libtm2_c.la
- libtm2_c_la_SOURCES = \
-  tm_builder_c.c \



Summary of changes:
 gnucash.modules                                    |  14 +-
 patches/gwenhywfar-4.20.1-clean-targets.patch      |  11 -
 patches/gwenhywfar-4.99.20-db.c.patch              |  11 -
 patches/gwenhywfar-5.5.0-GWENHYWFAR_CB.patch       | 502 ---------------------
 patches/gwenhywfar-5.5.0-fix-build.patch           |  26 --
 .../gwenhywfar-5.7.4-typemaker2-Makefiles.patch    |  37 --
 6 files changed, 7 insertions(+), 594 deletions(-)
 delete mode 100644 patches/gwenhywfar-4.20.1-clean-targets.patch
 delete mode 100644 patches/gwenhywfar-4.99.20-db.c.patch
 delete mode 100644 patches/gwenhywfar-5.5.0-GWENHYWFAR_CB.patch
 delete mode 100644 patches/gwenhywfar-5.5.0-fix-build.patch
 delete mode 100644 patches/gwenhywfar-5.7.4-typemaker2-Makefiles.patch



More information about the gnucash-changes mailing list