gnucash-on-osx master: Multiple changes pushed
John Ralls
jralls at code.gnucash.org
Thu Mar 16 17:23:33 EDT 2017
Updated via https://github.com/Gnucash/gnucash-on-osx/commit/9d0a4087 (commit)
via https://github.com/Gnucash/gnucash-on-osx/commit/7380c605 (commit)
from https://github.com/Gnucash/gnucash-on-osx/commit/197c193d (commit)
commit 9d0a40874eb5ee461a4d706d3ab2530b70a96269
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Mar 16 14:19:38 2017 -0700
Patch fixups for latest versions of AQBanking and Libchipcard.
Also one more command for getting boost lib linkage right.
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index a9d1869..4b7fa0a 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -36,7 +36,9 @@
<autotools id="libchipcard" autogen-sh="configure" autogenargs="--enable-local-install">
<branch module="gnucash/Dependencies/libchipcard-5.0.4.tar.gz" version="5.0.4"
- repo="sourceforge" />
+ repo="sourceforge">
+ <patch file="https://raw.githubusercontent.com/gnucash/gnucash-on-osx/master/patches/libchipcard-sdk.patch"/>
+ </branch>
<dependencies>
<dep package="libgcrypt"/>
<dep package="gnutls"/>
@@ -81,7 +83,6 @@
autogenargs="--enable-local-install">
<branch module="gnucash/Dependencies/aqbanking-5.6.12.tar.gz" version="5.6.12"
repo="sourceforge">
- <patch file="https://raw.githubusercontent.com/gnucash/gnucash-on-osx/master/patches/swift940-strndup.patch" strip='1'/>
</branch>
<dependencies>
<dep package="gwenhywfar"/>
@@ -216,6 +217,7 @@
After which one must run
for i in `ls $PREFIX/lib/libboost*`; do install_name_tool -id $i $i; done
+for i in `ls $PREFIX/lib/libboost*.dylib`; do for j in `ls $PREFIX/lib/libboost*.dylib`; do install_name_tool -change `basename $i` $i $j; done; done
-->
<autotools id="boost" supports-non-srcdir-builds="no">
<branch module="boost/boost_1_56_0.tar.bz2" repo="sourceforge"
diff --git a/patches/libchipcard-sdk.patch b/patches/libchipcard-sdk.patch
new file mode 100644
index 0000000..e908b09
--- /dev/null
+++ b/patches/libchipcard-sdk.patch
@@ -0,0 +1,14 @@
+diff -c /Users/john/Development/Gnucash-Build/Gnucash-master-git/src/libchipcard-5.0.4/configure.ac\~ /Users/john/Development/Gnucash-Build/Gnucash-master-git/src/libchipcard-5.0.4/configure.ac
+--- a/configure.ac Tue Dec 15 06:46:03 2015
++++ b/configure.ac Mon Mar 13 13:43:03 2017
+@@ -413,7 +413,7 @@
+ elif test "$OSYSTEM" = "osx" ; then
+ AC_MSG_CHECKING(for pcsc includes)
+ # pcsc_includes="-I\$(libchipcard_symlinkdir)/PCSC"
+- pcsc_includes="-I/System/Library/Frameworks/PCSC.framework/Headers"
++ pcsc_includes="-I${SDKDIR}/System/Library/Frameworks/PCSC.framework/Headers"
+ AC_MSG_RESULT($pcsc_includes)
+ AC_MSG_CHECKING(for pcsc libs)
+ pcsc_libraries=""
+
+Diff finished. Mon Mar 13 13:49:02 2017
commit 7380c605712a008c7910361d567be417c46de411
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Mar 13 12:07:56 2017 -0700
Add icu as a dependency of boost.
Needed to ensure that boost::regex is built with ICU support.
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 75567b0..a9d1869 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -220,6 +220,9 @@ for i in `ls $PREFIX/lib/libboost*`; do install_name_tool -id $i $i; done
<autotools id="boost" supports-non-srcdir-builds="no">
<branch module="boost/boost_1_56_0.tar.bz2" repo="sourceforge"
version="1.56.0"/>
+ <dependencies>
+ <dep package="icu"/>
+ </dependencies>
</autotools>
<cmake id="googletest" cmakeargs="-DBUILD_GMOCK=OFF">
Summary of changes:
modulesets/gnucash.modules | 9 +++++++--
patches/libchipcard-sdk.patch | 14 ++++++++++++++
2 files changed, 21 insertions(+), 2 deletions(-)
create mode 100644 patches/libchipcard-sdk.patch
More information about the gnucash-changes
mailing list