From 96b344459db0b8792f13fd8d4893824afff37b67 Mon Sep 17 00:00:00 2001
From: Alexander Kojevnikov <alexander@kojevnikov.com>
Date: Thu, 31 Mar 2011 21:30:01 +0800
Subject: [PATCH] osx: Bundle fixes

---
 dist/osx/bundle.sh   |  7 +++++--
 dist/osx/launcher.sh |  5 ++---
 dist/osx/spek.bundle | 12 ++++++------
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/dist/osx/bundle.sh b/dist/osx/bundle.sh
index d92e67a..2762cb5 100755
--- a/dist/osx/bundle.sh
+++ b/dist/osx/bundle.sh
@@ -9,14 +9,17 @@ case "$(uname)" in
         ;;
 esac
 
+rm -fr dist/osx/bin
 ./autogen.sh --prefix=$(pwd)/dist/osx/bin
 gmake
 gmake install
 
-ige-mac-bundler dist/osx/spek.bundle
+cd dist/osx
+mv bin/lib/locale bin/share/
+
+ige-mac-bundler spek.bundle
 
 # Make DMG image
-cd dist/osx
 VOLUME_NAME=Spek
 DMG_APP=Spek.app
 DMG_FILE=$VOLUME_NAME.dmg
diff --git a/dist/osx/launcher.sh b/dist/osx/launcher.sh
index 4d81fc8..3528147 100755
--- a/dist/osx/launcher.sh
+++ b/dist/osx/launcher.sh
@@ -30,11 +30,10 @@ export GTK_EXE_PREFIX="$bundle_res"
 export GTK_PATH="$bundle_res"
 
 export GTK2_RC_FILES="$bundle_etc/gtk-2.0/gtkrc"
-export GTK_IM_MODULE_FILE="$bundle_etc/gtk-2.0/gtk.immodules"
-export GDK_PIXBUF_MODULE_FILE="$bundle_etc/gtk-2.0/gdk-pixbuf.loaders"
+export GDK_PIXBUF_MODULE_FILE="$bundle_etc/gdk-pixbuf-2.0/2.10.0/gdk-pixbuf.loaders"
 export PANGO_SYSCONFDIR="$bundle_etc"
 
-APP=name
+APP=spek
 I18NDIR="$bundle_data/locale"
 # Set the locale-related variables appropriately:
 unset LANG LC_MESSAGES LC_MONETARY LC_COLLATE
diff --git a/dist/osx/spek.bundle b/dist/osx/spek.bundle
index df24c14..dbdc69c 100644
--- a/dist/osx/spek.bundle
+++ b/dist/osx/spek.bundle
@@ -12,21 +12,21 @@
     ${project}/bin/bin/spek
   </main-binary>
   <binary>
-     ${prefix}/lib/${gtkdir}/modules/*.so
+    ${prefix}/lib/gdk-pixbuf-2.0/${pkg:${gtk}:gtk_binary_version}/loaders/*.so
   </binary>
   <binary>
     ${prefix}/lib/${gtkdir}/${pkg:${gtk}:gtk_binary_version}/engines/*.so
   </binary>
-  <binary>
-    ${prefix}/lib/${gtkdir}/${pkg:${gtk}:gtk_binary_version}/immodules/*.so
-  </binary>
+  <!-- binary>
+    ${prefix}/lib/${gtkdir}/${pkg:${gtk}:gtk_binary_version}/printbackends/*.so
+  </binary -->
   <binary>
     ${prefix}/lib/pango/${pkg:pango:pango_module_version}/modules/*.so
   </binary>
 
-  <!-- translations name="gtk20">
+  <translations name="gtk20">
     ${prefix}/share/locale
-  </translations -->
+  </translations>
 
   <data dest="${bundle}/Contents/Resources/share">
     ${project}/bin/share