From ab5ce43be7f9ca4fbc7fcacb81b56629156254d4 Mon Sep 17 00:00:00 2001
From: John Ralls <jralls@ceridwen.us>
Date: Tue, 3 May 2011 20:59:12 +0000
Subject: [PATCH] Apply revisions from 3.2.6 fixes with Richard Taylor

svn: r17394
---
 mac/gramps.bundle | 42 ++++++++++++++++++++++++++++++++----------
 mac/rungramps.py  |  5 +++--
 2 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/mac/gramps.bundle b/mac/gramps.bundle
index 9842d6db0..628b5812c 100644
--- a/mac/gramps.bundle
+++ b/mac/gramps.bundle
@@ -28,8 +28,22 @@
        binaries link to are also copied in automatically.
   -->
   <binary>
-    ${prefix}/lib/gtk-2.0/${pkg:gtk+-2.0:gtk_binary_version}/loaders/*.so
+    ${prefix}/lib/gdk-pixbuf-2.0/${pkg:gdk-pixbuf-2.0:gdk_pixbuf_binary_version}/loaders/*.so
   </binary>
+<!-- Copy in the theme engines. -->
+  <binary>
+    ${prefix}/lib/gtk-2.0/${pkg:gtk+-2.0:gtk_binary_version}/engines/*.so
+  </binary>
+
+<!-- And the print backends -->
+  <binary>
+    ${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/pango-basic-fc.so
+  </binary>
+
   <!-- Copy in libpyglib, which will pull in other dependencies we need -->
   <binary>
     ${prefix}/lib/libpyglib-2.0-python.0.dylib
@@ -63,22 +77,30 @@
     ${prefix}/lib/libdb-4.dylib
   </binary>
 
-   <binary>
+  <binary>
     ${prefix}/lib/libenchant.dylib
   </binary>
 
-   <binary>
-    ${prefix}/lib/libgettextpo.0.dylib
-  </binary>
-
-   <binary>
-    ${prefix}/lib/libproxy.0.dylib
-  </binary>
-
   <binary>
     ${prefix}/lib/enchant
   </binary>
 
+  <binary>
+     ${prefix}/lib/libgettextpo.0.dylib
+  </binary>
+
+  <binary>
+    ${prefix}/lib/libproxy.0.dylib
+  </binary>
+
+  <binary>
+    ${prefix}/lib/libhunspell-1.2.0.dylib
+  </binary>
+
+  <binary>
+    ${prefix}/lib/libtiff.3.dylib
+  </binary>
+
 <!-- Translation filenames, one for each program or library that you
        want to copy in to the bundle. The "dest" attribute is
        optional, as usual. Bundler will find all translations of that
diff --git a/mac/rungramps.py b/mac/rungramps.py
index 062d29a77..34ab2057d 100755
--- a/mac/rungramps.py
+++ b/mac/rungramps.py
@@ -25,7 +25,7 @@ os.environ["LD_LIBRARY_PATH"]=_lib_path
 os.environ["GTK_PATH"] = _res_path
 os.environ["GTK2_RC_FILES"] = os.path.join(_gtk2_conf, "gtkrc")
 os.environ["GTK_IM_MODULE_FILE"]= os.path.join(_gtk2_conf, "immodules")
-os.environ["GDK_PIXBUF_LOADERS"] = os.path.join(_gtk2_conf, "gdk-pixbuf.loaders")
+os.environ["GDK_PIXBUF_MODULE_FILE"] = os.path.join(_gtk2_conf, "gdk-pixbuf.loaders")
 os.environ["PANGO_RC_FILES"] = os.path.join(_conf_path, "pango", "pangorc")
 
 os.environ["GRAMPSDIR"] = _gramps_path
@@ -129,7 +129,8 @@ elif len(_language) == 2:
 else:
     LC_ALL = _language
 
-os.environ["LC_ALL"] = LC_ALL #Spell-checker dictionary support
+os.environ["LANGUAGE"] = LC_ALL
+os.environ["LC_ALL"] = LC_ALL + ".UTF-8" #Spell-checker dictionary support
 
 #LaunchServices sticks this argument on the front of argument
 #lists. It must make sense to somebody, but Gramps isn't that