Changeset 64e1bfa

Timestamp:

12/01/2014 08:07:56 PM (9 years ago)

Author:

Christopher Gregory <cjg@…>

Branches:

systemd-13485

Children:

dd175a62

Parents:

4237db8

Message:

Updated to fontforge-20141126.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/systemd@15104 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:

• packages.ent (modified) (1 diff)
• xsoft/other/fontforge-systemd.xml (moved) (moved from xsoft/other/fontforge.xml ) (5 diffs)
• xsoft/other/other.xml (modified) (1 diff)

packages.ent

@@ -589 +589 @@
 <!ENTITY balsa-version                "2.5.1">
 <!ENTITY ekiga-version                "4.0.1">
-<!ENTITY fontforge-version            "2.0.20140101">
+<!ENTITY fontforge-version            "20141126">
 <!ENTITY gparted-version              "0.20.0">
 <!ENTITY gnash-version                "0.8.10">

xsoft/other/fontforge-systemd.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY fontforge-download-http "&sources-anduin-other-http;/fontforge-&fontforge-version;.tar.xz">
+  <!ENTITY fontforge-download-http "https://github.com/fontforge/fontforge/releases/download/20141126/fontforge-2014-11-26-Unix-Source.tar.gz">
   <!ENTITY fontforge-download-ftp  " ">
-  <!ENTITY fontforge-md5sum        "024ebb9dca824154fc19310b675f9d50">
-  <!ENTITY fontforge-size          "14 MB">
-  <!ENTITY fontforge-buildsize     "235 MB">
-  <!ENTITY fontforge-time          "2.2 SBU">
+  <!ENTITY fontforge-md5sum        "2193a30700a56aa7c466407ac37ce0e3">
+  <!ENTITY fontforge-size          "119.2 MB">
+  <!ENTITY fontforge-buildsize     "354.8 MB">
+  <!ENTITY fontforge-time          "3.9 SBU">
 ]>
 
@@ -73 +73 @@
     </itemizedlist>
 
-    <para>
-      The <application>FontForge</application> tarball specified above was not
-      generated by the <application>FontForge</application> maintainers. It
-      was created by the BLFS team by pulling a Git version and then generating 
-      the autotools components and documentation. The BLFS team made no changes 
-      to the existing source files.
-    </para>
+    <note>
+    <para>
+      The <application>FontForge</application> tarball extracts 
+      to fontforge-20141126.
+    </para>
+    </note>
 
     <bridgehead renderas="sect3">FontForge Dependencies</bridgehead>
@@ -87 +86 @@
       <xref linkend="cairo"/>,
       <xref linkend="freetype2"/>,
+      <xref linkend="harfbuzz"/>,
+      <xref linkend="gtk2"/>,      
       <xref linkend="libxml2"/> and
       <xref linkend="xorg7-lib"/>
@@ -116 +117 @@
 
     <para>
-      First, fix building with recent versions of <application>Giflib</application>:
-    </para>
-
-<screen><userinput>sed "/DGifCloseFile/s:gif:&amp;, NULL:g" -i gutils/gimagereadgif.c</userinput></screen>
-
-    <para>
       Install <application>FontForge</application> by running the following
       commands:
     </para>
 
-<screen><userinput>./configure --prefix=/usr    \
+<screen><userinput>./bootstrap --force &amp;&amp;
+./configure --prefix=/usr    \
             --disable-static \
+            --enable-gtk2-use \
             --docdir=/usr/share/doc/fontforge-&fontforge-version; &amp;&amp;
 make</userinput></screen>
 
     <para>
-      To test the results, issue: <command>make -k check</command>. Test 32
-      fails for unknown reasons.
+      To test the results, issue: <command>make -k check</command>.
     </para>
 
@@ -142 +138 @@
 <screen role="root"><userinput>make install</userinput></screen>
 
-    <para>
-      If desired, install desktop support files as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>rm -rf desktop/icons/src &amp;&amp;
-cp -rf desktop/icons/* /usr/share/icons/hicolor &amp;&amp;
-install -Dm644 desktop/fontforge.desktop /usr/share/applications/fontforge.desktop &amp;&amp;
-install -Dm644 desktop/fontforge.xml /usr/share/mime/packages/fontforge.xml</userinput></screen>
 
   </sect2>

xsoft/other/other.xml

@@ -21 +21 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="balsa.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ekiga.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="fontforge.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="fontforge-systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gimp-systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnash.xml"/>