Ticket #2518: libXfont-fix-macro-1.2.8.patch

File libXfont-fix-macro-1.2.8.patch, 2.0 KB (added by dnicholson@…, 16 years ago)

Fix libXfont to work with newer freetype

  • BOOK/introduction/welcome/changelog.xml 

    From c142a9597801bd8e4dc6be2050401678a639c3ca Mon Sep 17 00:00:00 2001
From: Dan Nicholson <dbn.lists@gmail.com>
Date: Thu, 8 May 2008 14:53:22 -0700
Subject: [PATCH] Fix libXfont to work with newer freetype; fixes #2518

---
 BOOK/introduction/welcome/changelog.xml |   10 ++++++++++
 BOOK/x/installing/x7lib.xml             |    8 +++++++-
 2 files changed, 17 insertions(+), 1 deletions(-)

diff --git a/BOOK/introduction/welcome/changelog.xml b/BOOK/introduction/welcome/changelog.xml
index e6b812f..274bc80 100644
    a b  
    4242-->
    4343
    4444    <listitem>
     45      <para>May 8th, 2008</para>
     46      <itemizedlist>
     47        <listitem>
     48          <para>[dnicholson] - Fixed libXfont to work with newer
     49          versions of FreeType2.</para>
     50        </listitem>
     51      </itemizedlist>
     52    </listitem>
     53
     54    <listitem>
    4555      <para>May 7th, 2008</para>
    4656      <itemizedlist>
    4757        <listitem>

  • BOOK/x/installing/x7lib.xml 

    diff --git a/BOOK/x/installing/x7lib.xml b/BOOK/x/installing/x7lib.xml
index da26faf..b5fd46e 100644
    a b libX11-&libX11-version; )  
    123123    sed -i 's/_XGet/XGet/' modules/im/ximcp/imDefLkup.c
    124124    ;;
    125125libXfont-&libXfont-version; )
    126     patch -Np1 -i ../libXfont-&libXfont-version;-pcf_parser-1.patch
     126    patch -Np1 -i ../libXfont-&libXfont-version;-pcf_parser-1.patch &amp;&amp;
     127    sed -i 's/(ft_isdigit/(isdigit/' src/FreeType/fttools.c
    127128    ;;
    128129esac &amp;&amp;
    129130./configure $XORG_CONFIG &amp;&amp;
    … … ldconfig</userinput></screen>  
    161162    vulnerability</ulink> in the PCF font parser in
    162163    <application>libXfont</application>.</para>
    163164
     165    <para><command>sed -i 's/(ft_isdigit/(isdigit/' src/FreeType/fttools.c</command>:
     166    In newer versions of <application>Freetype2</application>, the
     167    ft_isdigit macro has been removed. This command replaces it with the
     168    compatible isdigit macro.</para>
     169
    164170  </sect2>
    165171
    166172  <sect2 role="configuration">