gnucash-on-osx master: Multiple changes pushed

John Ralls jralls at code.gnucash.org
Fri Sep 22 19:13:02 EDT 2017


Updated	 via  https://github.com/Gnucash/gnucash-on-osx/commit/2537a1d0 (commit)
	 via  https://github.com/Gnucash/gnucash-on-osx/commit/83ddc99d (commit)
	from  https://github.com/Gnucash/gnucash-on-osx/commit/7e9b2d74 (commit)



commit 2537a1d0470754adf7f11be7ecfc9bc0a6919ac9
Author: John Ralls <jralls at ceridwen.us>
Date:   Fri Sep 22 16:10:04 2017 -0700

    Release GnuCash 2.6.18.

diff --git a/gnucash-bundler/Info.plist b/gnucash-bundler/Info.plist
index a2947d6..f3ec0c5 100644
--- a/gnucash-bundler/Info.plist
+++ b/gnucash-bundler/Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>Gnucash</string>
 	<key>CFBundleGetInfoString</key>
-	<string>Gnucash version 2.6.17 © 2017 Gnucash Contributors</string>
+	<string>Gnucash version 2.6.18 © 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.6.17 © 2017 Gnucash Contributors</string>
+	<string>2.6.18 © 2017 Gnucash Contributors</string>
 	<key>CFBundleName</key>
 	<string>Gnucash</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.6.17</string>
+	<string>2.6.18</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.6.17</string>
+	<string>2.6.18</string>
 	<key>CFBundleDocumentTypes</key>
 	<array>
 	  <dict>
@@ -58,7 +58,9 @@
 	<key>CSResourcesFileMapped</key>
 	<true/>
 	<key>LSRequiresCarbon</key>
-	<true/>
+        <true/>
+        <key>LSMinimumSystemVersion</key>
+        <string>10.5.0</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.finance</string>
 	<key>NSHumanReadableCopyright</key>
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 535b3e9..2a975e9 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -229,14 +229,14 @@ for i in `ls $PREFIX/lib/libboost*.dylib`; do for j in `ls $PREFIX/lib/libboost*
     </dependencies>
   </autotools>
 
-  <cmake id="googletest" cmakeargs="-DBUILD_GMOCK=OFF">
+  <cmake id="googletest" cmakeargs="-DBUILD_GMOCK=OFF" skip-install="True">
     <branch module="google/googletest" repo="github" tag="release-1.8.0"/>
   </cmake>
 
   <autotools id="gnucash"
 	     autogen-sh="configure"
 	     autogenargs="--enable-ofx --enable-aqbanking --enable-binreloc --enable-dbi --with-dbi-dbd-dir=$PREFIX/lib/dbd --with-html-engine='webkit'">
-    <branch module="gnucash/stable/gnucash-2.6.17.tar.bz2" version="2.6.17"
+    <branch module="gnucash/stable/gnucash-2.6.18.tar.bz2" version="2.6.18"
 	    repo="sourceforge">
     </branch>
     <dependencies>
@@ -289,8 +289,8 @@ for i in `ls $PREFIX/lib/libboost*.dylib`; do for j in `ls $PREFIX/lib/libboost*
   <autotools id="gnucash-docs" autogenargs="--disable-scrollkeeper"
 	    autogen-template="%(srcdir)s/%(autogen-sh)s && %(srcdir)s/configure --prefix %(prefix)s %(autogenargs)s"
 	    makeargs=" html" makeinstallargs="install-html" >
-    <branch  module="gnucash/gnucash-docs/gnucash-docs-2.6.17.tar.gz"
-	     version="2.6.17" repo="sourceforge"/>
+    <branch  module="gnucash/gnucash-docs/gnucash-docs-2.6.18.tar.gz"
+	     version="2.6.18" repo="sourceforge"/>
   </autotools>
 
   <autotools id="scrollkeeper" autogen-sh="configure">

commit 83ddc99d0b44e55d14a316a761e06ddf08442524
Author: John Ralls <jralls at ceridwen.us>
Date:   Sat Aug 19 09:13:31 2017 +0200

    Update .jhbuildrc.

diff --git a/.jhbuildrc-custom b/.jhbuildrc-custom
index 1ab37b3..1ea4225 100644
--- a/.jhbuildrc-custom
+++ b/.jhbuildrc-custom
@@ -19,19 +19,24 @@ modules = ["meta-gtk-osx-bootstrap", "meta-gtk-osx-core", "meta-gnucash-stable"]
 #modules = ["meta-gtk-osx-bootstrap", "meta-gtk-osx-core", "meta-gnucash-unstable"]
 #modules = ["meta-gtk-osx-bootstrap", "meta-gtk-osx-core", "meta-gnucash-git"]
 
-#Setup the build. PPC users will need to replace "i386" with
-#"ppc". Don't try to do a universal build, it doesn't work. x86_64 is
-#untested. Users on systems later than 10.6 will need to replace both
-#instances of "10.5" below with their OS version:
-setup_sdk("10.5", "10.5",["i386"])
+# This will set up the build for your system. The result will run on
+# the same or newer versionss of MacOS for the same archechture.
+setup_sdk()
+
+# To build a GnuCash able to run on older systems you can specify
+# minimum version, SDK, and architecture. Note that only
+# MacOSX10.9.sdk and later can build for earlier MacOS versions, and
+# that all Macs running 10.7 and later are 64-bit. Finally note that
+# GnuCash 2.6.99 and later requuire MacOS X 10.9 or later. If you need
+# 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"])
 
 moduleset = "http://github.com/gnucash/gnucash-on-osx/raw/master/modulesets/gnucash.modules"
 
 #If you wish to enable the mysql backend, uncomment the lines below.
-#MySQL requires CMake 2.6.0 or later to build, so the libmysql module
-#has a dependency on cmake which will be built by default. If you
-#already have CMake installed on the path, add "skip.append("cmake")
-#somewhere in this file.
 
 #_gc_module=modules[-1]
 #modules[-1]="mysql"



Summary of changes:
 .jhbuildrc-custom          | 23 ++++++++++++++---------
 gnucash-bundler/Info.plist | 12 +++++++-----
 modulesets/gnucash.modules |  8 ++++----
 3 files changed, 25 insertions(+), 18 deletions(-)



More information about the gnucash-changes mailing list