diff options
author | Tor Lillqvist <tlillqvist@suse.com> | 2012-01-12 22:20:38 +0200 |
---|---|---|
committer | Tor Lillqvist <tlillqvist@suse.com> | 2012-01-13 01:31:44 +0200 |
commit | 201ade87705c36ce436da8661fb37afd5e064dac (patch) | |
tree | 33ab4b479f326494ec5548d2cf8284f4abaefbe1 /fontconfig | |
parent | ba713b5add1dfbcd17f8e6c14561dd3589a3db72 (diff) |
Must use the "ascii" version of our expat build with fontconfig
Sigh, spent one day, more or less, tracking down a weird fontconfig
problem, where all the diagnostic it offered was "unknown encoding"
when reading the fonts.conf file.
It turned out that I was being screwed by our fun two versions of the
expat_xmlparse library: One where XML_Char is char and one where it is
short. The intuitively "more normally" named libexpat_xmlparse is the
latter, but fontconfig works only with the former as it implicitly
expects XML_Char to be char.
Diffstat (limited to 'fontconfig')
-rw-r--r-- | fontconfig/fontconfig-2.8.0.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fontconfig/fontconfig-2.8.0.patch b/fontconfig/fontconfig-2.8.0.patch index 2185d2eabd7e..79d7c3e7926f 100644 --- a/fontconfig/fontconfig-2.8.0.patch +++ b/fontconfig/fontconfig-2.8.0.patch @@ -34,7 +34,7 @@ ;; *) - EXPAT_LIBS="-L$expat_lib -lexpat" -+ EXPAT_LIBS="-L$expat_lib -lexpat_xmlparse -lexpat_xmltok" ++ EXPAT_LIBS="-L$expat_lib -lascii_expat_xmlparse -lexpat_xmltok" ;; esac |