From c4e8dd0dfb7a203c4e9d7588c748ee81c6258df4 Mon Sep 17 00:00:00 2001
From: Amar Takhar <verm@aegisub.org>
Date: Tue, 30 Dec 2008 11:38:08 +0000
Subject: [PATCH] * Remove DS_Store, it is now custom generated using  
 http://freehg.org/u/wiml/dsstore/.  This allows us to have versions in our  
 folder names without requiring manual intervention!  It requires dsstore to
 b$   installed and runs a modified scripts/osx-dmg-dsstore.pl to generate the
   DS_Store file.

Originally committed to SVN as r2568.
---
 libass/ass_render.c        |   6 ++++++
 packages/osx_dmg/DS_Store  | Bin 12292 -> 0 bytes
 scripts/osx-dmg-dsstore.pl |  20 ++++++++++++++++++++
 scripts/osx-dmg.sh         |   7 +++++--
 4 files changed, 31 insertions(+), 2 deletions(-)
 delete mode 100644 packages/osx_dmg/DS_Store
 create mode 100755 scripts/osx-dmg-dsstore.pl

diff --git a/libass/ass_render.c b/libass/ass_render.c
index 380690724..1e2425267 100644
--- a/libass/ass_render.c
+++ b/libass/ass_render.c
@@ -241,6 +241,12 @@ ass_renderer_t* ass_renderer_init(ass_library_t* library)
 	memset(&text_info, 0, sizeof(text_info));
 
 	error = FT_Init_FreeType( &ft );
+
+char path[4096];
+*path='\0';
+getcwd(path,4096);
+printf("PATH: (%s)\n", path);
+
 	if ( error ) { 
 		mp_msg(MSGT_ASS, MSGL_FATAL, MSGTR_LIBASS_FT_Init_FreeTypeFailed);
 		goto ass_init_exit;
diff --git a/packages/osx_dmg/DS_Store b/packages/osx_dmg/DS_Store
deleted file mode 100644
index c4154d343a43505ac4a5be4c0a3e2959b19153bf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12292
zcmeHLOHUI~6h4<n1c3?^5>#R)#+`O5gn(&`sRae%LX43F7h>mOY5JIErc)Lg(v3?u
zuKg8mbms<shbuS!1ULHK$3UUQU}A!a=QQ_zxA&gcd}n%RZiz?~VsDOUhKPpHB#w`u
z>mhPowl3*2GZ%pZ_7pf6jc&NjLYFR2Fayj0Gr$Zm1I)m`!2q7wQie`>?(0?VnE__t
zzhpq}4;Grlyur3cwRNCVM*!derj=kkE(bu%VBTO`BUT_nn*z0|Fh>lb%`tBoy}ZG;
zMr}?)MTQ>}S(p=wP|-1ODRmNgjodQ>%s@8-`s{8O9<8o8)z0&K|8=53>I<^hmp30f
zK~R;yJ$!w&TfS|S$Hjtp*Z01EqwLmO#=FvJ?L<342=y1*rtFpiW7GLx0(8r6D_OBH
zUZCgopzb?Cvu6BBkdZyrYm27#PNQngZj{}o_Ab*VLXZ7nqUe{(QS4ar_ME+#@%$u1
zXdLW4SzEhFgBYe$PSLHD!XU1DcB5XB4*pc8;O}8#^b<lfW_GA#mPYKOIC7T+4+ne8
zcd$NT#)}y14Ka=UZ*`@g>+p~}a;B0_(KSkuLq&3_LL~}Oy_o7?&87yhM3?9WA{EKU
zxJ(gN9c;4mSf4{%qzrU@YSAQJ&2|LJo(M!~x{}=ts&UPavRx_Cl=vX87(K3kcq@oQ
zt5A%5Id@$4--xfM0MXs=pJt7p%weVMVxzGg?%H1MO!c^T*+&IdQR2|^qKdA-uys5l
z4K~BLUNPM7zy9_G>k0Qu7z^A_$c8Rm_)KG4A8`dshZm507WrY6Yx!X<r`+UzpL2?G
zG<$;WOb@ng=rr)zM#Xkf2ajs1R#P-gTdIa3s#Jhhgz8LEM&*%}d1O@{NexcnE=?j!
zG>vN+k$0tRkm<8$wq6a~<kt?%w`fa}U*l<%?yLN(xTjorZ2|+_Z&44sA4hil{Fh~5
zVFu2Rfqor&MxOs4U{~b-0nV=$9GMw7F9yWG%F~qsqRY4JULxOQEwq<tQlws6qcTCK
zUUq@%I1W5~$;a4&s<g=)Y-_{}gkJ;{4csvU%m6dM3@`)C05iZ0Fayj0Gr$Zm1Iz$3
Lzzi@0f0cn>-dO#S

diff --git a/scripts/osx-dmg-dsstore.pl b/scripts/osx-dmg-dsstore.pl
new file mode 100755
index 000000000..52496c744
--- /dev/null
+++ b/scripts/osx-dmg-dsstore.pl
@@ -0,0 +1,20 @@
+#!/usr/bin/perl -w
+
+use Mac::Finder::DSStore qw( writeDSDBEntries makeEntries );
+use Mac::Memory qw( );
+use Mac::Files qw( NewAliasMinimal );
+
+&writeDSDBEntries("$ARGV[0]",
+    &makeEntries(".",
+        BKGD_alias => NewAliasMinimal("$ARGV[2]"),
+        ICVO => 1,
+        fwi0_flds => [ 308, 397, 658, 848, "icnv", 0, 0 ],
+        fwvh => 350,
+        icgo => "\0\0\0\0\0\0\0\0",
+        icvo => pack('A4 n A4 A4 n*', "icv4", 90, "none", "botm", 0, 0, 0, 0, 0, 1, 0, 100, 1),
+        icvt => 12
+    ),
+    &makeEntries("Applications", Iloc_xy => [ 133, 250 ]),
+    &makeEntries("$ARGV[1]", Iloc_xy => [ 133, 55 ])
+);
+
diff --git a/scripts/osx-dmg.sh b/scripts/osx-dmg.sh
index 4e7530774..0e6d6565d 100755
--- a/scripts/osx-dmg.sh
+++ b/scripts/osx-dmg.sh
@@ -32,7 +32,6 @@ echo "---- Setting up ----"
 ln -vsf /Applications "${TMP_DMG}"
 mkdir -v ${TMP_DMG}/.background
 cp -v packages/osx_dmg/dmg_background.png ${TMP_DMG}/.background/background.png
-cp -v packages/osx_dmg/DS_Store ${TMP_DMG}/.DS_Store
 cp -v packages/osx_bundle/Contents/Resources/Aegisub.icns ${TMP_DMG}/.VolumeIcon.icns
 
 echo
@@ -45,13 +44,17 @@ DEV_NAME=`/usr/bin/hdiutil attach -readwrite -noverify -noautoopen "${PKG_NAME_R
 echo "Device name: ${DEV_NAME}"
 
 echo
-echo "---- Setting bless -openfolder \"/Volumes/${PKG_NAME_VOLUME}\" ----"
+echo "---- Setting bless -openfolder ----"
 bless -openfolder "/Volumes/${PKG_NAME_VOLUME}"
 
 echo
 echo "---- Setting root icon using SetFile ----"
 /usr/bin/SetFile -a C "/Volumes/${PKG_NAME_VOLUME}"
 
+echo
+echo "--- Generating /Volumes/${PKG_NAME_VOLUME}/.DS_Store ----"
+/usr/bin/perl scripts/osx-dmg-dsstore.pl "/Volumes/${PKG_NAME_VOLUME}/.DS_Store" "${PKG_DIR}" "/Volumes/${PKG_NAME_VOLUME}/.background/background.png"
+
 echo
 echo "---- Detaching ----"
 /usr/bin/hdiutil detach "${DEV_NAME}"