gnucash-on-windows master: Multiple changes pushed

[Geert Janssens]

Updated	 via  https://github.com/Gnucash/gnucash-on-windows/commit/db54a133 (commit)
	 via  https://github.com/Gnucash/gnucash-on-windows/commit/c6131129 (commit)
	 via  https://github.com/Gnucash/gnucash-on-windows/commit/2b133fa2 (commit)
	from  https://github.com/Gnucash/gnucash-on-windows/commit/424991fa (commit)



commit db54a133539fe81b9ee4684a33841f94d711fa6a
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Mon Mar 5 19:26:42 2018 +0100

    update XDG_DATA_DIRS at build time to include /mingw(32/64)/share
    
    Gettext requires this or it will fail to find it's its rules and hence
    fail to process appdata and other xml based source files

diff --git a/jhbuildrc.in b/jhbuildrc.in
index b0c1725..6249cbc 100644
--- a/jhbuildrc.in
+++ b/jhbuildrc.in
@@ -55,11 +55,19 @@ environ_append('LDFLAGS', '-L%s -L%s' % (_mingw_libs, _usr_lib))
 add_to_path_var('PKG_CONFIG_PATH', os.path.join(_mingw_libs, 'pkgconfig'))
 add_to_path_var('PATH', os.path.join(_basedir, 'msys2', _arch, 'bin'))
 
+
+if _arch == 'mingw32':
+    mingw_base='/mingw32'
+else:
+    mingw_base='/mingw64'
+
 os.environ['SRCROOT'] = checkoutroot
 os.environ['PREFIX'] = prefix
 os.environ['MSYS2ROOT'] = os.path.join(_basedir, 'msys2')
 #os.environ['GUILE_LOAD_PATH'] = os.path.join(prefix, 'share', 'guile', '2.0')
 #os.environ['GUILE_LOAD_BINARY_PATH'] = os.path.join(prefix, 'lib', 'guile', '2.0', 'ccache')
+os.environ['XDG_DATA_DIRS'] = '/usr/local/share:/usr/share:' + mingw_base + '/share'
+
 if _arch == 'mingw32':
     autogenargs = "--build=i686-w64-mingw32"
 else:
@@ -78,6 +86,6 @@ module_makeargs["aqbanking"]="-j 1"
 module_makeargs["gnucash"]="-j 1"
 module_makeargs["gnucash-git"]="-j 1"
 
-module_extra_env["gnucash"]={'ACLOCAL_FLAGS':'-I' + os.path.join('/mingw32', 'share', 'aclocal')}
+module_extra_env["gnucash"]={'ACLOCAL_FLAGS':'-I' + os.path.join(mingw_base, 'share', 'aclocal')}
 module_extra_env["gwenhywfar"]={'CFLAGS':'-O0'}
 

commit c6131129557ba54982bae2e6ad1b4ecd5cc5bfa2
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Mon Mar 5 19:16:08 2018 +0100

    Drop obsolete dependency

diff --git a/cmake/defaults.cmake b/cmake/defaults.cmake
index 6335fa8..d1b02f0 100644
--- a/cmake/defaults.cmake
+++ b/cmake/defaults.cmake
@@ -259,8 +259,6 @@ set (LIBFFI_VERSION "3.2.1")
 set (LIBFFI_URL "ftp://sourceware.org/pub/libffi/libffi-${LIBFFI_VERSION}.tar.gz")
 set (LIBART_LGPL_URL         "${GNOME_WIN32_URL}/libart_lgpl/2.3/libart-lgpl_2.3.21-1_win32.zip")
 set (LIBART_LGPL_DEV_URL     "${GNOME_WIN32_URL}/libart_lgpl/2.3/libart-lgpl-dev_2.3.21-1_win32.zip")
-set (LIBGNOMECANVAS_URL      "${GNOME_WIN32_URL}/libgnomecanvas/2.30/libgnomecanvas_2.30.1-1_win32.zip")
-set (LIBGNOMECANVAS_DEV_URL  "${GNOME_WIN32_URL}/libgnomecanvas/2.30/libgnomecanvas-dev_2.30.1-1_win32.zip")
 set (LIBICONV_URL            "${GNOME_WIN32_DEPS_URL}/libiconv-1.9.1.bin.woe32.zip")
 set (LIBPNG_URL              "${GNOME_WIN32_DEPS_URL}/libpng_1.4.3-1_win32.zip")
 set (LIBPNG_DEV_URL          "${GNOME_WIN32_DEPS_URL}/libpng-dev_1.4.3-1_win32.zip")
diff --git a/setup-mingw64.ps1 b/setup-mingw64.ps1
index fa32e3c..b30efcb 100644
--- a/setup-mingw64.ps1
+++ b/setup-mingw64.ps1
@@ -216,7 +216,7 @@ $toolchain = "binutils cmake crt-git gcc gcc-libs gdb headers-git libmangle-git
 
 
 # Note that webkitgtk3 will pull in gtk3 automatically.
-$deps = "webkitgtk3 boost iso-codes shared-mime-info libmariadbclient postgresql libgnomecanvas ninja ncurses"
+$deps = "webkitgtk3 boost iso-codes shared-mime-info libmariadbclient postgresql ninja ncurses"
 
 Write-Host @"
 

commit 2b133fa2473f734aedff9f8a1c043ee52db77a1d
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Mon Mar 5 18:28:39 2018 +0100

    Add libboost_date_time-mt.dll in the installer.
    
    Discovered and fixed by Robert Fewell

diff --git a/inno_setup/gnucash-mingw64.iss b/inno_setup/gnucash-mingw64.iss
index e5f032b..3e22103 100644
--- a/inno_setup/gnucash-mingw64.iss
+++ b/inno_setup/gnucash-mingw64.iss
@@ -117,6 +117,7 @@ Source: "@INST_DIR@\share\doc\@PACKAGE at -docs\*.hhmap"; DestDir: "{app}\share\@PA
 ;;lib/dbd/libdbdpgsql.dll: libpq.dll, ssleay32.dll, libeay32.dll
 
 Source: "@MINGW_DIR@\bin\libatk-1.0-0.dll"; DestDir: "{app}\bin"; Components: main
+Source: "@MINGW_DIR@\bin\libboost_date_time-mt.dll"; DestDir: "{app}\bin"; Components: main
 Source: "@MINGW_DIR@\bin\libboost_locale-mt.dll"; DestDir: "{app}\bin"; Components: main
 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



Summary of changes:
 cmake/defaults.cmake           |  2 --
 inno_setup/gnucash-mingw64.iss |  1 +
 jhbuildrc.in                   | 10 +++++++++-
 setup-mingw64.ps1              |  2 +-
 4 files changed, 11 insertions(+), 4 deletions(-)