From 00f3d9a29964ea1685551dd6b8f0bbe57a953187 Mon Sep 17 00:00:00 2001
From: Fernando de Oliveira <fernando@linuxfromscratch.org>
Date: Sat, 29 Nov 2014 00:24:36 +0000
Subject: [PATCH] Update to fontforge-20141126. Update to
 gnome-themes-standard-3.14.2.2.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@15038 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general.ent                              |  4 +--
 gnome.ent                                |  2 +-
 gnome/platform/gnome-themes-standard.xml |  4 +--
 introduction/welcome/changelog.xml       | 14 +++++++++++
 packages.ent                             |  4 +--
 xsoft/other/fontforge.xml                | 32 ++++++++++++++++++------
 6 files changed, 45 insertions(+), 15 deletions(-)

diff --git a/general.ent b/general.ent
index 495780935e..9a297948df 100644
--- a/general.ent
+++ b/general.ent
@@ -1,12 +1,12 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "27">                   <!-- Always 2 digits -->
+<!ENTITY day          "28">                   <!-- Always 2 digits -->
 <!ENTITY month        "11">                   <!-- Always 2 digits -->
 <!ENTITY year         "2014">
 <!ENTITY copyrightdate "2001-&year;">
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "November 27th, &year;">
+<!ENTITY releasedate  "November 28th, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
 <!ENTITY lfs-version  "development">          <!-- x.y|development] -->
diff --git a/gnome.ent b/gnome.ent
index 10ba93fa12..ad92919403 100644
--- a/gnome.ent
+++ b/gnome.ent
@@ -27,7 +27,7 @@
 <!ENTITY gnome-icon-theme-version          "3.12.0">
 <!ENTITY gnome-icon-theme-extras-version   "3.12.0">
 <!ENTITY gnome-icon-theme-symbolic-version "3.12.0">
-<!ENTITY gnome-themes-standard-version     "3.14.2.1">
+<!ENTITY gnome-themes-standard-version     "3.14.2.2">
 <!ENTITY yelp-version                      "3.14.1">
 
 <!-- Chapter 31 -->
diff --git a/gnome/platform/gnome-themes-standard.xml b/gnome/platform/gnome-themes-standard.xml
index c7ed764dac..9b1e302244 100644
--- a/gnome/platform/gnome-themes-standard.xml
+++ b/gnome/platform/gnome-themes-standard.xml
@@ -8,10 +8,10 @@
    "&gnome-download-http;/gnome-themes-standard/&gnome-minor-14;/gnome-themes-standard-&gnome-themes-standard-version;.tar.xz">
   <!ENTITY gnome-themes-standard-download-ftp
    "&gnome-download-ftp;/gnome-themes-standard/&gnome-minor-14;/gnome-themes-standard-&gnome-themes-standard-version;.tar.xz">
-  <!ENTITY gnome-themes-standard-md5sum        "ba3fb89c32e35d05bf794e00ad2a7336">
+  <!ENTITY gnome-themes-standard-md5sum        "69988f762a50745f89f768db9d2d9df1">
   <!ENTITY gnome-themes-standard-size          "2.8 MB">
   <!ENTITY gnome-themes-standard-buildsize     "39 MB">
-  <!ENTITY gnome-themes-standard-time          "0.6 SBU">
+  <!ENTITY gnome-themes-standard-time          "0.7 SBU">
 ]>
 
 <sect1 id="gnome-themes-standard" xreflabel="gnome-themes-standard-&gnome-themes-standard-version;">
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 3c8fdf3ae5..9d23771aef 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -44,6 +44,20 @@
 
 -->
 
+    <listitem>
+      <para>November 28th, 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[fernando] - Update to gnome-themes-standard-3.14.2.2. Fixes
+          <ulink url="&blfs-ticket-root;5881">#5881</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - Update to fontforge-20141126. Fixes
+          <ulink url="&blfs-ticket-root;5877">#5877</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>November 27th, 2014</para>
       <itemizedlist>
diff --git a/packages.ent b/packages.ent
index a9c66a1445..710bbf690d 100644
--- a/packages.ent
+++ b/packages.ent
@@ -592,8 +592,8 @@
 <!-- Chapter 36 -->
 <!ENTITY balsa-version                "2.5.1">
 <!ENTITY ekiga-version                "4.0.1">
-<!ENTITY fontforge-date               "20141014">
-<!ENTITY fontforge-version            "2.0.&fontforge-date;">
+<!ENTITY fontforge-date               "2014-11-26">
+<!ENTITY fontforge-version            "20141126">
 <!ENTITY gparted-version              "0.20.0">
 <!ENTITY gnash-version                "0.8.10">
 <!ENTITY gimp-version                 "2.8.14">
diff --git a/xsoft/other/fontforge.xml b/xsoft/other/fontforge.xml
index 8c1c007fa5..b2e07a7a45 100644
--- a/xsoft/other/fontforge.xml
+++ b/xsoft/other/fontforge.xml
@@ -5,12 +5,12 @@
   %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/&fontforge-date;/fontforge-&fontforge-date;.tar.gz">
+  <!ENTITY fontforge-download-http "https://github.com/fontforge/fontforge/releases/download/&fontforge-version;/fontforge-&fontforge-date;-Unix-Source.tar.gz">
   <!ENTITY fontforge-download-ftp  " ">
-  <!ENTITY fontforge-md5sum        "2a9c7a8d88868fa6b421ab779e973f6d">
-  <!ENTITY fontforge-size          "118 MB">
-  <!ENTITY fontforge-buildsize     "353M MB (additional 1 MB for the tests)">
-  <!ENTITY fontforge-time          "2.1 SBU (additional 0.2 SBU for the tests)">
+  <!ENTITY fontforge-md5sum        "2193a30700a56aa7c466407ac37ce0e3">
+  <!ENTITY fontforge-size          "120 MB">
+  <!ENTITY fontforge-buildsize     "355">
+  <!ENTITY fontforge-time          "2.1 SBU (additional 0.3 SBU for the tests)">
 ]>
 
 <sect1 id="fontforge" xreflabel="FontForge-&fontforge-version;">
@@ -40,6 +40,21 @@
     &lfs76_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
+
+    <note>
+
+      <para>The download link below obtains
+      <filename>fontforge-&fontforge-date;-Unix-Source.tar.gz</filename>. This
+      is not the correct name for the archive, because it saves the file as
+      <filename class="directory">fontforge-&fontforge-version;</filename>. The
+      file should be renamed to the correct filename
+      <filename>fontforge-&fontforge-version;.tar.gz</filename>. You can
+      achieve this automatically by using the command:</para>
+    
+ <screen><userinput> wget -c <ulink url="&fontforge-download-http;"/> \
+      -O fontforge-&fontforge-version;.tar.gz</userinput></screen>
+    </note>
+
     <itemizedlist spacing="compact">
       <listitem>
         <para>
@@ -126,7 +141,7 @@
 ./configure --prefix=/usr     \
             --enable-gtk2-use \
             --disable-static  \
-            --docdir=/usr/share/doc/fontforge-&fontforge-date; &amp;&amp;
+            --docdir=/usr/share/doc/fontforge-&fontforge-version; &amp;&amp;
 make</userinput></screen>
 
     <para>
@@ -155,11 +170,12 @@ make</userinput></screen>
         </seg>
         <seg>
           libfontforgeexe.so, libfontforge.so, libgdraw.so,
-          libgioftp.so, libgunicode.so and libgutils.so
+          libgioftp.so, libgunicode.so, libgutils.so, and
+          /usr/lib/python&python2-majorver;/site-packages/{fontforge,psMat}.so
         </seg>
         <seg>
           /usr/include/fontforge,
-          /usr/share/doc/fontforge-&fontforge-date; and
+          /usr/share/doc/fontforge-&fontforge-version; and
           /usr/share/fontforge
         </seg>
       </seglistitem>