gnucash-on-osx master: Multiple changes pushed
John Ralls
jralls at code.gnucash.org
Sat Mar 26 17:52:44 EDT 2016
Updated via https://github.com/Gnucash/gnucash-on-osx/commit/bf5f9b5e (commit)
via https://github.com/Gnucash/gnucash-on-osx/commit/9b1462c6 (commit)
via https://github.com/Gnucash/gnucash-on-osx/commit/6390f11b (commit)
from https://github.com/Gnucash/gnucash-on-osx/commit/6a508774 (commit)
commit bf5f9b5e1af33697d77f08631ed8a3e628d4ccf3
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Mar 26 14:52:07 2016 -0700
Missed updating the Info file for the release.
diff --git a/gnucash-bundler/Info.plist b/gnucash-bundler/Info.plist
index 60070b6..af3a1c0 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.11 © 2016 Gnucash Contributors</string>
+ <string>Gnucash version 2.6.12 © 2016 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.11 © 2016 Gnucash Contributors</string>
+ <string>2.6.12 © 2016 Gnucash Contributors</string>
<key>CFBundleName</key>
<string>Gnucash</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>2.6.11</string>
+ <string>2.6.12</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>2.6.11</string>
+ <string>2.6.12</string>
<key>CFBundleDocumentTypes</key>
<array>
<dict>
commit 9b1462c654fb87df58fd784beacab912d380a0a9
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Mar 26 14:51:17 2016 -0700
Set a tag for xmlsec, master is broken.
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 66ccd26..152f7f5 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -71,7 +71,7 @@
</autotools>
<autotools id="xmlsec">
- <branch module="lsh123/xmlsec" repo="github"/>
+ <branch module="lsh123/xmlsec" repo="github" tag="xmlsec-1_2_20"/>
<dependencies>
<dep package="openssl"/>
</dependencies>
commit 6390f11be52a4e7a45b94faf4603b17b09433e90
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Mar 26 14:50:24 2016 -0700
Remove pango modules reference from bundle files.
Pango no longer has modules, everything in linked at startup.
diff --git a/gnucash-bundler/gnucash-unstable.bundle b/gnucash-bundler/gnucash-unstable.bundle
index 826aa7f..3c6687e 100644
--- a/gnucash-bundler/gnucash-unstable.bundle
+++ b/gnucash-bundler/gnucash-unstable.bundle
@@ -47,7 +47,7 @@
<main-binary>${prefix}/bin/gnucash</main-binary>
- <!-- Copy in GTK+ and Pango modules. Note the use of the
+ <!-- Copy in GTK+ modules. Note the use of the
"${pkg:module:variable}" macro, which evaluates to a pkg-config
variable in the specified module. Note that any libraries that
binaries link to are also copied in automatically.
@@ -70,10 +70,6 @@
${prefix}/lib/gtk-2.0/${pkg:gtk+-2.0:gtk_binary_version}/printbackends/*.so
</binary>
- <binary>
- ${prefix}/lib/pango/${pkg:pango:pango_module_version}/modules/
- </binary>
-
<!-- Seems to get missed by the dependency resolver -->
<binary>
${prefix}/lib/libguile-srfi*
diff --git a/gnucash-bundler/gnucash.bundle b/gnucash-bundler/gnucash.bundle
index 8d1ed4f..9bdd421 100644
--- a/gnucash-bundler/gnucash.bundle
+++ b/gnucash-bundler/gnucash.bundle
@@ -47,7 +47,7 @@
<main-binary>${prefix}/bin/gnucash</main-binary>
- <!-- Copy in GTK+ and Pango modules. Note the use of the
+ <!-- Copy in GTK+ modules. Note the use of the
"${pkg:module:variable}" macro, which evaluates to a pkg-config
variable in the specified module. Note that any libraries that
binaries link to are also copied in automatically.
@@ -70,10 +70,6 @@
${prefix}/lib/gtk-2.0/${pkg:gtk+-2.0:gtk_binary_version}/printbackends/*.so
</binary>
- <binary>
- ${prefix}/lib/pango/${pkg:pango:pango_module_version}/modules/
- </binary>
-
<!-- Seems to get missed by the dependency resolver -->
<binary>
${prefix}/lib/libguile-srfi*
Summary of changes:
gnucash-bundler/Info.plist | 8 ++++----
gnucash-bundler/gnucash-unstable.bundle | 6 +-----
gnucash-bundler/gnucash.bundle | 6 +-----
modulesets/gnucash.modules | 2 +-
4 files changed, 7 insertions(+), 15 deletions(-)
More information about the gnucash-changes
mailing list