From 8fab7c9ddc871c7dfc10232231b9bfe9f429311a Mon Sep 17 00:00:00 2001 From: Amar Takhar Date: Mon, 16 Feb 2009 01:57:19 +0000 Subject: [PATCH] Substitute the FontConfig Cache dir in fonts.conf to use the proper (versioned) path: ~/Library/Application Data/Aegisub- Originally committed to SVN as r2736. --- packages/osx_bundle/Contents/Resources/etc/fonts/fonts.conf | 2 +- scripts/osx-bundle.sed.in | 1 + scripts/osx-bundle.sh | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/osx_bundle/Contents/Resources/etc/fonts/fonts.conf b/packages/osx_bundle/Contents/Resources/etc/fonts/fonts.conf index 8fb10e809..a7bae0a5f 100644 --- a/packages/osx_bundle/Contents/Resources/etc/fonts/fonts.conf +++ b/packages/osx_bundle/Contents/Resources/etc/fonts/fonts.conf @@ -74,7 +74,7 @@ - ~/Library/Application Support/Aegisub/cache/fonts + ~/Library/Application Support/Aegisub-@FONTCONFIG_VERSION_DATA@/font_cache diff --git a/scripts/osx-bundle.sed.in b/scripts/osx-bundle.sed.in index f338f3889..09e09821d 100644 --- a/scripts/osx-bundle.sed.in +++ b/scripts/osx-bundle.sed.in @@ -1,3 +1,4 @@ s/@PLIST_VERSION@/@VERSION@/g s/@PLIST_SVN_REVISION@/@SVN_REVISION@/g s/@PLIST_BUILD_DATE@/@BUILD_DATE@/g +s/@FONTCONFIG_VERSION_DATA@/@AEGISUB_VERSION_DATA@/g diff --git a/scripts/osx-bundle.sh b/scripts/osx-bundle.sh index 9789b5ce0..5e482244c 100755 --- a/scripts/osx-bundle.sh +++ b/scripts/osx-bundle.sh @@ -34,7 +34,8 @@ echo echo "---- Copying Skel Files ----" find ${SKEL_DIR} -type f -not -regex ".*.svn.*" cp ${SKEL_DIR}/Contents/Resources/*.icns ${PKG_DIR}/Contents/Resources -cp ${SKEL_DIR}/Contents/Resources/etc/fonts/fonts.* ${PKG_DIR}/Contents/Resources/etc/fonts +cp ${SKEL_DIR}/Contents/Resources/etc/fonts/fonts.dtd ${PKG_DIR}/Contents/Resources/etc/fonts +cat ${SKEL_DIR}/Contents/Resources/etc/fonts/fonts.conf |sed -f scripts/osx-bundle.sed > ${PKG_DIR}/Contents/Resources/etc/fonts/fonts.conf cp ${SKEL_DIR}/Contents/Resources/etc/fonts/conf.d/*.conf ${PKG_DIR}/Contents/Resources/etc/fonts/conf.d cat ${SKEL_DIR}/Contents/Info.plist |sed -f scripts/osx-bundle.sed > ${PKG_DIR}/Contents/Info.plist