diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-11-14 22:09:31 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-11-15 11:35:58 +0100 |
| commit | 9c52986f26f4c33bd68d0f73006bd97e9820df7d (patch) | |
| tree | d7010cc972ed110f901a6e6b9e3bf1644c3a98aa /fontconfig | |
| parent | 814b0b45de540f06b51372a8adc43d3a8635258f (diff) | |
Revert "Use different symbol names in the two expat variants we build"
This reverts commit 78c7bbc3ce92493ca98c605f92733e31ad87ef70.
It is no longer the case that both expat_utf8 and expat_utf16 are linked
into the same library: we only use expat_utf16 in shell Explorer
extensions, which cannot be linked into libmerged anyway.
Conflicts:
expat/expat-2.1.0.patch
Change-Id: I579c10d405d8a40cafcb2dbe09e967c6079f7b16
Diffstat (limited to 'fontconfig')
| -rw-r--r-- | fontconfig/fontconfig-2.8.0.patch | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/fontconfig/fontconfig-2.8.0.patch b/fontconfig/fontconfig-2.8.0.patch index 63511fb0c7eb..a75648a49ba2 100644 --- a/fontconfig/fontconfig-2.8.0.patch +++ b/fontconfig/fontconfig-2.8.0.patch @@ -20,26 +20,6 @@ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ --- misc/build/fontconfig-2.8.0/configure +++ misc/build/fontconfig-2.8.0/configure -@@ -14368,7 +14368,7 @@ - ;; - yes) - --for ac_func in XML_SetDoctypeDeclHandler -+for ac_func in XML_SetDoctypeDeclHandler_UTF8 - do - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` - { $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -@@ -14468,7 +14468,7 @@ - fi - done - -- case "$ac_cv_func_XML_SetDoctypeDeclHandler" in -+ case "$ac_cv_func_XML_SetDoctypeDeclHandler_UTF8" in - yes) - HAVE_EXPAT=1 - ---- misc/build/fontconfig-2.8.0/configure -+++ misc/build/fontconfig-2.8.0/configure @@ -8718,7 +8718,7 @@ *Sun\ F*) # Sun Fortran 8.3 tmp_sharedflag='-G' ;; |