gnucash-on-osx master: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash-on-osx/commit/2b9be49f (commit)
	 via  https://github.com/Gnucash/gnucash-on-osx/commit/1b047bc4 (commit)
	from  https://github.com/Gnucash/gnucash-on-osx/commit/bfce49f3 (commit)



commit 2b9be49fe43ee90f7facebcca03efb71135278fb
Author: John Ralls <jralls at ceridwen.us>
Date:   Sun Jun 28 09:33:06 2020 -0700

    Remove Russian Guide translation, following GnuCash 4.0.

diff --git a/gnucash-bundler/gnucash.bundle b/gnucash-bundler/gnucash.bundle
index 016d116..a5039d9 100644
--- a/gnucash-bundler/gnucash.bundle
+++ b/gnucash-bundler/gnucash.bundle
@@ -223,10 +223,6 @@
     ${prefix}/share/doc/gnucash-docs/pt/gnucash-guide/
   </data>
   
-  <data dest="${bundle}/Contents/Resources/ru.lproj/GnuCash Guide/">
-    ${prefix}/share/doc/gnucash-docs/ru/gnucash-guide/
-  </data>
-
   <data>
     ${prefix}/share/doc/gnucash/
   </data>
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 14e483c..90c984e 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -273,7 +273,7 @@
 
 
 <cmake id="gnucash"
-        cmakeargs="-DGTEST_ROOT=${JHBUILD_SOURCE}/googletest/googletest -DGMOCK_ROOT=${JHBUILD_SOURCE}/googletest/googlemock">
+        cmakeargs="-DGTEST_ROOT=${JHBUILD_SOURCE}/googletest/">
    <branch module="gnucash/gnucash%20%28stable%29/4.0/gnucash-4.0.tar.bz2"
            checkoutdir="gnucash-4.0" repo="sourceforge" version="4.0" />
     <dependencies>

commit 1b047bc4e64be43ca82d090be961230392043d31
Author: John Ralls <jralls at ceridwen.us>
Date:   Sat Jun 27 15:55:57 2020 -0700

    Make 3.11 OldStable.

diff --git a/gnucash-bundler/Info-oldstable.plist b/gnucash-bundler/Info-oldstable.plist
index f86757b..8a6c603 100644
--- a/gnucash-bundler/Info-oldstable.plist
+++ b/gnucash-bundler/Info-oldstable.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>Gnucash</string>
 	<key>CFBundleGetInfoString</key>
-	<string>Gnucash version 2.6.21 © 2018 Gnucash Contributors</string>
+	<string>Gnucash version 3.11 © 2020 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.21 © 2018 Gnucash Contributors</string>
+	<string>3.11 © 2020 Gnucash Contributors</string>
 	<key>CFBundleName</key>
 	<string>Gnucash</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.6.21</string>
+	<string>3.11</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.6.21</string>
+	<string>3.11</string>
 	<key>CFBundleDocumentTypes</key>
 	<array>
 	  <dict>
@@ -60,11 +60,11 @@
 	<key>LSRequiresCarbon</key>
         <true/>
         <key>LSMinimumSystemVersion</key>
-        <string>10.5.0</string>
+        <string>10.9.0</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.finance</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright 2018 Gnucash Contributors</string>
+	<string>Copyright 2020 Gnucash Contributors</string>
 	<key>NSHighResolutionCapable</key>
 	<true/>
 </dict>
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 1a8e157..14e483c 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -250,7 +250,7 @@
   <autotools id="gnucash-oldstable"
 	     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="project/gnucash/gnucash%20%28stable%29/2.6.21/gnucash-2.6.21.tar.bz2" version="2.6.21"
+    <branch module="project/gnucash/gnucash%20%28stable%29/3.11/gnucash-3.11.tar.bz2" version="3.11"
 	    repo="sourceforge">
     </branch>
     <dependencies>
@@ -351,8 +351,8 @@
   <autotools id="gnucash-olddocs" 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/2.6.20/gnucash-docs-2.6.20.tar.gz"
-	     version="2.6.20" repo="sourceforge"/>
+    <branch  module="gnucash/gnucash%20%28stable%29/gnucash-docs-3.11.tar.gz"
+	     version="3.11" repo="sourceforge"/>
   </autotools>
 
   <autotools id="gnucash-docs" autogenargs="--disable-scrollkeeper"



Summary of changes:
 gnucash-bundler/Info-oldstable.plist | 12 ++++++------
 gnucash-bundler/gnucash.bundle       |  4 ----
 modulesets/gnucash.modules           |  8 ++++----
 3 files changed, 10 insertions(+), 14 deletions(-)