linux-from-scratch/glfs
1
0
Fork 0
mirror of https://github.com/Zeckmathederg/glfs.git synced 2025-02-03 23:07:23 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix fontconfig build issue with gperf >= 3.1.

Browse Source 
git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@18650 af4574ff-66df-0310-9fd7-8a98e5e911e0
This commit is contained in:
DJ Lucas 2017-04-28 23:30:45 +00:00
parent c497e49af4
commit f9ae69b49a
3 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
general.ent
View File

@ -1,12 +1,12 @@
<!-- $LastChangedBy$ $Date$ --> <!-- $LastChangedBy$ $Date$ -->
<!ENTITY day "27"> <!-- Always 2 digits --> <!ENTITY day "29"> <!-- Always 2 digits -->
<!ENTITY month "04"> <!-- Always 2 digits --> <!ENTITY month "04"> <!-- Always 2 digits -->
<!ENTITY year "2017"> <!ENTITY year "2017">
<!ENTITY copyrightdate "2001-&year;"> <!ENTITY copyrightdate "2001-&year;">
<!ENTITY copyholder "The BLFS Development Team"> <!ENTITY copyholder "The BLFS Development Team">
<!ENTITY version "&year;-&month;-&day;"> <!ENTITY version "&year;-&month;-&day;">
<!ENTITY releasedate "April 27th &year;"> <!ENTITY releasedate "April 29th &year;">
<!ENTITY pubdate "&year;-&month;-&day;"> <!-- metadata req. by TLDP --> <!ENTITY pubdate "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
<!ENTITY blfs-version "svn"> <!-- svn|[release #] --> <!ENTITY blfs-version "svn"> <!-- svn|[release #] -->
<!ENTITY lfs-version "development"> <!-- x.y|development --> <!ENTITY lfs-version "development"> <!-- x.y|development -->

17
general/graphlib/fontconfig.xml
View File

@ -72,6 +72,16 @@
</listitem> </listitem>
</itemizedlist> </itemizedlist>
<bridgehead renderas="sect3">Additional Downloads</bridgehead>
<itemizedlist spacing="compact">
<listitem>
<para>
Required patch:
<ulink url="&patch-root;/fontconfig-&fontconfig-version;-gperf-3.1-1.patch"/>
</para>
</listitem>
</itemizedlist>
<bridgehead renderas="sect3">Fontconfig Dependencies</bridgehead> <bridgehead renderas="sect3">Fontconfig Dependencies</bridgehead>
<bridgehead renderas="sect4">Required</bridgehead> <bridgehead renderas="sect4">Required</bridgehead>
@ -104,6 +114,12 @@
<sect2 role="installation"> <sect2 role="installation">
<title>Installation of Fontconfig</title> <title>Installation of Fontconfig</title>
<para>
Fix an error with version of <application>gperf</application> &gt; 3.1:
</para>
<screen><userinput>patch -Np1 -i ../fontconfig-&fontconfig-version;-gperf-3.1-1.patch</userinput></screen>
<para> <para>
Install <application>Fontconfig</application> by running the following Install <application>Fontconfig</application> by running the following
commands: commands:
@ -114,6 +130,7 @@
-i fontconfig/fontconfig.h &amp;&amp; -i fontconfig/fontconfig.h &amp;&amp;
sed 's/CHAR_WIDTH/CHARWIDTH/' -i src/fcobjs.h &amp;&amp; sed 's/CHAR_WIDTH/CHARWIDTH/' -i src/fcobjs.h &amp;&amp;
autoreconf -fi &amp;&amp;
./configure --prefix=/usr \ ./configure --prefix=/usr \
--sysconfdir=/etc \ --sysconfdir=/etc \
--localstatedir=/var \ --localstatedir=/var \

9
introduction/welcome/changelog.xml
View File

@ -41,6 +41,15 @@
</itemizedlist> </itemizedlist>
</listitem> </listitem>
--> -->
<listitem>
<para>April 29th, 2017</para>
<itemizedlist>
<listitem>
<para>[dj] - Fix fontconfig build issue with gperf >= 3.1.</para>
</listitem>
</itemizedlist>
</listitem>
<listitem> <listitem>
<para>April 27th, 2017</para> <para>April 27th, 2017</para>
<itemizedlist> <itemizedlist>