gnucash-on-osx master: Multiple changes pushed
John Ralls
jralls at code.gnucash.org
Sat Oct 21 14:55:55 EDT 2017
Updated via https://github.com/Gnucash/gnucash-on-osx/commit/8b3ba9f5 (commit)
via https://github.com/Gnucash/gnucash-on-osx/commit/406fe58a (commit)
via https://github.com/Gnucash/gnucash-on-osx/commit/52329d33 (commit)
via https://github.com/Gnucash/gnucash-on-osx/commit/2e0795af (commit)
from https://github.com/Gnucash/gnucash-on-osx/commit/2537a1d0 (commit)
commit 8b3ba9f5c25adeccdd6b1141d9605908aaa468c9
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Oct 21 11:55:17 2017 -0700
Set gnucash-git webkit dependency to webkit1gtk3.
Webkit2gtk3 doesn't handle javascript correctly.
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 470c727..3110f98 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -312,6 +312,7 @@ for i in `ls $PREFIX/lib/libboost*.dylib`; do for j in `ls $PREFIX/lib/libboost*
<dep package="swig"/>
<dep package="boost"/>
<dep package="googletest"/>
+ <dep package="webkit1gtk3"/>
</dependencies>
</cmake>
commit 406fe58ae39f639193b2ee5971924003819dbd67
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Oct 21 11:54:00 2017 -0700
Remove the unused Gnucash Meta-modules.
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 1d2b793..470c727 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -354,31 +354,4 @@ for i in `ls $PREFIX/lib/libboost*.dylib`; do for j in `ls $PREFIX/lib/libboost*
</dependencies>
</metamodule>
- <metamodule id="meta-gnucash-unstable">
- <dependencies>
- <dep package="gnucash-unstable"/>
- <dep package="meta-gtk-osx-webkit"/>
- </dependencies>
- </metamodule>
-
- <metamodule id="meta-gnucash-unstable-Leopard">
- <dependencies>
- <dep package="gnucash-unstable"/>
- <dep package="meta-gtk-osx-webkit1.6"/>
- </dependencies>
- </metamodule>
-
- <metamodule id="meta-gnucash-git">
- <dependencies>
- <dep package="gnucash-git"/>
- <dep package="meta-gtk-osx-webkit-gtk3"/>
- </dependencies>
- </metamodule>
- <metamodule id="meta-gnucash-git-Leopard">
- <dependencies>
- <dep package="gnucash-git"/>
- <dep package="meta-gtk-osx-webkit1.6"/>
- </dependencies>
- </metamodule>
-
</moduleset>
commit 52329d337d51eb18c490e1667ed3794152c378dc
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Oct 21 11:53:39 2017 -0700
Switch the AQBanking repo from SVN to git.
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index d30da3e..1d2b793 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -24,8 +24,8 @@
href="http://www.gnucash.org/pub/gnucash/sources/"/>
<repository type="svn" name="svn.gnucash.org"
href="http://svn.gnucash.org/repo/"/>
- <repository type="svn" name="aquamaniac"
- href="http://devel.aqbanking.de/svn/"/>
+ <repository type="git" name="aquamaniac"
+ href="http://git.aqbanking.de/git/"/>
<repository type="git" name="github"
href="git://github.com/"/>
<repository type="tarball" name="openssl"
@@ -104,7 +104,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" >
commit 2e0795af3aae3b250c3c6b6033384186efd44ce2
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Oct 21 11:52:11 2017 -0700
Release Gnucash 2.7.0
diff --git a/gnucash-bundler/Info-unstable.plist b/gnucash-bundler/Info-unstable.plist
index dd52b19..ed0239a 100644
--- a/gnucash-bundler/Info-unstable.plist
+++ b/gnucash-bundler/Info-unstable.plist
@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>Gnucash</string>
<key>CFBundleGetInfoString</key>
- <string>Gnucash version 2.5.10 © 2013 Gnucash Contributors</string>
+ <string>Gnucash version 2.7.0 © 2017 Gnucash Contributors</string>
<key>CFBundleIconFile</key>
<string>gnucash.icns</string>
<key>CFBundleIdentifier</key>
@@ -15,17 +15,17 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>
- <string>2.5.10 © 2013 Gnucash Contributors</string>
+ <string>2.7.0 © 2017 Gnucash Contributors</string>
<key>CFBundleName</key>
<string>Gnucash</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>2.5.10</string>
+ <string>2.7.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>2.5.10</string>
+ <string>2.7.0</string>
<key>CFBundleDocumentTypes</key>
<array>
<dict>
@@ -59,10 +59,12 @@
<true/>
<key>LSRequiresCarbon</key>
<true/>
+ <key>LSMinimumSystemVersion</key>
+ <string>10.8.0</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.finance</string>
<key>NSHumanReadableCopyright</key>
- <string>Copyright 2013 Gnucash Contributors</string>
+ <string>Copyright 2017 Gnucash Contributors</string>
<key>NSHighResolutionCapable</key>
<true/>
</dict>
diff --git a/gnucash-bundler/gnucash-unstable.bundle b/gnucash-bundler/gnucash-unstable.bundle
index b71e26d..35c269f 100644
--- a/gnucash-bundler/gnucash-unstable.bundle
+++ b/gnucash-bundler/gnucash-unstable.bundle
@@ -18,6 +18,7 @@
-->
<destination overwrite="yes">${env:HOME}</destination>
+ <gtk>gtk+-3.0</gtk>
<image>
<!-- Not implemented yet (DMG image). -->
</image>
@@ -55,24 +56,15 @@
<binary>
${prefix}/lib/gdk-pixbuf-2.0/${pkg:gdk-pixbuf-2.0:gdk_pixbuf_binary_version}/loaders/*.so
</binary>
-<!-- Copy in the theme engines, -->
- <binary>
- ${prefix}/lib/gtk-2.0/${pkg:gtk+-2.0:gtk_binary_version}/engines/*.so
- </binary>
<!-- The quartz input-method module, -->
<binary>
- ${prefix}/lib/gtk-2.0/${pkg:gtk+-2.0:gtk_binary_version}/immodules/im-quartz.so
+ ${prefix}/lib/gtk-3.0/${pkg:gtk+-3.0:gtk_binary_version}/immodules/im-quartz.so
</binary>
<!-- And the print backends -->
<binary>
- ${prefix}/lib/gtk-2.0/${pkg:gtk+-2.0:gtk_binary_version}/printbackends/*.so
- </binary>
-
- <!-- Seems to get missed by the dependency resolver -->
- <binary>
- ${prefix}/lib/libguile-srfi*
+ ${prefix}/lib/gtk-3.0/${pkg:gtk+-3.0:gtk_binary_version}/printbackends/*.so
</binary>
<binary loadable="True">
@@ -91,18 +83,10 @@
${prefix}/libexec
</binary>
- <binary>
- ${prefix}/bin/gnc-*
- </binary>
-
<binary dest="${bundle}/Contents/MacOS">
${prefix}/bin/aqbanking-cli
</binary>
- <binary>
- ${prefix}/lib/goffice
- </binary>
-
<binary loadable="True">
${prefix}/lib/dbd
</binary>
@@ -118,12 +102,8 @@
${prefix}/etc/gnucash
</data>
- <data dest="${bundle}/Contents/Resources/lib/">
- ${prefix}/lib/libgnc-qof.la
- </data>
-
- <data dest="${bundle}/Contents/Resources/lib/">
- ${prefix}/lib/libgnc-*.la
+ <data>
+ ${prefix}/bin/gnc-*
</data>
<data>
@@ -214,6 +194,14 @@
${prefix}/share/doc/gnucash-docs/ja/gnucash-guide/
</data>
+ <data dest="${bundle}/Contents/Resources/it.lproj/GnuCash Help/">
+ ${prefix}/share/doc/gnucash-docs/pt/gnucash-help/
+ </data>
+
+ <data dest="${bundle}/Contents/Resources/it.lproj/GnuCash Guide/">
+ ${prefix}/share/doc/gnucash-docs/pt/gnucash-guide/
+ </data>
+
<data>
${prefix}/share/doc/gnucash/
</data>
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 2a975e9..d30da3e 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -30,6 +30,8 @@
href="git://github.com/"/>
<repository type="tarball" name="openssl"
href="https://www.openssl.org/source/"/>
+ <repository type="tarball" name="postgres"
+ href="https://ftp.postgresql.org/pub/source/"/>
<include href="http://git.gnome.org/browse/gtk-osx/plain/modulesets-stable/gtk-osx.modules"/>
<!--include href="file:///Users/john/Development/GTK-OSX/gtk-osx-build/modulesets-stable/gtk-osx.modules"/-->
@@ -46,27 +48,34 @@
</autotools>
<autotools id="gwenhywfar" autogen-sh="configure"
- autogenargs="--with-guis=gtk2 --enable-local-install">
- <branch module="gnucash/Dependencies/gwenhywfar-4.17.0.tar.gz" version="4.17.0"
+ autogenargs="--with-guis='' --enable-local-install">
+ <branch module="gnucash/Dependencies/gwenhywfar-4.17.0.tar.gz"
+ version="4.17.0"
repo="sourceforge">
<patch file="https://raw.githubusercontent.com/gnucash/gnucash-on-osx/master/patches/gwen-include-file.patch" strip='1'/>
<patch file="https://raw.githubusercontent.com/gnucash/gnucash-on-osx/master/patches/gwen-macos-bundle-path.patch" strip='1'/>
</branch>
<dependencies>
- <dep package="meta-gtk-osx-core"/>
<dep package="libgcrypt"/>
<dep package="gnutls"/>
</dependencies>
+ <after>
+ <dep package="meta-gtk-osx-core"/>
+ <dep package="meta-gtk-osx-gtk3"/>
+ </after>
</autotools>
- <autotools id="gwenhywfar-svn" autogen-template="make -fMakefile.cvs && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
- autogenargs="--with-guis=gtk2 --enable-local-install">
+ <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">
<branch module="gwenhywfar" repo="aquamaniac"/>
<dependencies>
- <dep package="meta-gtk-osx-core"/>
<dep package="libgcrypt"/>
<dep package="gnutls"/>
</dependencies>
+ <after>
+ <dep package="meta-gtk-osx-core"/>
+ <dep package="meta-gtk-osx--gtk3"/>
+ </after>
</autotools>
<autotools id="ktoblzcheck" autogen-sh="configure">
@@ -160,31 +169,39 @@
</dependencies>
</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>
+ </autotools>
+
<cmake id="mysql">
- <branch repo="csclub" module="Connector-C/mysql-connector-c-6.0.2.tar.gz"
- version="6.0.2" >
- <patch file="https://raw.githubusercontent.com/gnucash/gnucash-on-osx/master/patches/libmysql.patch"/>
+ <branch repo="csclub" module="Connector-C/mysql-connector-c-6.1.10-src.tar.gz"
+ version="6.1.10" >
</branch>
<dependencies>
<dep package="cmake"/>
</dependencies>
</cmake>
- <autotools id="libdbi" autogen-sh="autoreconf" autogenargs="--disable-docs">
- <branch repo="sourceforge" module="libdbi/libdbi-0.8.4.tar.gz"
- version="0.8.4">
- <patch file="https://raw.githubusercontent.com/gnucash/gnucash-on-osx/master/patches/libdbi-fix-cflags.patch" strip="1"/>
+ <autotools id="libdbi" autogen-sh="configure" autogenargs="--disable-docs">
+ <branch repo="sourceforge" module="libdbi/libdbi-0.9.0.tar.gz"
+ version="0.9.0">
</branch>
</autotools>
- <autotools id="libdbi-drivers" autogen-sh='autoreconf'
- autogenargs='--with-sqlite3 --disable-docs --with-sqlite3-incdir="/usr/include" --with-sqlite3-libdir="/usr/lib" '>
- <branch repo="sourceforge" version="0.8.3-1"
- module="libdbi-drivers/libdbi-drivers-0.8.3-1.tar.gz">
- <patch file="https://raw.githubusercontent.com/gnucash/gnucash-on-osx/master/patches/dbi-drv.patch" strip="1"/>
+ <autotools id="libdbi-drivers" autogen-sh='configure'
+ autogenargs='--with-mysql --with-mysql-libdir=$PREFIX/lib --with-pgsql --with-sqlite3 --disable-docs --disable-dependency-tracking'>
+ <branch repo="sourceforge" version="0.9.0"
+ module="libdbi-drivers/libdbi-drivers-0.9.0.tar.gz">
</branch>
<dependencies>
<dep package="libdbi"/>
+ <dep package="mysql"/>
+ <dep package="pgsql"/>
+ <dep package="sqlite"/>
</dependencies>
</autotools>
@@ -221,12 +238,13 @@ 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">
+ <autotools id="boost" supports-non-srcdir-builds="no" skip-install="True">
<branch module="boost/boost_1_56_0.tar.bz2" repo="sourceforge"
version="1.56.0"/>
- <dependencies>
+ <after>
<dep package="icu"/>
- </dependencies>
+ <dep package="icu55"/>
+ </after>
</autotools>
<cmake id="googletest" cmakeargs="-DBUILD_GMOCK=OFF" skip-install="True">
@@ -257,13 +275,34 @@ for i in `ls $PREFIX/lib/libboost*.dylib`; do for j in `ls $PREFIX/lib/libboost*
</autotools>
- <cmake id="gnucash-git"
+
+<cmake id="gnucash-unstable"
cmakeargs="-DGTEST_ROOT=${SRCROOT}/googletest/googletest -DGMOCK_ROOT=${SRCROOT}/googletest/googlemock">
+ <branch repo="sourceforge" module="gnucash/unstable/gnucash-2.7.0.tar.bz2"
+ version="2.7.0" />
+ <dependencies>
+ <dep package="meta-gtk-osx-gtk3"/>
+ <dep package="libofx"/>
+ <dep package="aqbanking"/>
+ <dep package="libdbi-drivers"/>
+ <dep package="shared-mime-info"/>
+ <dep package="iso-codes"/>
+ <dep package="guile2"/>
+ <dep package="swig"/>
+ <dep package="boost"/>
+ <dep package="googletest"/>
+ <dep package="webkit1gtk3"/>
+ </dependencies>
+
+ </cmake>
+
+ <cmake id="gnucash-git"
+ cmakeargs="-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON -DGTEST_ROOT=${SRCROOT}/googletest/googletest -DGMOCK_ROOT=${SRCROOT}/googletest/googlemock">
<branch repo="github" module="Gnucash/gnucash.git" revision="master"
checkoutdir="gnucash-git"/>
<dependencies>
+ <dep package="meta-gtk-osx-gtk3"/>
<dep package="meta-gtk-osx-python-gtk3"/>
- <dep package="meta-gtk-osx-webkit-gtk3"/>
<dep package="libofx"/>
<dep package="aqbanking"/>
<dep package="libdbi-drivers"/>
Summary of changes:
gnucash-bundler/Info-unstable.plist | 12 ++--
gnucash-bundler/gnucash-unstable.bundle | 38 ++++------
modulesets/gnucash.modules | 119 ++++++++++++++++++--------------
3 files changed, 86 insertions(+), 83 deletions(-)
More information about the gnucash-changes
mailing list