From cb3460234d4df75503e1d00d24f87d05aa697bf3 Mon Sep 17 00:00:00 2001
From: Alexander Kojevnikov <alexander@kojevnikov.com>
Date: Mon, 21 Feb 2011 19:33:42 +0800
Subject: [PATCH] osx: Bundle fixes

---
 .gitignore      |   1 +
 osx/DS_Store    | Bin 0 -> 6148 bytes
 osx/bundle.sh   |  25 ++++++++++++++++++++++++-
 osx/spek.bundle |   5 ++++-
 4 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 osx/DS_Store

diff --git a/.gitignore b/.gitignore
index 193288c..6314646 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,6 +28,7 @@ missing
 mkinstalldirs
 omf.make
 osx/Spek.app
+osx/Spek.dmg
 osx/bin
 po/*.gmo
 po/.intltool-merge-cache
diff --git a/osx/DS_Store b/osx/DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..18409e7ecef6277afe01854537befa44b1e2521a
GIT binary patch
literal 6148
zcmeHK&2AGh5FWRwQksy47Nkl@u&M|gDrJkrDW?#EphAdBg>og?-6m-^>nNL~*POT_
zApv&;R~`X+>4hiY%%QIlzOlVDKShWOLdX-1#~#m&J>Ra!St1gZfq$DQPejXLmZ=pq
z=Mc{`&(VU>WFQ5{kahGBO5B~ZwF--XMd05<K%ZS_CzM`2oI1a6#){OI1r;lg9#oA*
zcGv4yh!#E(jlW<Xvpe_ppVXxcQ3iN;aMarV8SdNSOEF$5w7h6&@>dq|Q7EGZG_Mn%
zVKZ*Z9s=CbnwHm)CJNV|lwo+cykRoqpnr!(k&J@6>~~<3Sn^(cE=;^5SoL*uRqLSX
zw!FTM&WWgWP|(tqS`;^ffHkvpQs`_x+@d7}Jj~T=Uc1qggUBy-RT{I_zZ;7-;@wQF
z7;B=7Nl8uAnc~?xTv~y{N#P@x*-NH>fWBaC#33!vrrCaJ!mo4|LTxoi*C<DIs*y)+
zYEX|P4JZOuMe0H}Xca4^sRE0LVro)=-x^(YCxW^&L1~@x?!F8Mogj7-3@?jaP6RFT
zO6|!|^6(rwJ`LXkS)!+J!;JAR`W=2d{+z;BUxDnF9}IiGAGbBK7o3?u>1q(S`?70L
zJwE;L9To|yZS)0Yc|YLi^mz3%a=5`Ml%B;wFD}(;JsFiukkaIybF@L38T5)kx1*3<
z!L!-};vsmAuB%|K3g((%349uWbrLSo6|A1+H-s59AHRlY*PTAb#P7yCb&9o@ay@JK
zXn>Zv23WEPSOhErlL&BqaKJ3fMvk;pr2`G>x|-*^SrK&nEx|sHk!2%CT4Dwyv@4``
z73LE|Xm{uxV^=nEq@{Kzp;ks5v$8N>C_=3cy`#)Yl(n?2MZh93jliNF=K21=|LgDn
zX(v0f2v`LED+ENUx>v0rC3CmVCC7KI1AYN!V!M%+$_0(Nj#Y=R;tjAO%sJeFEE_q}
S5*m>GBcNcgjYZ(EBJcyu7TBZ!

literal 0
HcmV?d00001

diff --git a/osx/bundle.sh b/osx/bundle.sh
index 186b66a..1322202 100755
--- a/osx/bundle.sh
+++ b/osx/bundle.sh
@@ -41,6 +41,29 @@ cp -Rp $DMG_APP $MOUNT_POINT
 
 find $MOUNT_POINT -type d -iregex '.*\.svn$' &>/dev/null | xargs rm -rf
 
-#pushd $MOUNT_POINT &>/dev/null
+cd $MOUNT_POINT
+ln -s /Applications " "
+cd ..
+
+cp DS_Store $MOUNT_POINT/.DS_Store
+
+echo "Detaching from disk image..."
+hdiutil detach $MOUNT_POINT -quiet
+
+mv $DMG_FILE $DMG_FILE.master
+
+echo "Creating distributable image..."
+hdiutil convert -quiet -format UDBZ -o $DMG_FILE $DMG_FILE.master
+
+#echo "Installing end user license agreement..."
+#hdiutil flatten -quiet $DMG_FILE
+#/Developer/Tools/Rez /Developer/Headers/FlatCarbon/*.r dmg-data/license.r -a -o $DMG_FILE
+#hdiutil unflatten -quiet $DMG_FILE
+
+echo "Done."
+
+if [ ! "x$1" = "x-m" ]; then
+	rm $DMG_FILE.master
+fi
 
 cd ..
diff --git a/osx/spek.bundle b/osx/spek.bundle
index a8e78e3..d1c3a71 100644
--- a/osx/spek.bundle
+++ b/osx/spek.bundle
@@ -18,7 +18,10 @@
     ${prefix}/lib/${gtkdir}/${pkg:${gtk}:gtk_binary_version}/engines/*.so
   </binary>
   <binary>
-    ${prefix}/lib/pango/${pkg:pango:pango_module_version}/modules/pango-basic-atsui.so
+    ${prefix}/lib/${gtkdir}/${pkg:${gtk}:gtk_binary_version}/immodules/*.so
+  </binary>
+  <binary>
+    ${prefix}/lib/pango/${pkg:pango:pango_module_version}/modules/*.so
   </binary>
 
   <!-- translations name="gtk20">