gnucash-on-osx master: Multiple changes pushed
John Ralls
jralls at code.gnucash.org
Sat Mar 7 21:19:04 EST 2020
Updated via https://github.com/Gnucash/gnucash-on-osx/commit/c9cd917e (commit)
via https://github.com/Gnucash/gnucash-on-osx/commit/5baf9ec2 (commit)
via https://github.com/Gnucash/gnucash-on-osx/commit/02d35681 (commit)
from https://github.com/Gnucash/gnucash-on-osx/commit/1c79fb25 (commit)
commit c9cd917e6904ffda3e726ba39eef42d69b6f0697
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Mar 7 17:06:26 2020 -0800
Adjust the download file name and checkoutdir to accomodate flatpak.
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 790cbfb..ac74083 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -269,8 +269,8 @@
<cmake id="gnucash"
cmakeargs="-DGTEST_ROOT=${JHBUILD_SOURCE}/googletest/googletest -DGMOCK_ROOT=${JHBUILD_SOURCE}/googletest/googlemock">
- <branch module="gnucash/gnucash%20%28stable%29/3.8/gnucash-3.8.tar.bz2"
- repo="sourceforge" version="3.7" />
+ <branch module="gnucash/gnucash%20%28stable%29/3.8/gnucash-3.8b.tar.bz2"
+ checkoutdir="gnucash-3.8" repo="sourceforge" version="3.8" />
<dependencies>
<dep package="meta-gtk-osx-gtk3"/>
<dep package="libofx"/>
commit 5baf9ec29d2fd94c2940e155d88296ac2769dbb1
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Mar 7 17:05:44 2020 -0800
Disable building docs on xmlsec.
When built out-of-source doc installation uses a cp option not provided by MacOS.
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index caa63a7..790cbfb 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -76,7 +76,7 @@
</after>
</autotools>
- <autotools id="xmlsec">
+ <autotools id="xmlsec" autogenargs="--enable-docs=no">
<branch module="lsh123/xmlsec" repo="github" tag="xmlsec-1_2_25"/>
<dependencies>
<dep package="openssl"/>
commit 02d35681f802dd3864c3728fcebb4046253ea877
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Mar 7 17:03:26 2020 -0800
Update Gwenhywfar, AQBanking, and PGSQL.
Including patches for Gwen and PGSQL to get them to build cleanly.
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 1bd2b2f..caa63a7 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -39,6 +39,7 @@
<branch module="229/libchipcard-5.1.5rc2.tar.gz" version="5.1.5rc2"
repo="aqbanking">
<patch file="https://raw.githubusercontent.com/gnucash/gnucash-on-osx/master/patches/libchipcard-sdk.patch" strip="1"/>
+ <patch file="https://raw.githubusercontent.com/gnucash/gnucash-on-osx/master/patches/libchipcard-include.patch" strip="1"/>
</branch>
<dependencies>
<dep package="libgcrypt"/>
@@ -48,8 +49,9 @@
<autotools id="gwenhywfar" autogen-sh="configure"
autogenargs="--with-guis='gtk3' --enable-local-install">
- <branch module="231/gwenhywfar-5.1.0.tar.gz" version="5.1.0"
+ <branch module="256/gwenhywfar-5.2.0.tar.gz" version="5.2.0"
repo="aqbanking" >
+ <patch file="https://raw.githubusercontent.com/gnucash/gnucash-on-osx/master/patches/gwen-include-file.patch" strip="1"/>
</branch>
<dependencies>
<dep package="libgcrypt"/>
@@ -83,7 +85,7 @@
<autotools id="aqbanking" autogen-sh="autoreconf" makeargs="-j1"
autogenargs="--enable-local-install">
- <branch module="232/aqbanking-5.99.45.tar.gz" version="5.99.45"
+ <branch module="269/aqbanking-6.1.2.tar.gz" version="6.1.2"
repo="aqbanking">
</branch>
<dependencies>
@@ -146,11 +148,14 @@
</autotools>
<autotools id="pgsql">
- <branch repo="postgres" module="v9.6.5/postgresql-9.6.5.tar.bz2"
- version="9.6.10"/>
- <dependencies>
- <dep package="openssl"/>
- </dependencies>
+ <branch repo="postgres" module="v9.6.17/postgresql-9.6.17.tar.bz2"
+ version="9.6.17">
+ <patch file="https://raw.githubusercontent.com/gnucash/gnucash-on-osx/master/patches/pgsql-find-int64.patch" strip="1"/>
+
+ </branch>
+ <dependencies>
+ <dep package="openssl"/>
+ </dependencies>
</autotools>
<cmake id="mysql">
diff --git a/patches/libchipcard-include.patch b/patches/libchipcard-include.patch
new file mode 100644
index 0000000..02a1f1f
--- /dev/null
+++ b/patches/libchipcard-include.patch
@@ -0,0 +1,13 @@
+diff -u /Users/john/Development/Gnucash-Build/Gnucash-3/src/libchipcard-5.1.5rc2/src/tools/usbtan-test/main.c\~ /Users/john/Development/Gnucash-Build/Gnucash-3/src/libchipcard-5.1.5rc2/src/tools/usbtan-test/main.c
+--- a/src/tools/usbtan-test/main.c 2020-01-12 08:22:44.000000000 -0800
++++ b/src/tools/usbtan-test/main.c 2020-03-07 10:31:29.000000000 -0800
+@@ -12,6 +12,7 @@
+ # include <config.h>
+ #endif
+
++#include <ctype.h>
+ #include <gwenhywfar/args.h>
+ #include <gwenhywfar/cgui.h>
+ #include <gwenhywfar/text.h>
+
+Diff finished. Sat Mar 7 11:14:03 2020
diff --git a/patches/pgsql-find-int64.patch b/patches/pgsql-find-int64.patch
new file mode 100644
index 0000000..b143985
--- /dev/null
+++ b/patches/pgsql-find-int64.patch
@@ -0,0 +1,31 @@
+diff -u /Users/john/Development/Gnucash-Build/Gnucash-3/src/postgresql-9.6.17/configure\~ /Users/john/Development/Gnucash-Build/Gnucash-3/src/postgresql-9.6.17/configure
+--- a/configure 2020-02-10 14:21:38.000000000 -0800
++++ b/configure 2020-03-06 17:00:56.000000000 -0800
+@@ -13930,6 +13930,7 @@
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
++#include <stdlib.h>
+ typedef long long int ac_int64;
+
+ /*
+@@ -13939,7 +13940,7 @@
+ ac_int64 a = 20000001;
+ ac_int64 b = 40000005;
+
+-int does_int64_work()
++static int does_int64_work()
+ {
+ ac_int64 c,d;
+
+@@ -13953,7 +13954,7 @@
+ return 0;
+ return 1;
+ }
+-main() {
++int main() {
+ exit(! does_int64_work());
+ }
+ _ACEOF
+
+Diff finished. Sat Mar 7 11:17:19 2020
Summary of changes:
modulesets/gnucash.modules | 25 +++++++++++++++----------
patches/libchipcard-include.patch | 13 +++++++++++++
patches/pgsql-find-int64.patch | 31 +++++++++++++++++++++++++++++++
3 files changed, 59 insertions(+), 10 deletions(-)
create mode 100644 patches/libchipcard-include.patch
create mode 100644 patches/pgsql-find-int64.patch
More information about the gnucash-changes
mailing list