From cd9a00b787d83da669620f3cd60859c86e3d34d6 Mon Sep 17 00:00:00 2001 From: John Ralls Date: Thu, 19 Jun 2014 10:36:26 -0700 Subject: [PATCH] Module fixups from gramps40 --- mac/gramps.bundle | 2 +- mac/gramps.launcher | 4 +++- mac/gramps.modules | 15 ++++++--------- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/mac/gramps.bundle b/mac/gramps.bundle index bd04e6fc0..9fe2a1e54 100644 --- a/mac/gramps.bundle +++ b/mac/gramps.bundle @@ -1,4 +1,4 @@ - + diff --git a/mac/gramps.launcher b/mac/gramps.launcher index 767d1405d..949730c94 100755 --- a/mac/gramps.launcher +++ b/mac/gramps.launcher @@ -24,7 +24,9 @@ export PANGO_RC_FILE="$bundle_etc/pango/pangorc" export PANGO_SYSCONFDIR="$bundle_etc" export PANGO_LIBDIR="$bundle_lib" export GDK_PIXBUF_MODULE_FILE="$bundle_etc/gtk-3.0/gdk-pixbuf.loaders" -export GTK_IM_MODULE_FILE="$bundle_etc/gtk-3.0/gtk.immodules" +if [ `uname -r | cut -d . -f 1` -ge 10 ]; then + export GTK_IM_MODULE_FILE="$bundle_etc/gtk-3.0/gtk.immodules" +fi export GI_TYPELIB_PATH="$bundle_lib/girepository-1.0" export GVBINDIR="$bundle_lib/graphviz" diff --git a/mac/gramps.modules b/mac/gramps.modules index 64d148f90..02bea5f88 100644 --- a/mac/gramps.modules +++ b/mac/gramps.modules @@ -27,8 +27,6 @@ href="git://github.com/"/> - - - - + + + @@ -135,11 +133,10 @@ gtk-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle - - +