gnucash-on-windows master: Multiple changes pushed
John Ralls
jralls at code.gnucash.org
Sun Mar 25 15:13:21 EDT 2018
Updated via https://github.com/Gnucash/gnucash-on-windows/commit/cdc5f48e (commit)
via https://github.com/Gnucash/gnucash-on-windows/commit/15b49606 (commit)
via https://github.com/Gnucash/gnucash-on-windows/commit/65cd11a0 (commit)
from https://github.com/Gnucash/gnucash-on-windows/commit/e562143a (commit)
commit cdc5f48e5df6d155679de7424c77a3360c862958
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Mar 25 12:13:08 2018 -0700
Release 2.7.8
diff --git a/gnucash.modules b/gnucash.modules
index e5bc92f..eb5a838 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -281,8 +281,8 @@
<cmake id="gnucash"
cmakeargs="-G 'MSYS Makefiles' -DCMAKE_FIND_ROOT_PATH=$MSYS2ROOT -DCMAKE_PREFIX_PATH=$MSYS2ROOT -DPERL_EXECUTABLE=/usr/bin/perl -DGNC_DBD_DIR=$PREFIX/lib/dbd -DHTMLHELP_DIR=$PREFIX/hh -DGTEST_ROOT=$SRCROOT/googletest/googletest -DGMOCK_ROOT=$SRCROOT/googletest/googlemock"
use-ninja="False">
- <branch repo="sourceforge" module="gnucash/unstable/gnucash-2.7.7.tar.bz2"
- version="2.7.7"/>
+ <branch repo="sourceforge" module="gnucash/unstable/gnucash-2.7.8.tar.bz2"
+ version="2.7.8"/>
<dependencies>
<dep package="libofx"/>
<dep package="aqbanking"/>
commit 15b496062b46bb37602749f0803f4fd12843c5ba
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Mar 25 12:05:25 2018 -0700
Modify gwenhywfar environment for gwen 4.20.
Fixes the optimization bug, yea!
diff --git a/jhbuildrc.in b/jhbuildrc.in
index c165ee3..c753a6e 100644
--- a/jhbuildrc.in
+++ b/jhbuildrc.in
@@ -74,10 +74,13 @@ if _branch in ('master', 'unstable'):
branches['gnucash-git'] = (None, _branch)
else:
modules = ["meta-gnucash"]
+
+_gtk_cflags = _popen("pkg-config --cflags gtk+-3.0")
+_gtk_ldflags= _popen("pkg-config --libs gtk+-3.0")
append_autogenargs("libofx", "--with-opensp-includes=" + prefix + "/include/OpenSP --with-opensp-libs=" + prefix + "/lib")
append_autogenargs("libdbi-drivers","--with-dbi-incdir=" + prefix + "/include --with-dbi-libdir=" + prefix + "/lib")
module_makeargs["aqbanking"]="-j 1"
module_extra_env["gnucash"]={'ACLOCAL_FLAGS':'-I' + os.path.join(_mingw_base, 'share', 'aclocal')}
-module_extra_env["gwenhywfar"]={'CFLAGS':'-O0'}
+module_extra_env["gwenhywfar"]={'CFLAGS': _gtk_cflags, 'LDFLAGS': _gtk_ldflags}
diff --git a/setup-mingw64.ps1 b/setup-mingw64.ps1
index 389c85e..c8a8323 100644
--- a/setup-mingw64.ps1
+++ b/setup-mingw64.ps1
@@ -270,8 +270,8 @@ if (!(test-path -path "$target_dir\\src\\gnucash-on-windows.git")) {
exit
}
-bash-command -command "/usr/bin/patch -d/ -p0 -i $target_unix/src/gnucash-on-windows.git/patches/jhbuild.patch"
-bash-command -command "/usr/bin/patch -d/ -p0 -i $target_unix/src/gnucash-on-windows.git/patches/FindSWIG.patch"
+bash-command -command "/usr/bin/patch -t -d/ -p0 -i $target_unix/src/gnucash-on-windows.git/patches/jhbuild.patch"
+bash-command -command "/usr/bin/patch -t -d/ -p0 -i $target_unix/src/gnucash-on-windows.git/patches/FindSWIG.patch"
$jhbuildrc = get-content "$target_dir\\src\\gnucash-on-windows.git\\jhbuildrc.in" |
%{$_ -replace "@-BASE_DIR-@", "$target_unix"} |
commit 65cd11a0307308942142a54b7c5e8c0622788871
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Mar 18 14:14:12 2018 -0700
Update AQBanking and Gwenhywfar to the latest stable releases.
Download directly from aquamaniac.de instead of via \nsourceforge/gnucash/dependencies and update svn to git while we're at it.
diff --git a/gnucash.modules b/gnucash.modules
index 9782c1e..e5bc92f 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -15,8 +15,10 @@
href="http://www.gnucash.org/pub/gnucash/sources/"/>
<repository type="git" name="git.gnucash.org"
href="http://git.gnucash.org/"/>
- <repository type="svn" name="aquamaniac"
- href="http://devel.aqbanking.de/svn/"/>
+ <repository type="git" name="aquamaniac"
+ href="https://git.aquamaniac.de/git/"/>
+ <repository type="tarball" name="aqbanking"
+ href="https://www.aquamaniac.de/sites/download/"/>
<repository type="git" name="github"
href="git://github.com/"/>
<repository type="tarball" name="github-tar"
@@ -142,9 +144,8 @@
</autotools>
<autotools id="gwenhywfar" autogen-sh="configure"
- autogenargs="--with-guis='' --enable-local-install --disable-binreloc --disable-ssl">
- <branch module="gnucash/Dependencies/gwenhywfar-4.18.0.tar.gz" version="4.18.0"
- repo="sourceforge">
+ autogenargs="--with-guis='gtk3' --enable-local-install --disable-binreloc --disable-ssl">
+ <branch module="download.php?package=01&release=208&file=02&dummy=gwenhywfar-4.20.0.tar.gz" version="4.20.0" repo="aqbanking" checkoutdir="gwenhywfar-4.20.0">
</branch>
<dependencies>
<dep package="gcrypt"/>
@@ -152,7 +153,7 @@
</dependencies>
</autotools>
- <autotools id="gwenhywfar-svn" autogen-template="make -fMakefile.cvs && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
+ <autotools id="gwenhywfar-git" autogen-template="make -fMakefile.cvs && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
autogenargs="--with-guis='' --enable-local-install --disable-binreloc --disable-ssl">
<branch module="gwenhywfar" repo="aquamaniac"/>
<dependencies>
@@ -177,8 +178,7 @@
<autotools id="aqbanking" autogen-sh="autoreconf" makeargs="-j1"
autogenargs="--enable-local-install">
- <branch module="gnucash/Dependencies/aqbanking-5.6.12.tar.gz" version="5.6.12"
- repo="sourceforge">
+ <branch module="download.php?package=03&release=217&file=02&dummy=aqbanking-5.7.8.tar.gz" repo="aqbanking" version="5.7.8" checkoutdir="aqbanking-5.7.8">
</branch>
<dependencies>
<dep package="gwenhywfar"/>
@@ -189,7 +189,7 @@
</dependencies>
</autotools>
- <autotools id="aqbanking-svn"
+ <autotools id="aqbanking-git"
autogenargs='--enable-local-install"'
autogen-template="make -fMakefile.cvs && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s" >
<branch module="aqbanking" repo="aquamaniac" >
Summary of changes:
gnucash.modules | 22 +++++++++++-----------
jhbuildrc.in | 5 ++++-
setup-mingw64.ps1 | 4 ++--
3 files changed, 17 insertions(+), 14 deletions(-)
More information about the gnucash-changes
mailing list