gnucash-on-windows master: Multiple changes pushed

John Ralls jralls at code.gnucash.org
Sun Oct 23 20:39:56 EDT 2016


Updated	 via  https://github.com/Gnucash/gnucash-on-windows/commit/53dde403 (commit)
	 via  https://github.com/Gnucash/gnucash-on-windows/commit/855a19d3 (commit)
	 via  https://github.com/Gnucash/gnucash-on-windows/commit/15020f99 (commit)
	from  https://github.com/Gnucash/gnucash-on-windows/commit/023108e7 (commit)



commit 53dde4030405fffb761f74363fd65ce8a460f3f0
Author: John Ralls <jralls at ceridwen.us>
Date:   Sat Oct 22 16:50:29 2016 -0700

    Remove CMakeCache.txt before building with Cmake.
    
    To ensure that any changes in CMakeLists.txt are picked up by the build.

diff --git a/install-impl.sh b/install-impl.sh
index 59f25f9..5ac5b76 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1358,6 +1358,9 @@ function inst_gnucash_using_cmake() {
         _CMAKE_MAKE_PROGRAM=$_NINJA_UDIR/ninja.exe
     fi
     qpushd $_BUILD_UDIR
+         if [ -f CMakeCache.txt ]; then
+             rm CMakeCache.txt
+         fi
          cmake -G "$CMAKE_GENERATOR" \
                -D CMAKE_INSTALL_PREFIX=${_INSTALL_UDIR} \
                -D CMAKE_PREFIX_PATH=${_GLOBAL_UDIR} \

commit 855a19d334a00aca9a40f682d7017c53b2be7f30
Author: John Ralls <jralls at ceridwen.us>
Date:   Sat Oct 22 16:49:13 2016 -0700

    Patch GOffice so that libtool will build shared libraries.
    
    This hasn't been a problem before but building failed on Windows 10.

diff --git a/defaults.sh b/defaults.sh
index bae73ed..32118b5 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -297,7 +297,7 @@ set_default LIBGSF_DIR $GLOBAL_DIR\\libgsf
 GOFFICE_VERSION="0.8.17"
 set_default GOFFICE_URL "$GNOME_MIRROR/sources/goffice/0.8/goffice-${GOFFICE_VERSION}.tar.bz2"
 set_default GOFFICE_DIR $GLOBAL_DIR\\goffice
-#set_default GOFFICE_PATCH `pwd`/goffice-x.x.x.patch
+set_default GOFFICE_PATCH `pwd`/goffice-enable-shared.patch
 
 set_default GLADE_URL "$GNOME_MIRROR/sources/glade3/3.0/glade3-3.1.2.tar.bz2"
 set_default GLADE_DIR $GLOBAL_DIR\\glade
diff --git a/goffice-enable-shared.patch b/goffice-enable-shared.patch
new file mode 100644
index 0000000..0ce48a6
--- /dev/null
+++ b/goffice-enable-shared.patch
@@ -0,0 +1,11 @@
+--- a/configure.in	2011-06-16 16:46:53 -0700
++++ b/configure.in	2016-10-22 15:29:49 -0700
+@@ -69,7 +69,7 @@
+ AC_PROG_YACC
+ AM_PROG_LEX
+ AC_PROG_LN_S
+-AM_PROG_LIBTOOL
++LT_INIT([win32-dll])
+ DOLT
+ AC_STDC_HEADERS
+ AC_SYS_LARGEFILE

commit 15020f998a9febef3fd4055da04d85c77fb408e4
Author: John Ralls <jralls at ceridwen.us>
Date:   Sat Oct 22 14:56:33 2016 -0700

    Tell wget not to check certificates.
    
    Because Martin Preuss has changed aquamaniac.de to https only
    and getting certificates set up on MinGW is somewhere between
    difficult and impossible.

diff --git a/defaults.sh b/defaults.sh
index 66275a2..bae73ed 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -401,6 +401,7 @@ set_default ISOCODES_DIR $GLOBAL_DIR\\isocodes
 set_default BOOST_URL "$SF_MIRROR/boost/boost/boost_1_55_0.tar.bz2"
 set_default BOOST_DIR $GLOBAL_DIR\\boost
 
+set_default WGET_EXTRA_OPTIONS "--no-check-certificate"
 ### Local Variables: ***
 ### sh-basic-offset: 4 ***
 ### indent-tabs-mode: nil ***



Summary of changes:
 defaults.sh                 |  3 ++-
 goffice-enable-shared.patch | 11 +++++++++++
 install-impl.sh             |  3 +++
 3 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 goffice-enable-shared.patch



More information about the gnucash-changes mailing list