gnucash-on-osx master: Multiple changes pushed
John Ralls
jralls at code.gnucash.org
Thu Feb 1 18:28:30 EST 2018
Updated via https://github.com/Gnucash/gnucash-on-osx/commit/efcfc698 (commit)
via https://github.com/Gnucash/gnucash-on-osx/commit/ed3df744 (commit)
via https://github.com/Gnucash/gnucash-on-osx/commit/48c769ea (commit)
via https://github.com/Gnucash/gnucash-on-osx/commit/63cd3ee7 (commit)
via https://github.com/Gnucash/gnucash-on-osx/commit/8f94ca43 (commit)
from https://github.com/Gnucash/gnucash-on-osx/commit/7feda421 (commit)
commit efcfc698c13e683c59f9753c082619416c8cbabd
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Feb 1 15:27:49 2018 -0800
Add Portuguese and Russian documentation translations.
diff --git a/gnucash-bundler/gnucash-unstable.bundle b/gnucash-bundler/gnucash-unstable.bundle
index 35a8f64..9b879be 100644
--- a/gnucash-bundler/gnucash-unstable.bundle
+++ b/gnucash-bundler/gnucash-unstable.bundle
@@ -193,14 +193,18 @@
${prefix}/share/doc/gnucash-docs/ja/gnucash-guide/
</data>
- <data dest="${bundle}/Contents/Resources/it.lproj/GnuCash Help/">
+ <data dest="${bundle}/Contents/Resources/pt.lproj/GnuCash Help/">
${prefix}/share/doc/gnucash-docs/pt/gnucash-help/
</data>
- <data dest="${bundle}/Contents/Resources/it.lproj/GnuCash Guide/">
+ <data dest="${bundle}/Contents/Resources/pt.lproj/GnuCash Guide/">
${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>
commit ed3df7441d62a7940107eb42846a1b9228cd01b4
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Feb 1 15:27:29 2018 -0800
Bug 792128 - Buttons not showing in Taskbar on MacOSX
Theming updates for Gtk3.
diff --git a/gnucash-bundler/gnucash-unstable.bundle b/gnucash-bundler/gnucash-unstable.bundle
index 9e58290..35a8f64 100644
--- a/gnucash-bundler/gnucash-unstable.bundle
+++ b/gnucash-bundler/gnucash-unstable.bundle
@@ -149,6 +149,10 @@
${prefix}/share/themes
</data>
+ <data>
+ ${prefix}/share/icons
+ </data>
+
<data dest="${bundle}/Contents/Resources">
${project}/gnucash.icns
</data>
@@ -205,7 +209,7 @@
${prefix}/share/locale
</translations>
- <translations name="gtk20">
+ <translations name="gtk30">
${prefix}/share/locale
</translations>
@@ -217,24 +221,12 @@
${prefix}/share/locale
</translations>
-<!-- This takes the Quartz theme instructions from the package and puts them in the bundle gtkrc file. You may want to cusomize the source path if you want a different theme, or if you want other stuff in your gtkrc.
-
- <data dest='${bundle}/Contents/Resources/etc/gtk-2.0/gtkrc'>
- ${prefix}/share/themes/Quartz/gtk-2.0/gtkrc
+ <icon-theme icons="auto">
+ Adwaita
+ </icon-theme>
+ <!-- Default settings file to set the theme. -->
+ <data dest="${bundle}/Contents/Resources/etc/gtk-3.0/settings.ini">
+ ${project}/settings.ini
</data>
--->
-
- <!-- Icon themes to copy. The "icons" property can be either of
- "auto", "all", or "none". All or none should be
- self-explanatory, while auto means that the script will try to
- figure out which icons are needed. This is done by getting all
- the strings from all copied binaries, and matching them against
- icon names. To be safe, you should use "all". "none" is useful
- if you want just the index.theme file but no icons, mostly
- needed for the "hicolor" base theme.
- -->
- <!-- icon-theme icons="auto"/>
- Tango
- </icon-theme -->
</app-bundle>
diff --git a/gnucash-bundler/settings.ini b/gnucash-bundler/settings.ini
new file mode 100644
index 0000000..8113c1a
--- /dev/null
+++ b/gnucash-bundler/settings.ini
@@ -0,0 +1,4 @@
+[Settings]
+gtk-key-theme-name = Emacs
+gtk-theme-name = Adwaita
+
commit 48c769ea4bd05f7c685eb1bb3addf6f7b50d6b9f
Author: John Ralls <jralls at ceridwen.us>
Date: Thu Feb 1 15:09:45 2018 -0800
Add fontconfig autogen args for default fonts and cache directory.
The first helps fontconfig find the MacOS system fonts and the
second prevents hard-coding $PREFIX into fonts.conf, which can
cause trouble in bundled apps.
diff --git a/.jhbuildrc-custom b/.jhbuildrc-custom
index e3202dc..b1c4e74 100644
--- a/.jhbuildrc-custom
+++ b/.jhbuildrc-custom
@@ -56,4 +56,6 @@ append_autogenargs("gnucash", "--with-dbi-dbd-dir=" + prefix +"/lib/dbd")
append_autogenargs("libiconv", "--with-libintl-prefix=" + prefix)
+#Tell fontconfig where to find fonts and to not set a cache directory in prefix:
+append_autogenargs("fontconfig", "--with-default-fonts=/Library/Fonts --with-cache-dir=home")
module_makecheck["gmp"] = True
commit 63cd3ee74852aef9c3bce11f1c2592c75d2b2d91
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Jan 22 15:48:36 2018 -0800
Make libdbi-driver dependency on the DB backends conditional so that they're not required for maint builds.
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index 50ec3db..5cfde1d 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -181,11 +181,13 @@
</branch>
<dependencies>
<dep package="libdbi"/>
+ </dependencies>
+ <after>
<dep package="mysql"/>
<dep package="pgsql"/>
<dep package="sqlite"/>
- </dependencies>
- </autotools>
+ </after>
+ </autotools>
<autotools id="libgnomecanvas" autogen-sh="configure">
<branch module="libgnomecanvas/2.26/libgnomecanvas-2.26.0.tar.bz2"
@@ -249,6 +251,7 @@ for i in `ls $PREFIX/lib/libboost*.dylib`; do for j in `ls $PREFIX/lib/libboost*
<dep package="shared-mime-info"/>
<dep package="iso-codes"/>
<dep package="guile2"/>
+ <dep package="sqlite"/>
</dependencies>
<after>
<dep package="meta-gtk-osx-webkit"/>
@@ -265,6 +268,9 @@ for i in `ls $PREFIX/lib/libboost*.dylib`; do for j in `ls $PREFIX/lib/libboost*
<dep package="meta-gtk-osx-gtk3"/>
<dep package="libofx"/>
<dep package="aqbanking"/>
+ <dep package="mysql"/>
+ <dep package="pgsql"/>
+ <dep package="sqlite"/>
<dep package="libdbi-drivers"/>
<dep package="shared-mime-info"/>
<dep package="iso-codes"/>
commit 8f94ca4341295d2280541dd16f0c36a9479341dd
Author: John Ralls <jralls at ceridwen.us>
Date: Mon Jan 22 15:45:45 2018 -0800
Remove Launcher script from unstable.
diff --git a/gnucash-bundler/gnucash-unstable.bundle b/gnucash-bundler/gnucash-unstable.bundle
index 434467e..9e58290 100644
--- a/gnucash-bundler/gnucash-unstable.bundle
+++ b/gnucash-bundler/gnucash-unstable.bundle
@@ -32,7 +32,7 @@
not needed. If the source path is left out, the default
script will be used.
-->
- <launcher-script>${project}/gnucash-unstable.launcher</launcher-script>
+ <!--launcher-script>${project}/gnucash-unstable.launcher</launcher-script-->
<!-- Not implemented: Optional runtime, could be python or mono
for example.
diff --git a/gnucash-bundler/gnucash-unstable.launcher b/gnucash-bundler/gnucash-unstable.launcher
deleted file mode 100755
index a4c259f..0000000
--- a/gnucash-bundler/gnucash-unstable.launcher
+++ /dev/null
@@ -1,95 +0,0 @@
-#!/bin/sh
-
-if test "x$GTK_DEBUG_LAUNCHER" != x; then
- set -x
-fi
-
-if test "x$GTK_DEBUG_GDB" != x; then
- EXEC="gdb --args"
-else
- EXEC=exec
-fi
-
-name=`basename "$0"`
-tmp="$0"
-tmp=`dirname "$tmp"`
-tmp=`dirname "$tmp"`
-bundle=`dirname "$tmp"`
-bundle_contents="$bundle"/Contents
-bundle_res="$bundle_contents"/Resources
-bundle_fw="$bundle_contents"/Frameworks
-bundle_lib="$bundle_res"/lib
-bundle_bin="$bundle_res"/bin
-bundle_data="$bundle_res"/share
-bundle_etc="$bundle_res"/etc
-
-export DYLD_LIBRARY_PATH="$bundle_lib"
-export XDG_CONFIG_DIRS="$bundle_etc"/xdg
-export XDG_DATA_DIRS="$bundle_data"
-export GTK_DATA_PREFIX="$bundle_res"
-export GTK_EXE_PREFIX="$bundle_res"
-export GTK_PATH="$bundle_res"
-
-export GTK2_RC_FILES="$bundle_etc/gtk-2.0/gtkrc"
-if [ `uname -r | cut -d . -f 1` -ge 10 ]; then
- export GTK_IM_MODULE_FILE="$bundle_etc/gtk-2.0/gtk.immodules"
-fi
-export GDK_PIXBUF_MODULE_FILE="$bundle_lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"
-export PANGO_RC_FILE="$bundle_etc/pango/pangorc"
-export PANGO_SYSCONFDIR="$bundle_etc"
-export PANGO_LIBDIR="$bundle_lib"
-
-if test -f "$bundle_lib/charset.alias"; then
- export CHARSETALIASDIR="$bundle_lib"
-fi
-
-# Extra arguments can be added in environment.sh.
-EXTRA_ARGS=" --debug"
-
-if test -f "$bundle_res/environment.sh"; then
- source "$bundle_res/environment.sh"
-fi
-
-# Strip out the argument added by the OS.
-if /bin/expr "x$1" : "x-psn_.*" > /dev/null; then
- shift 1
-fi
-
-export RESPFX="${bundle_res}"
-PATH="${RESPFX}"/bin:/bin:/usr/bin
-export PATH
-
-GUILE_WARN_DEPRECATED="no"
-export GUILE_WARN_DEPRECATED
-
-
-GNC_MODULE_PATH="${RESPFX}/lib/gnucash:${GNC_MODULE_PATH}"
-
-GUILE_LIBS="${bundle_data}/guile/2.0/"
-GUILE_COMPILED_LIBS="${bundle_lib}/guile/2.0/ccache"
-
-EXTRA_LIBS="${GNC_MODULE_PATH}"
-EXTRA_LIBS="${EXTRA_LIBS}:/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ImageIO.framework/Versions/A/Resources/"
-EXTRA_LIBS="${EXTRA_LIBS}:${RESPFX}/lib"
-EXTRA_LIBS="${EXTRA_LIBS}:${RESPFX}/lib/gnucash"
-
-LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${EXTRA_LIBS}:"
-DYLD_LIBRARY_PATH="${DYLD_LIBRARY_PATH}:${EXTRA_LIBS}"
-export DYLD_FRAMEWORK_PATH="${bundle_fw}"
-export GNC_STANDARD_REPORTS_DIR="${bundle_data}/gnucash/scm/gnucash/report/standard-reports"
-export GSETTINGS_SCHEMA_DIR="${bundle_data}"
-
-export GNC_MODULE_PATH
-export GUILE_LIBS
-export GUILE_COMPILED_LIBS
-export LD_LIBRARY_PATH
-export DYLD_LIBRARY_PATH
-export GNC_DOT_DIR="$HOME/Library/Application Support/Gnucash"
-export OFX_DTD_PATH="${bundle_data}/libofx/dtd"
-
-if test -f "$GNC_DOT_DIR/gnucashrc"; then
- source "$GNC_DOT_DIR/gnucashrc"
-fi
-
-#Don't quote $EXTRA_ARGS or it will turn into a single arg and fail.
-$EXEC "$bundle_contents/MacOS/$name-bin" $EXTRA_ARGS "$@"
Summary of changes:
.jhbuildrc-custom | 2 +
gnucash-bundler/gnucash-unstable.bundle | 40 ++++++-------
gnucash-bundler/gnucash-unstable.launcher | 95 -------------------------------
gnucash-bundler/settings.ini | 4 ++
modulesets/gnucash.modules | 10 +++-
5 files changed, 32 insertions(+), 119 deletions(-)
delete mode 100755 gnucash-bundler/gnucash-unstable.launcher
create mode 100644 gnucash-bundler/settings.ini
More information about the gnucash-changes
mailing list