Changeset 2a75b9b

Timestamp:

02/06/2014 11:15:02 PM (10 years ago)

Author:

Ken Moffat <ken@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 7.5, 7.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gnome, kde5-13430, kde5-14269, kde5-14686, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

439ebd01

Parents:

57777f9

Message:

Add graphite2, update references to it. In libreoffice move both graphite2 and harfbuzz to recommended because otherwise internal versions will be used. Change the TeX Live link to graphite2, and temporarily point to #4647 until work on TeX is complete.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@12676 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:

• general.ent (modified) (1 diff)
• general/graphlib/graphite2.xml (added)
• general/graphlib/graphlib.xml (modified) (1 diff)
• general/graphlib/harfbuzz.xml (modified) (1 diff)
• introduction/welcome/changelog.xml (modified) (1 diff)
• pst/typesetting/texlive.xml (modified) (2 diffs)
• xsoft/office/libreoffice.xml (modified) (3 diffs)

general.ent

@@ -285 +285 @@
 <!ENTITY gegl-version                 "0.2.0">
 <!ENTITY giflib-version               "5.0.5">
+<!ENTITY graphite2-version            "1.2.4">
 <!ENTITY harfbuzz-version             "0.9.26">
 <!ENTITY ijs-version                  "0.35">

general/graphlib/graphlib.xml

@@ -29 +29 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gegl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="giflib.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="graphite2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="harfbuzz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ijs.xml"/>

general/graphlib/harfbuzz.xml

@@ -87 +87 @@
       <xref linkend="gobject-introspection"/>,
       <xref linkend="gtk-doc"/>, and
-      <ulink url="http://projects.palaso.org/projects/graphitedev/files">Graphite2</ulink>
+      <xref linkend="graphite2"/>
     </para>
 

introduction/welcome/changelog.xml

@@ -48 +48 @@
       <itemizedlist>
         <listitem>
+          <para>[ken] - Add graphite2.  This fixes
+          <ulink url="&blfs-ticket-root;4657">#4657</ulink> and begins
+          work on <ulink url="&blfs-ticket-root;4647">#4647</ulink>
+          </para>
+        </listitem>
+        <listitem>
           <para>[fernando] - Update to seamonkey-2.24. Fixes
           <ulink url="&blfs-ticket-root;4662">#4662</ulink>.</para>

pst/typesetting/texlive.xml

@@ -73 +73 @@
     <bridgehead renderas="sect3">TeX Live Dependencies</bridgehead>
 
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="gs"/>,
+    <bridgehead renderas="sect4">Optional (to build from source)</bridgehead>
+    <para role="optional">
+      The source ships with its own versions of <emphasis>many</emphasis> of
+      these libraries, and will use them unless it is forced to use the system
+      versions.  Work is in progress to deal with this, in the meantime please
+      see<ulink url="http://wiki.linuxfromscratch.org/blfs/ticket/4647"> ticket
+      #4647</ulink>.
+      <xref linkend="gs"/>,
       <xref linkend="poppler"/>,
       <xref linkend="freetype2"/>,
@@ -87 +93 @@
       <xref linkend="lua"/>,
       <ulink url="http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&amp;id=TECkitDownloads">TECkit</ulink>, and
-      <ulink url="http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&amp;cat_id=RenderingGraphite">
-    Graphite</ulink></para>
+      <xref linkend="graphite2"/>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:

xsoft/office/libreoffice.xml

@@ -162 +162 @@
       <xref linkend="dbus"/>,
       <xref linkend="expat"/>,
+      <xref linkend="graphite2"/>,
       <xref linkend="gst-plugins-base"/> or
       <xref linkend="gst10-plugins-base"/>,
+      <xref linkend="harfbuzz"/>,
       <xref linkend="icu"/>,
       <xref linkend="lcms2"/>,
@@ -187 +189 @@
       <xref linkend="doxygen"/> (not relevant if using --disable-odk),
       <ulink url="http://sourceforge.net/projects/cppunit/">Cppunit</ulink>,
-      <ulink url="http://sourceforge.net/projects/silgraphite/">Graphite2</ulink>,
       <xref linkend="gtk3"/>,
       <ulink url="http://hunspell.sourceforge.net/">Hunspell</ulink>,
@@ -334 +335 @@
              --with-system-curl          \
              --with-system-expat         \
+             --with-system-graphite      \
              --with-system-harfbuzz      \
              --with-system-icu           \