gnucash-on-osx master: Multiple changes pushed
John Ralls
jralls at code.gnucash.org
Sat Jan 27 15:56:33 EST 2018
Updated via https://github.com/Gnucash/gnucash-on-osx/commit/6237c8fd (commit)
via https://github.com/Gnucash/gnucash-on-osx/commit/d5533f72 (commit)
via https://github.com/Gnucash/gnucash-on-osx/commit/28f7c3a7 (commit)
via https://github.com/Gnucash/gnucash-on-osx/commit/12d4b9a1 (commit)
from https://github.com/Gnucash/gnucash-on-osx/commit/6bb5cdbd (commit)
commit 6237c8fdcc08642d078e9090a616da45a2d0c3df
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Jan 27 12:56:05 2018 -0800
Bring .jhbuildrc-custom up-to-date.
diff --git a/.jhbuildrc-custom b/.jhbuildrc-custom
index 7c7463e..ab404b9 100644
--- a/.jhbuildrc-custom
+++ b/.jhbuildrc-custom
@@ -8,15 +8,13 @@
#Select one of these, or use a different one: Do keep the directories
#separate for stable and unstable as they have different
#dependencies. You can use 2.3.x for svn builds.
-prefix = os.path.join(os.environ["HOME"], "gnucash-stable")
-#prefix = os.path.join(os.environ["HOME"], "gnucash-unstable")
+#prefix = os.path.join(os.environ["HOME"], "gnucash-stable")
+prefix = os.path.join(os.environ["HOME"], "gnucash-unstable")
#Select which modules to build. The only difference is which gnucash
-#module (and all of the dependencies, see above) get built. N.B.: If
-#you are building with/for OS X 10.5, append "Leopard" to the
-#meta-gnucash module name, e.g. meta-gnucash-stable-Leopard."
-modules = ["meta-gtk-osx-bootstrap", "meta-gtk-osx-core", "meta-gnucash-stable"]
-#modules = ["python", "meta-gtk-osx-bootstrap", "meta-gtk-osx-core", "meta-gnucash-unstable"]
+#module (and all of the dependencies, see above) get built. "
+#modules = ["meta-gtk-osx-bootstrap", "meta-gtk-osx-core", "meta-gnucash-stable"]
+modules = ["python", "meta-gtk-osx-bootstrap", "meta-gtk-osx-core", "gnucash-unstable"]
#modules = ["python", "meta-gtk-osx-bootstrap", "meta-gtk-osx-core", "gnucash-git"]
# This will set up the build for your system. The result will run on
@@ -31,10 +29,10 @@ setup_sdk()
# to build with an older SDK see
# https://wiki.gnome.org/Projects/GTK+/OSX/Building#Building_for_Older_Versions_of_Mac_OS_X
-#This will build a 32-bit version for 10.5 and later:
-#setup_sdk("10.5", "10.5", ["i386"])
+#This will build a 32-bit version for 10.9 and later:
+#setup_sdk("10.9", ["i386"])
-moduleset = "http://github.com/gnucash/gnucash-on-osx/raw/master/modulesets/gnucash.modules"
+moduleset = "https://github.com/gnucash/gnucash-on-osx/raw/master/modulesets/gnucash.modules"
#If you wish to enable the mysql backend on gnucash-stable (it and
#pgsql are already included in gnucash-git), uncomment the lines
commit d5533f72662b711cea538220b3fb84dcc7032aa7
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Jan 27 12:53:06 2018 -0800
Remove references to deleted meta-gtk-osx-webkit1.6.
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 2cd25a9..50ec3db 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -251,7 +251,6 @@ for i in `ls $PREFIX/lib/libboost*.dylib`; do for j in `ls $PREFIX/lib/libboost*
<dep package="guile2"/>
</dependencies>
<after>
- <dep package="meta-gtk-osx-webkit1.6"/>
<dep package="meta-gtk-osx-webkit"/>
</after>
@@ -330,11 +329,4 @@ for i in `ls $PREFIX/lib/libboost*.dylib`; do for j in `ls $PREFIX/lib/libboost*
</dependencies>
</metamodule>
- <metamodule id="meta-gnucash-stable-Leopard">
- <dependencies>
- <dep package="gnucash"/>
- <dep package="meta-gtk-osx-webkit1.6"/>
- </dependencies>
- </metamodule>
-
</moduleset>
commit 28f7c3a72e1097a047feff0362dca712e19c5f4b
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Jan 27 12:48:15 2018 -0800
Remove data libexec element. No longer used.
diff --git a/gnucash-bundler/gnucash-unstable.bundle b/gnucash-bundler/gnucash-unstable.bundle
index 35c269f..434467e 100644
--- a/gnucash-bundler/gnucash-unstable.bundle
+++ b/gnucash-bundler/gnucash-unstable.bundle
@@ -79,10 +79,6 @@
${prefix}/lib/gwenhywfar
</binary>
- <binary>
- ${prefix}/libexec
- </binary>
-
<binary dest="${bundle}/Contents/MacOS">
${prefix}/bin/aqbanking-cli
</binary>
@@ -91,7 +87,6 @@
${prefix}/lib/dbd
</binary>
-
<!-- Data to copy in, usually Glade/UI files, images, sounds files
etc. The destination inside the bundle can be specified if the
files should end up at a different location, by using the
commit 12d4b9a1b741ac9f2bee181dfeb8aefe5ffb2ad5
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Jan 27 12:41:51 2018 -0800
gnucash.modules cleanup.
* Change git.gnome.org uri to https
* Update xmlsec to
* Change $SRCROOT, defined only in my personal jhbuildrc-custom, to $JHBUILD_SOURCE,
defined in jhbuildrc-gtk-osx.
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index ecbf72e..2cd25a9 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -30,7 +30,7 @@
<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="https://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"/-->
<autotools id="libchipcard" autogen-sh="configure" autogenargs="--enable-local-install">
@@ -80,7 +80,7 @@
</autotools>
<autotools id="xmlsec">
- <branch module="lsh123/xmlsec" repo="github" tag="xmlsec-1_2_20"/>
+ <branch module="lsh123/xmlsec" repo="github" tag="xmlsec-1_2_25"/>
<dependencies>
<dep package="openssl"/>
</dependencies>
@@ -259,7 +259,7 @@ for i in `ls $PREFIX/lib/libboost*.dylib`; do for j in `ls $PREFIX/lib/libboost*
<cmake id="gnucash-unstable"
- cmakeargs="-DGTEST_ROOT=${SRCROOT}/googletest/googletest -DGMOCK_ROOT=${SRCROOT}/googletest/googlemock">
+ cmakeargs="-DGTEST_ROOT=${JHBUILD_SOURCE}/googletest/googletest -DGMOCK_ROOT=${JHBUILD_SOURCE}/googletest/googlemock">
<branch repo="sourceforge" module="gnucash/unstable/gnucash-2.7.3.tar.bz2"
version="2.7.3" />
<dependencies>
Summary of changes:
.jhbuildrc-custom | 18 ++++++++----------
gnucash-bundler/gnucash-unstable.bundle | 5 -----
modulesets/gnucash.modules | 14 +++-----------
3 files changed, 11 insertions(+), 26 deletions(-)
More information about the gnucash-changes
mailing list