Apply revisions from 3.2.6 fixes with Richard Taylor

svn: r17394

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
@@ -67,6 +81,10 @@
     ${prefix}/lib/libenchant.dylib
   </binary>
 
+  <binary>
+    ${prefix}/lib/enchant
+  </binary>
+
   <binary>
      ${prefix}/lib/libgettextpo.0.dylib
   </binary>
@@ -76,7 +94,11 @@
   </binary>
 
   <binary>
-    ${prefix}/lib/enchant
+    ${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

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