gnucash-on-windows master: Multiple changes pushed

John Ralls jralls at code.gnucash.org
Sat Jun 27 13:15:56 EDT 2020


Updated	 via  https://github.com/Gnucash/gnucash-on-windows/commit/12b79e98 (commit)
	 via  https://github.com/Gnucash/gnucash-on-windows/commit/86df10e1 (commit)
	from  https://github.com/Gnucash/gnucash-on-windows/commit/eb2e946d (commit)



commit 12b79e98f55e8129b8b8ac2dd5e5f0785c0aaa98
Author: John Ralls <jralls at ceridwen.us>
Date:   Sat Jun 27 19:14:57 2020 +0200

    Package release of GnuCash 3.11

diff --git a/gnucash.modules b/gnucash.modules
index f86a4b4..abeceab 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -274,8 +274,8 @@
 
  <cmake id="gnucash"
         cmakeargs="-DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock">
-   <branch module="project/gnucash/gnucash%20%28stable%29/3.10/gnucash-3.10.tar.bz2"
-	   repo="sourceforge" version="3.10"/>
+   <branch module="project/gnucash/gnucash%20%28stable%29/3.11/gnucash-3.11.tar.bz2"
+	   repo="sourceforge" version="3.11"/>
     <dependencies>
       <dep package="libofx"/>
       <dep package="aqbanking"/>
@@ -336,8 +336,8 @@
   <autotools id="gnucash-docs"
 	    autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s %(autogenargs)s"
 	    makeargs="chm" makeinstallargs="install-chm" >
-    <branch  module="project/gnucash/gnucash%20%28stable%29/3.10/gnucash-docs-3.10.tar.gz"
-	     version="3.10" repo="sourceforge"/>
+    <branch  module="project/gnucash/gnucash%20%28stable%29/3.11/gnucash-docs-3.11.tar.gz"
+	     version="3.11" repo="sourceforge"/>
   </autotools>
 
   <autotools id="gnucash-unstable-docs"
diff --git a/inno_setup/gnucash-mingw64.iss b/inno_setup/gnucash-mingw64.iss
index 09dc2b2..8984bc2 100644
--- a/inno_setup/gnucash-mingw64.iss
+++ b/inno_setup/gnucash-mingw64.iss
@@ -121,7 +121,7 @@ Source: "@MINGW_DIR@\bin\libboost_locale-mt.dll"; DestDir: "{app}\bin"; Componen
 Source: "@MINGW_DIR@\bin\libboost_regex-mt.dll"; DestDir: "{app}\bin"; Components: main
 Source: "@MINGW_DIR@\bin\libboost_system-mt.dll"; DestDir: "{app}\bin"; Components: main
 Source: "@MINGW_DIR@\bin\libboost_filesystem-mt.dll"; DestDir: "{app}\bin"; Components: main
-Source: "@MINGW_DIR@\bin\libboost_program_options-mt.dll"; DestDir: "{app}\bin"; Components: main
+;;Source: "@MINGW_DIR@\bin\libboost_program_options-mt.dll"; DestDir: "{app}\bin"; Components: main
 Source: "@MINGW_DIR@\bin\libboost_thread-mt.dll"; DestDir: "{app}\bin"; Components: main
 Source: "@MINGW_DIR@\bin\libbz2-1.dll"; DestDir: "{app}\bin"; Components: main
 Source: "@MINGW_DIR@\bin\libbrotlidec.dll"; DestDir: "{app}\bin"; Components: main

commit 86df10e17446fcf24523b1695f926acf47f61eee
Author: John Ralls <jralls at ceridwen.us>
Date:   Sat Jun 27 19:14:35 2020 +0200

    Add libmariadb's plugins to the dist.
    
    Required for libdbdmysql to work.

diff --git a/inno_setup/gnucash-mingw64.iss b/inno_setup/gnucash-mingw64.iss
index 696f680..09dc2b2 100644
--- a/inno_setup/gnucash-mingw64.iss
+++ b/inno_setup/gnucash-mingw64.iss
@@ -189,6 +189,7 @@ Source: "@MINGW_DIR@\bin\libwinpthread-1.dll"; DestDir: "{app}\bin"; Components:
 Source: "@MINGW_DIR@\bin\libxml2-2.dll"; DestDir: "{app}\bin"; Components: main
 Source: "@MINGW_DIR@\bin\libxslt-1.dll"; DestDir: "{app}\bin"; Components: main
 Source: "@MINGW_DIR@\bin\libmariadb.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\lib\mariadb\plugin\*"; DestDir: "{app}\lib\mariadb\plugin"; Components: main
 Source: "@MINGW_DIR@\bin\zlib1.dll"; DestDir: "{app}\bin"; Components: main
 
 Source: "@MINGW_DIR@\bin\gspawn-win32-helper.exe"; DestDir: "{app}\bin"; Components: main



Summary of changes:
 gnucash.modules                | 8 ++++----
 inno_setup/gnucash-mingw64.iss | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)



More information about the gnucash-changes mailing list