gnucash-on-osx master: Reinstate gwen-macos-bundle-path patch.

John Ralls jralls at code.gnucash.org
Sat Mar 14 20:03:24 EDT 2020


  discards  https://github.com/Gnucash/gnucash-on-osx/commit/f33cc2cc (commit)
Updated	 via  https://github.com/Gnucash/gnucash-on-osx/commit/fe704bf7 (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (https://github.com/Gnucash/gnucash-on-osx/commit/f33cc2cc)
            \
             N -- N -- N (https://github.com/Gnucash/gnucash-on-osx/commit/fe704bf7)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.



commit fe704bf79d679e6d655f7b6e92451473502df9b5
Author: John Ralls <jralls at ceridwen.us>
Date:   Sat Mar 14 17:01:57 2020 -0700

    Reinstate gwen-macos-bundle-path patch.
    
    Gwenhywfar regression.

diff --git a/gnucash-bundler/Info.plist b/gnucash-bundler/Info.plist
index c78772e..a8d0e37 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 3.8-1 © 2019 Gnucash Contributors</string>
+	<string>Gnucash version 3.9-test © 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>3.8-1 © 2019 Gnucash Contributors</string>
+	<string>3.9-test © 2020 Gnucash Contributors</string>
 	<key>CFBundleName</key>
 	<string>Gnucash</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.8-1</string>
+	<string>3.9-test</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>3.8-1</string>
+	<string>3.9-test</string>
 	<key>CFBundleDocumentTypes</key>
 	<array>
 	  <dict>
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index ac74083..1ccfe16 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -52,6 +52,7 @@
     <branch module="256/gwenhywfar-5.2.0.tar.gz" version="5.2.0"
             repo="aqbanking" >
       <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="libgcrypt"/>



Summary of changes:
 gnucash-bundler/Info.plist | 8 ++++----
 modulesets/gnucash.modules | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)



More information about the gnucash-changes mailing list