From 6780373a501b0334e6128c66918a5833a5cc8f64 Mon Sep 17 00:00:00 2001
From: Thomas Goyne <plorkyeran@aegisub.org>
Date: Thu, 3 Dec 2015 11:44:57 -0800
Subject: [PATCH] Remove fontconfig config files from the OS X package

---
 .../Contents/Resources/etc/fonts/fonts.conf   | 153 ------------
 .../Contents/Resources/etc/fonts/fonts.dtd    | 224 ------------------
 tools/osx-bundle.sh                           |   6 -
 3 files changed, 383 deletions(-)
 delete mode 100644 packages/osx_bundle/Contents/Resources/etc/fonts/fonts.conf
 delete mode 100644 packages/osx_bundle/Contents/Resources/etc/fonts/fonts.dtd

diff --git a/packages/osx_bundle/Contents/Resources/etc/fonts/fonts.conf b/packages/osx_bundle/Contents/Resources/etc/fonts/fonts.conf
deleted file mode 100644
index 171bf6f3e..000000000
--- a/packages/osx_bundle/Contents/Resources/etc/fonts/fonts.conf
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- /etc/fonts/fonts.conf file to configure system font access -->
-<fontconfig>
-
-<!--
-	DO NOT EDIT THIS FILE.
-	IT WILL BE REPLACED WHEN FONTCONFIG IS UPDATED.
-	LOCAL CHANGES BELONG IN 'local.conf'.
-
-	The intent of this standard configuration file is to be adequate for
-	most environments.  If you have a reasonably normal environment and
-	have found problems with this configuration, they are probably
-	things that others will also want fixed.  Please submit any
-	problems to the fontconfig bugzilla system located at fontconfig.org
-
-	Note that the normal 'make install' procedure for fontconfig is to
-	replace any existing fonts.conf file with the new version.  Place
-	any local customizations in local.conf which this file references.
-
-	Keith Packard
--->
-
-<!-- Font directory list -->
-
-	<dir>/Library/Fonts</dir>
-	<dir>/Network/Library/Fonts</dir>
-	<dir>/System/Library/Fonts</dir>
-	<dir>~/Library/Application Support/Aegisub/fonts</dir>
-	<dir>~/Library/Fonts</dir>
-
-<!--
-  Accept deprecated 'mono' alias, replacing it with 'monospace'
--->
-	<match target="pattern">
-		<test qual="any" name="family">
-			<string>mono</string>
-		</test>
-		<edit name="family" mode="assign">
-			<string>monospace</string>
-		</edit>
-	</match>
-
-<!--
-  Accept alternate 'sans serif' spelling, replacing it with 'sans-serif'
--->
-	<match target="pattern">
-		<test qual="any" name="family">
-			<string>sans serif</string>
-		</test>
-		<edit name="family" mode="assign">
-			<string>sans-serif</string>
-		</edit>
-	</match>
-
-<!--
-  Accept deprecated 'sans' alias, replacing it with 'sans-serif'
--->
-	<match target="pattern">
-		<test qual="any" name="family">
-			<string>sans</string>
-		</test>
-		<edit name="family" mode="assign">
-			<string>sans-serif</string>
-		</edit>
-	</match>
-
-<!--
-  Load local system customization file
--->
-	<include ignore_missing="yes">conf.d</include>
-
-<!-- Font cache directory list -->
-
-	<cachedir>~/Library/Application Support/Aegisub/font_cache</cachedir>
-	
-
-	<config>
-<!--
-  These are the default Unicode chars that are expected to be blank
-  in fonts.  All other blank chars are assumed to be broken and
-  won't appear in the resulting charsets
- -->
-		<blank>
-			<int>0x0020</int>	<!-- SPACE -->
-			<int>0x00A0</int>	<!-- NO-BREAK SPACE -->
-			<int>0x00AD</int>	<!-- SOFT HYPHEN -->
-			<int>0x034F</int>	<!-- COMBINING GRAPHEME JOINER -->
-			<int>0x0600</int>	<!-- ARABIC NUMBER SIGN -->
-			<int>0x0601</int>	<!-- ARABIC SIGN SANAH -->
-			<int>0x0602</int>	<!-- ARABIC FOOTNOTE MARKER -->
-			<int>0x0603</int>	<!-- ARABIC SIGN SAFHA -->
-			<int>0x06DD</int>	<!-- ARABIC END OF AYAH -->
-			<int>0x070F</int>	<!-- SYRIAC ABBREVIATION MARK -->
-			<int>0x115F</int>	<!-- HANGUL CHOSEONG FILLER -->
-			<int>0x1160</int>	<!-- HANGUL JUNGSEONG FILLER -->
-			<int>0x1680</int>	<!-- OGHAM SPACE MARK -->
-			<int>0x17B4</int>	<!-- KHMER VOWEL INHERENT AQ -->
-			<int>0x17B5</int>	<!-- KHMER VOWEL INHERENT AA -->
-			<int>0x180E</int>	<!-- MONGOLIAN VOWEL SEPARATOR -->
-			<int>0x2000</int>	<!-- EN QUAD -->
-			<int>0x2001</int>	<!-- EM QUAD -->
-			<int>0x2002</int>	<!-- EN SPACE -->
-			<int>0x2003</int>	<!-- EM SPACE -->
-			<int>0x2004</int>	<!-- THREE-PER-EM SPACE -->
-			<int>0x2005</int>	<!-- FOUR-PER-EM SPACE -->
-			<int>0x2006</int>	<!-- SIX-PER-EM SPACE -->
-			<int>0x2007</int>	<!-- FIGURE SPACE -->
-			<int>0x2008</int>	<!-- PUNCTUATION SPACE -->
-			<int>0x2009</int>	<!-- THIN SPACE -->
-			<int>0x200A</int>	<!-- HAIR SPACE -->
-			<int>0x200B</int>	<!-- ZERO WIDTH SPACE -->
-			<int>0x200C</int>	<!-- ZERO WIDTH NON-JOINER -->
-			<int>0x200D</int>	<!-- ZERO WIDTH JOINER -->
-			<int>0x200E</int>	<!-- LEFT-TO-RIGHT MARK -->
-			<int>0x200F</int>	<!-- RIGHT-TO-LEFT MARK -->
-			<int>0x2028</int>	<!-- LINE SEPARATOR -->
-			<int>0x2029</int>	<!-- PARAGRAPH SEPARATOR -->
-			<int>0x202A</int>	<!-- LEFT-TO-RIGHT EMBEDDING -->
-			<int>0x202B</int>	<!-- RIGHT-TO-LEFT EMBEDDING -->
-			<int>0x202C</int>	<!-- POP DIRECTIONAL FORMATTING -->
-			<int>0x202D</int>	<!-- LEFT-TO-RIGHT OVERRIDE -->
-			<int>0x202E</int>	<!-- RIGHT-TO-LEFT OVERRIDE -->
-			<int>0x202F</int>	<!-- NARROW NO-BREAK SPACE -->
-			<int>0x205F</int>	<!-- MEDIUM MATHEMATICAL SPACE -->
-			<int>0x2060</int>	<!-- WORD JOINER -->
-			<int>0x2061</int>	<!-- FUNCTION APPLICATION -->
-			<int>0x2062</int>	<!-- INVISIBLE TIMES -->
-			<int>0x2063</int>	<!-- INVISIBLE SEPARATOR -->
-			<int>0x206A</int>	<!-- INHIBIT SYMMETRIC SWAPPING -->
-			<int>0x206B</int>	<!-- ACTIVATE SYMMETRIC SWAPPING -->
-			<int>0x206C</int>	<!-- INHIBIT ARABIC FORM SHAPING -->
-			<int>0x206D</int>	<!-- ACTIVATE ARABIC FORM SHAPING -->
-			<int>0x206E</int>	<!-- NATIONAL DIGIT SHAPES -->
-			<int>0x206F</int>	<!-- NOMINAL DIGIT SHAPES -->
-			<int>0x2800</int>	<!-- BRAILLE PATTERN BLANK -->
-			<int>0x3000</int>	<!-- IDEOGRAPHIC SPACE -->
-			<int>0x3164</int>	<!-- HANGUL FILLER -->
-			<int>0xFEFF</int>	<!-- ZERO WIDTH NO-BREAK SPACE -->
-			<int>0xFFA0</int>	<!-- HALFWIDTH HANGUL FILLER -->
-			<int>0xFFF9</int>	<!-- INTERLINEAR ANNOTATION ANCHOR -->
-			<int>0xFFFA</int>	<!-- INTERLINEAR ANNOTATION SEPARATOR -->
-			<int>0xFFFB</int>	<!-- INTERLINEAR ANNOTATION TERMINATOR -->
-		</blank>
-<!--
-  Rescan configuration every 30 seconds when FcFontSetList is called
- -->
-		<rescan>
-			<int>30</int>
-		</rescan>
-	</config>
-
-</fontconfig>
diff --git a/packages/osx_bundle/Contents/Resources/etc/fonts/fonts.dtd b/packages/osx_bundle/Contents/Resources/etc/fonts/fonts.dtd
deleted file mode 100644
index cbdfdab3f..000000000
--- a/packages/osx_bundle/Contents/Resources/etc/fonts/fonts.dtd
+++ /dev/null
@@ -1,224 +0,0 @@
-<!-- This is the Document Type Definition for font configuration files -->
-<!ELEMENT fontconfig (dir | 
-		      cache | 
-		      cachedir |
-		      include | 
-		      config |
-		      selectfont |
-		      match | 
-		      alias)* >
-
-<!-- 
-    Add a directory that provides fonts
--->
-<!ELEMENT dir (#PCDATA)>
-<!ATTLIST dir xml:space (default|preserve) 'preserve'>
-
-<!--
-    Define the per-user file that holds cache font information.
-
-    If the filename begins with '~', it is replaced with the users
-    home directory path.
--->
-<!ELEMENT cache (#PCDATA)>
-<!ATTLIST cache xml:space (default|preserve) 'preserve'>
-
-<!--
-    Add a directory that is searched for font cache files.
-    These hold per-directory cache data and are searched in
-    order for each directory. When writing cache files, the first
-    directory which allows the cache file to be created is used.
-
-    A leading '~' in a directory name is replaced with the users
-    home directory path.
--->
-<!ELEMENT cachedir (#PCDATA)>
-<!ATTLIST cachedir xml:space (default|preserve) 'preserve'>
-
-<!--
-    Reference another configuration file; note that this
-    is another complete font configuration file and not
-    just a file included by the XML parser.
-
-    Set 'ignore_missing' to 'yes' if errors are to be ignored.
-
-    If the filename begins with '~', it is replaced with the users
-    home directory path.
--->
-<!ELEMENT include (#PCDATA)>
-<!ATTLIST include
-	  ignore_missing    (no|yes)		"no"
-	  xml:space	    (default|preserve)	"preserve">
-
-<!--
-    Global library configuration data
- -->
-<!ELEMENT config (blank|rescan)*>
-
-<!--
-    Specify the set of Unicode encoding values which
-    represent glyphs that are allowed to contain no
-    data.  With this list, fontconfig can examine
-    fonts for broken glyphs and eliminate them from
-    the set of valid Unicode chars.  This idea
-    was borrowed from Mozilla
- -->
-<!ELEMENT blank (int)*>
-
-<!--
-    Aliases are just a special case for multiple match elements
-
-    They are syntactically equivalent to:
-
-    <match>
-	<test name="family">
-	    <string value=[family]/>
-	</test>
-	<edit name="family" mode="prepend">
-	    <string value=[prefer]/>
-	    ...
-	</edit>
-	<edit name="family" mode="append">
-	    <string value=[accept]/>
-	    ...
-	</edit>
-	<edit name="family" mode="append_last">
-	    <string value=[default]/>
-	    ...
-	</edit>
-    </match>
--->
-<!--
-    Periodically rescan the font configuration and
-    directories to synch internal state with filesystem
- -->
-<!ELEMENT rescan (int)>
-
-<!--
-    Edit list of available fonts at startup/reload time
- -->
-<!ELEMENT selectfont (rejectfont | acceptfont)* >
-
-<!ELEMENT rejectfont (glob | pattern)*>
-
-<!ELEMENT acceptfont (glob | pattern)*>
-
-<!ELEMENT glob (#PCDATA)>
-
-<!ELEMENT pattern (patelt)*>
-
-<!ENTITY % constant 'int|double|string|matrix|bool|charset|const'>
-
-<!ELEMENT patelt (%constant;)*>
-<!ATTLIST patelt
-	  name CDATA	#REQUIRED>
-
-<!ELEMENT alias (family*, prefer?, accept?, default?)>
-<!ATTLIST alias
-	  binding (weak|strong|same) "weak">
-<!ELEMENT prefer (family)*>
-<!ELEMENT accept (family)*>
-<!ELEMENT default (family)*>
-<!ELEMENT family (#PCDATA)>
-<!ATTLIST family xml:space (default|preserve) 'preserve'>
-
-<!ENTITY % expr 'int|double|string|matrix|bool|charset
-		|name|const
-		|or|and|eq|not_eq|less|less_eq|more|more_eq|contains|not_contains
-		|plus|minus|times|divide|not|if|floor|ceil|round|trunc'>
-
-<!--
-    Match and edit patterns.
-
-    If 'target' is 'pattern', execute the match before selecting a font.
-    if 'target' is 'font', execute the match on the result of a font
-    selection.
--->
-<!ELEMENT match (test*, edit*)>
-<!ATTLIST match
-	  target (pattern|font|scan) "pattern">
-
-<!--
-    Match a field in a pattern
-
-    if 'qual' is 'any', then the match succeeds if any value in the field matches.
-    if 'qual' is 'all', then the match succeeds only if all values match.
-    if 'qual' is 'first', then the match succeeds only if the first value matches.
-    if 'qual' is 'not_first', then the match succeeds only if any value other than
-    	the first matches.
-    For match elements with target=font, if test 'target' is 'pattern',
-    then the test is applied to the pattern used in matching rather than
-    to the resulting font.
-
-    Match elements with target=scan are applied as fonts are scanned.
-    They edit the pattern generated from the scanned font and affect
-    what the fontconfig database contains.
--->
-<!ELEMENT test (%expr;)*>
-<!ATTLIST test 
-	  qual (any|all|first|not_first)    "any"
-	  name CDATA	    #REQUIRED
-	  target (pattern|font|default)		"default"
-	  compare (eq|not_eq|less|less_eq|more|more_eq|contains|not_contains)	"eq">
-
-<!--
-    Edit a field in a pattern
-
-    The enclosed values are used together to edit the list of values
-    associated with 'name'.
-
-    If 'name' matches one of those used in a test element for this match element:
-	if 'mode' is 'assign', replace the matched value.
-	if 'mode' is 'assign_replace', replace all of the values
-	if 'mode' is 'prepend', insert before the matched value
-	if 'mode' is 'append', insert after the matched value
-	if 'mode' is 'prepend_first', insert before all of the values
-	if 'mode' is 'append_last', insert after all of the values
-    If 'name' doesn't match any of those used in a test element:
-	if 'mode' is 'assign' or 'assign_replace, replace all of the values
-	if 'mode' is 'prepend' or 'prepend_first', insert before all of the values
-	if 'mode' is 'append' or 'append_last', insert after all of the values
--->
-<!ELEMENT edit (%expr;)*>
-<!ATTLIST edit
-	  name CDATA	    #REQUIRED
-	  mode (assign|assign_replace|prepend|append|prepend_first|append_last) "assign"
-	  binding (weak|strong|same) "weak">
-
-<!--
-    Elements of expressions follow
--->
-<!ELEMENT int (#PCDATA)>
-<!ATTLIST int xml:space (default|preserve) 'preserve'>
-<!ELEMENT double (#PCDATA)>
-<!ATTLIST double xml:space (default|preserve) 'preserve'>
-<!ELEMENT string (#PCDATA)>
-<!ATTLIST string xml:space (default|preserve) 'preserve'>
-<!ELEMENT matrix (double,double,double,double)>
-<!ELEMENT bool (#PCDATA)>
-<!ELEMENT charset (#PCDATA)>
-<!ATTLIST charset xml:space (default|preserve) 'preserve'>
-<!ELEMENT name (#PCDATA)>
-<!ATTLIST name xml:space (default|preserve) 'preserve'>
-<!ELEMENT const (#PCDATA)>
-<!ATTLIST const xml:space (default|preserve) 'preserve'>
-<!ELEMENT or (%expr;)*>
-<!ELEMENT and (%expr;)*>
-<!ELEMENT eq ((%expr;), (%expr;))>
-<!ELEMENT not_eq ((%expr;), (%expr;))>
-<!ELEMENT less ((%expr;), (%expr;))>
-<!ELEMENT less_eq ((%expr;), (%expr;))>
-<!ELEMENT more ((%expr;), (%expr;))>
-<!ELEMENT more_eq ((%expr;), (%expr;))>
-<!ELEMENT contains ((%expr;), (%expr;))>
-<!ELEMENT not_contains ((%expr;), (%expr;))>
-<!ELEMENT plus (%expr;)*>
-<!ELEMENT minus (%expr;)*>
-<!ELEMENT times (%expr;)*>
-<!ELEMENT divide (%expr;)*>
-<!ELEMENT not (%expr;)>
-<!ELEMENT if ((%expr;), (%expr;), (%expr;))>
-<!ELEMENT floor (%expr;)>
-<!ELEMENT ceil (%expr;)>
-<!ELEMENT round (%expr;)>
-<!ELEMENT trunc (%expr;)>
diff --git a/tools/osx-bundle.sh b/tools/osx-bundle.sh
index b400d4a51..eb82b554f 100755
--- a/tools/osx-bundle.sh
+++ b/tools/osx-bundle.sh
@@ -26,9 +26,6 @@ mkdir -v "${PKG_DIR}"
 mkdir -v "${PKG_DIR}/Contents"
 mkdir -v "${PKG_DIR}/Contents/MacOS"
 mkdir -v "${PKG_DIR}/Contents/Resources"
-mkdir -v "${PKG_DIR}/Contents/Resources/etc"
-mkdir -v "${PKG_DIR}/Contents/Resources/etc/fonts"
-mkdir -v "${PKG_DIR}/Contents/Resources/etc/fonts/conf.d"
 mkdir -v "${PKG_DIR}/Contents/SharedSupport"
 mkdir -v "${PKG_DIR}/Contents/SharedSupport/dictionaries"
 
@@ -45,9 +42,6 @@ find po -name *.po | sed 's/.*\/\(.*\)\.po/        <string>\1<\/string>/; s/RS/Y
 
 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.dtd "${PKG_DIR}/Contents/Resources/etc/fonts"
-cat ${SKEL_DIR}/Contents/Resources/etc/fonts/fonts.conf | sed -f tools/osx-bundle.sed > "${PKG_DIR}/Contents/Resources/etc/fonts/fonts.conf"
-cp ${FONTCONFIG_CONF_DIR}/conf.d/*.conf "${PKG_DIR}/Contents/Resources/etc/fonts/conf.d"
 cat ${SKEL_DIR}/Contents/Info.plist | sed -f tools/osx-bundle.sed > "${PKG_DIR}/Contents/Info.plist"
 
 rm languages