[Libreoffice-commits] core.git: fontconfig/fontconfig-2.8.0.patch

[Tor Lillqvist]

 fontconfig/fontconfig-2.8.0.patch |    9 ---------
 1 file changed, 9 deletions(-)

New commits:
commit da2cdc885b0a013521dde71b0b15e431ee384821
Author: Tor Lillqvist <tml at iki.fi>
Date:   Fri Feb 8 16:28:31 2013 +0200

    The bundled expat is nowadays built as a single libexat
    
    We now have a single libexpat instead of libascii_expat_xmlparse and
    libexpat_xmltok. Hmm, no idea when that changed, but OK, that just simplifies
    the fontconfig patch. (Note that the bundled fontconfig is used only for
    Android.)
    
    Change-Id: I3973d35a566bd3c86b013c96b7f3a6a8e249c2c0

diff --git a/fontconfig/fontconfig-2.8.0.patch b/fontconfig/fontconfig-2.8.0.patch
index a75648a..5913cc8 100644
--- a/fontconfig/fontconfig-2.8.0.patch
+++ b/fontconfig/fontconfig-2.8.0.patch
@@ -29,15 +29,6 @@
  
          if test "x$supports_anon_versioning" = xyes; then
            archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
-@@ -14073,7 +14073,7 @@
- 		no)
- 			;;
- 		*)
--			EXPAT_LIBS="-L$expat_lib -lexpat"
-+			EXPAT_LIBS="-L$expat_lib -lascii_expat_xmlparse -lexpat_xmltok"
- 			;;
- 		esac
- 
 --- misc/build/fontconfig-2.8.0/src/fcxml.c
 +++ misc/build/fontconfig-2.8.0/src/fcxml.c
 @@ -1123,6 +1123,7 @@