gnucash stable: Multiple changes pushed

[Robert Fewell]

Updated	 via  https://github.com/Gnucash/gnucash/commit/a1bec6fc (commit)
	 via  https://github.com/Gnucash/gnucash/commit/6eac35f0 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/a958455a (commit)
	from  https://github.com/Gnucash/gnucash/commit/30cbf307 (commit)



commit a1bec6fc0139598720e0997ff65b0ba0dab00f91
Author: Robert Fewell <14uBobIT at gmail.com>
Date:   Tue Apr 4 10:35:07 2023 +0100

    Remove gnc-plugin-aqbanking-ui.xml file, left behind after change to GActions

diff --git a/gnucash/import-export/aqb/gnc-plugin-aqbanking-ui.xml b/gnucash/import-export/aqb/gnc-plugin-aqbanking-ui.xml
deleted file mode 100644
index 419d82b512..0000000000
--- a/gnucash/import-export/aqb/gnc-plugin-aqbanking-ui.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<ui>
-  <menubar>
-    <menu name="File" action="FileAction">
-      <menu name="FileImport" action="FileImportAction">
-        <placeholder name="FileImportPlaceholder">
-           <menuitem name="FileAQBImport"   action="AQBankingImportAction"/>
-        </placeholder>
-      </menu>
-    </menu>
-    <menu name="Actions" action="ActionsAction">
-      <placeholder name="ActionsPlaceholder">
-        <menu name="OnlineActions" action="OnlineActionsAction">
-          <menuitem name="ABGetBalance"         action="ABGetBalanceAction"/>
-          <menuitem name="ABGetTrans"           action="ABGetTransAction"/>
-          <separator name="OnlineActionsSep1"/>
-          <menuitem name="ABIssueSepaTrans"         action="ABIssueSepaTransAction"/>
-          <menuitem name="ABIssueSepaIntTrans"         action="ABIssueSepaIntTransAction"/>
-          <menuitem name="ABIssueIntTrans"      action="ABIssueIntTransAction"/>
-          <!--menuitem name="ABIssueSepaDirectDebit"         action="ABIssueSepaDirectDebitAction"/-->
-          <separator name="OnlineActionsSep2"/>
-          <menuitem name="ABViewLogwindow"   action="ABViewLogwindowAction"/>
-        </menu>
-      </placeholder>
-    </menu>
-    <menu name="Tools" action="ToolsAction">
-      <placeholder name="ToolsPlaceholder">
-        <menuitem name="ABSetup"                action="ABSetupAction"/>
-     </placeholder>
-    </menu>
-  </menubar>
-</ui>

commit 6eac35f013b107dcda400fb533cd2b93ffcb1412
Author: Robert Fewell <14uBobIT at gmail.com>
Date:   Tue Apr 4 10:33:43 2023 +0100

    Change identifier MINGW to WIN32 in AQB CMakeLists.txt to be consistent

diff --git a/gnucash/import-export/aqb/CMakeLists.txt b/gnucash/import-export/aqb/CMakeLists.txt
index 486bc87ca4..cf90236227 100644
--- a/gnucash/import-export/aqb/CMakeLists.txt
+++ b/gnucash/import-export/aqb/CMakeLists.txt
@@ -58,7 +58,7 @@ if(WITH_AQBANKING)
     set(AQB_EXPORT_SYMBOLS "-Wl,--export-all-symbols")
   endif()
   set(AQB_LIBSTDCXX "")
-  if (MINGW)
+  if (WIN32)
     set(AQB_LIBSTDCXX "-lstdc++")
   endif()
 

commit a958455a6b475701bc3d55b9fa604be79af0a010
Author: Robert Fewell <14uBobIT at gmail.com>
Date:   Tue Apr 4 10:32:03 2023 +0100

    Bug 798813 - Under File->Import, Missing OFX/QFX menu item
    
    Fixed by copying section from AQB CMakeLists.txt file to the OFX one.

diff --git a/gnucash/import-export/ofx/CMakeLists.txt b/gnucash/import-export/ofx/CMakeLists.txt
index e998b6b448..30d273829d 100644
--- a/gnucash/import-export/ofx/CMakeLists.txt
+++ b/gnucash/import-export/ofx/CMakeLists.txt
@@ -27,8 +27,18 @@ if (WITH_OFX)
     ${ofx_noinst_HEADERS}
   )
 
+  set(OFX_EXPORT_SYMBOLS "")
+  if (WIN32)
+    set(OFX_EXPORT_SYMBOLS "-Wl,--export-all-symbols")
+  endif()
+  set(OFX_LIBSTDCXX "")
+  if (WIN32)
+    set(OFX_LIBSTDCXX "-lstdc++")
+  endif()
+
   target_link_libraries(gncmod-ofx gnc-generic-import gnc-engine gnc-app-utils gnc-core-utils
-                    gnc-gnome-utils gnc-gnome gnc-module ${LIBOFX_LDFLAGS})
+                        gnc-gnome-utils gnc-gnome gnc-module
+                        ${OFX_EXPORT_SYMBOLS} ${LIBOFX_LDFLAGS} ${OFX_LIBSTDCXX})
 
   target_compile_definitions(gncmod-ofx PRIVATE -DG_LOG_DOMAIN=\"gnc.import.ofx\")
 



Summary of changes:
 gnucash/import-export/aqb/CMakeLists.txt           |  2 +-
 .../import-export/aqb/gnc-plugin-aqbanking-ui.xml  | 31 ----------------------
 gnucash/import-export/ofx/CMakeLists.txt           | 12 ++++++++-
 3 files changed, 12 insertions(+), 33 deletions(-)
 delete mode 100644 gnucash/import-export/aqb/gnc-plugin-aqbanking-ui.xml