Remove the in-repo copy of the fontconfig config files

And just copy them from the fontconfig installation being used.
wangqr · Jun 24, 2014 · 4861287 · 4861287
1 parent 0153987
commit 4861287
Show file tree

Hide file tree

Showing 18 changed files with 8 additions and 1,286 deletions.
diff --git a/Makefile b/Makefile
@@ -2,7 +2,7 @@ include header.mk
 
 ifeq (yes, $(BUILD_DARWIN))
 osx-bundle:
-	$(BIN_SHELL) tools/osx-bundle.sh "$(AEGISUB_COMMAND)" "$(BIN_WX_CONFIG)" DICT_DIR=$(DICT_DIR)
+	$(BIN_SHELL) tools/osx-bundle.sh "$(AEGISUB_COMMAND)" "$(BIN_WX_CONFIG)" "$(FONTCONFIG_CONF_DIR)" DICT_DIR=$(DICT_DIR)
 
 osx-dmg: osx-bundle
 	codesign -s 'Mac Developer' --deep Aegisub.app || true

diff --git a/Makefile.inc.in b/Makefile.inc.in
@@ -105,6 +105,8 @@ ifeq (yes, $(BUILD_DARWIN))
 LIBS_LUA           = $(TOP)vendor/luajit/src/libluajit-aegisub.so
 endif
 
+FONTCONFIG_CONF_DIR = @FONTCONFIG_CONF_DIR@
+
 #####################
 # DEBUG / DEVELOPMENT
 #####################

diff --git a/configure.ac b/configure.ac
@@ -206,6 +206,9 @@ PKG_CHECK_MODULES(FREETYPE, freetype2 >= freetype_required_version)
 PKG_CHECK_MODULES(FONTCONFIG, fontconfig >= fontconfig_required_version)
 PKG_CHECK_MODULES(LIBASS, libass >= libass_required_version)
 
+FONTCONFIG_CONF_DIR=$($PKG_CONFIG --variable=confdir fontconfig)
+AC_SUBST(FONTCONFIG_CONF_DIR)
+
 AX_BOOST_BASE([boost_required_version])
 AX_BOOST_LIB(chrono,     BOOST_CHRONO_LIB,     [chrono.hpp], [boost::chrono::system_clock::time_point time])
 AX_BOOST_LIB(filesystem, BOOST_FILESYSTEM_LIB, [filesystem/path.hpp], [boost::filesystem::path("data.txt")])

diff --git a/packages/osx_bundle/Contents/Resources/etc/fonts/conf.d/20-fix-globaladvance.conf b/packages/osx_bundle/Contents/Resources/etc/fonts/conf.d/20-fix-globaladvance.conf
diff --git a/packages/osx_bundle/Contents/Resources/etc/fonts/conf.d/20-unhint-small-vera.conf b/packages/osx_bundle/Contents/Resources/etc/fonts/conf.d/20-unhint-small-vera.conf
diff --git a/packages/osx_bundle/Contents/Resources/etc/fonts/conf.d/30-metric-aliases.conf b/packages/osx_bundle/Contents/Resources/etc/fonts/conf.d/30-metric-aliases.conf
diff --git a/packages/osx_bundle/Contents/Resources/etc/fonts/conf.d/30-urw-aliases.conf b/packages/osx_bundle/Contents/Resources/etc/fonts/conf.d/30-urw-aliases.conf