From c5ebc8aca100e05cd872a6d033df7988a78a3758 Mon Sep 17 00:00:00 2001
From: "Douglas R. Reno" <renodr@linuxfromscratch.org>
Date: Mon, 30 May 2016 03:57:20 +0000
Subject: [PATCH] (systemd) Update to gcab-0.7 (both) Update to glib-2.48.1
 (both) Update to libXfixes-5.0.2

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@17406 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general/genlib/glib2.xml           | 18 +++++++++---------
 introduction/welcome/changelog.xml | 13 +++++++++++++
 packages.ent                       |  2 +-
 x/installing/x7lib.xml             |  4 ++--
 4 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/general/genlib/glib2.xml b/general/genlib/glib2.xml
index 5024c710c7..c310eaf1d4 100644
--- a/general/genlib/glib2.xml
+++ b/general/genlib/glib2.xml
@@ -6,10 +6,10 @@
 
   <!ENTITY glib2-download-http "&gnome-download-http;/glib/2.48/glib-&glib2-version;.tar.xz">
   <!ENTITY glib2-download-ftp  "&gnome-download-ftp;/glib/2.48/glib-&glib2-version;.tar.xz">
-  <!ENTITY glib2-md5sum        "093a586f37d2853bdb129231e1b350e0">
+  <!ENTITY glib2-md5sum        "67bd3b75c9f6d5587b487dc01cdcd5bb">
   <!ENTITY glib2-size          "7.1 MB">
-  <!ENTITY glib2-buildsize     "143 MB (additional 71 MB for tests)">
-  <!ENTITY glib2-time          "1.1 SBU (additional 4.4 SBU for tests)">
+  <!ENTITY glib2-buildsize     "191 MB (additional 70 MB for tests)">
+  <!ENTITY glib2-time          "1.0 SBU (additional 2.7 SBU for tests)">
 ]>
 
 <sect1 id="glib2" xreflabel="GLib-&glib2-version;">
@@ -205,7 +205,7 @@ make</userinput></screen>
         <term><command>gapplication</command></term>
         <listitem>
           <para>
-            can be used to start applications and can be used to send
+            can be used to start applications and to send
             messages to already-running instances of other applications.
           </para>
           <indexterm zone="glib2 gapplication">
@@ -243,9 +243,9 @@ make</userinput></screen>
         <term><command>gio-querymodules</command></term>
         <listitem>
           <para>
-            is used to create a giomodule.cache file in the listed directories.
-            This file lists the implemented extension points for each module
-            that has been found.
+            is used to create a <filename>giomodule.cache</filename> file in 
+            the listed directories. This file lists the implemented extension 
+            points for each module that has been found.
           </para>
           <indexterm zone="glib2 gio-querymodules">
             <primary sortas="b-gio-querymodules">gio-querymodules</primary>
@@ -272,8 +272,8 @@ make</userinput></screen>
         <listitem>
           <para>
             is used to compile all the GSettings XML schema files
-            in directory into a binary file with the name gschemas.compiled
-            that can be used by GSettings.
+            in directory into a binary file with the name 
+            <filename>gschemas.compiled</filename> that can be used by GSettings.
           </para>
           <indexterm zone="glib2 glib-compile-schemas">
             <primary sortas="b-glib-compile-resources">glib-compile-schemas</primary>
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 503bd929ff..30aaf8e117 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -43,6 +43,19 @@
     </listitem>
 
 -->
+    <listitem>
+      <para>May 29th, 2016</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Update to glib-2.48.1. Fixes
+          <ulink url="&blfs-ticket-root;7850">#7850</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to libXfixes-5.0.2. Fixes
+          <ulink url="&blfs-ticket-root;7883">#7883</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
 
     <listitem>
       <para>May 27th, 2016</para>
diff --git a/packages.ent b/packages.ent
index 541e0e091f..c20f2dbfad 100644
--- a/packages.ent
+++ b/packages.ent
@@ -89,7 +89,7 @@
 <!ENTITY enchant-version              "1.6.0">
 <!ENTITY exempi-version               "2.3.0">
 <!ENTITY expat-version                "2.1.0">
-<!ENTITY glib2-version                "2.48.0">
+<!ENTITY glib2-version                "2.48.1">
 <!ENTITY glibmm-version               "2.48.1">
 <!ENTITY gmime-version                "2.6.20">
 <!ENTITY gobject-introspection-version "1.48.0">
diff --git a/x/installing/x7lib.xml b/x/installing/x7lib.xml
index 59070f6284..43f0c6c5c1 100644
--- a/x/installing/x7lib.xml
+++ b/x/installing/x7lib.xml
@@ -43,8 +43,8 @@
   <!ENTITY libXaw-version                  "1.0.13">
   <!ENTITY libXaw-md5sum                   "e5e06eb14a608b58746bdd1c0bd7b8e3">
 
-  <!ENTITY libXfixes-version               "5.0.1">
-  <!ENTITY libXfixes-md5sum                "b985b85f8b9386c85ddcfe1073906b4d">
+  <!ENTITY libXfixes-version               "5.0.2">
+  <!ENTITY libXfixes-md5sum                "544d73df94e638ba7b64147be416e576">
 
   <!ENTITY libXcomposite-version           "0.4.4">
   <!ENTITY libXcomposite-md5sum            "f7a218dcbf6f0848599c6c36fc65c51a">