From 42c35b0b4d4db5049cad340f0a6572a22f898bbb Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Tue, 27 Feb 2018 05:50:46 +0000
Subject: [PATCH] Update to libgee-0.20.1. Update to libwacom-0.28. Update to
 xf86-input-wacom-0.36.0.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@19886 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general/genlib/libwacom.xml        |  6 +++---
 gnome.ent                          |  2 +-
 gnome/platform/geocode-glib.xml    | 12 +++++++-----
 gnome/platform/libgee.xml          | 10 +++++-----
 introduction/welcome/changelog.xml | 12 ++++++++++++
 packages.ent                       |  2 +-
 x/installing/x7driver-wacom.xml    |  8 ++++----
 7 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/general/genlib/libwacom.xml b/general/genlib/libwacom.xml
index 0d49b2efb0..7218d6b822 100644
--- a/general/genlib/libwacom.xml
+++ b/general/genlib/libwacom.xml
@@ -6,9 +6,9 @@
 
   <!ENTITY libwacom-download-http "&sourceforge-dl;/linuxwacom/libwacom-&libwacom-version;.tar.bz2">
   <!ENTITY libwacom-download-ftp  " ">
-  <!ENTITY libwacom-md5sum        "8c645b74e00b5b66e18723c2540c477f">
+  <!ENTITY libwacom-md5sum        "8273886ce9cc613b8cce3ee19788cd3b">
   <!ENTITY libwacom-size          "484 KB">
-  <!ENTITY libwacom-buildsize     "5.2 MB (with tests)">
+  <!ENTITY libwacom-buildsize     "5.3 MB (with tests)">
   <!ENTITY libwacom-time          "less than 0.1 SBU (with tests)">
 ]>
 
@@ -36,7 +36,7 @@
       to identify wacom tablets and their model-specific features.
     </para>
 
-    &lfs81_checked;
+    &lfs82_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/gnome.ent b/gnome.ent
index e4535bbdd7..d6d49ec132 100644
--- a/gnome.ent
+++ b/gnome.ent
@@ -31,7 +31,7 @@
 <!ENTITY grilo-version                     "0.3.4">
 <!ENTITY libchamplain-version              "0.12.16">
 <!ENTITY libgdata-version                  "0.17.9">
-<!ENTITY libgee-version                    "0.20.0">
+<!ENTITY libgee-version                    "0.20.1">
 <!ENTITY libgtop-version                   "2.38.0">
 <!ENTITY libgweather-version               "3.26.1">
 <!ENTITY libpeas-version                   "1.22.0">
diff --git a/gnome/platform/geocode-glib.xml b/gnome/platform/geocode-glib.xml
index f42663b594..49712d5a77 100644
--- a/gnome/platform/geocode-glib.xml
+++ b/gnome/platform/geocode-glib.xml
@@ -78,7 +78,8 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="json-glib"/> and
+      <xref linkend="gtk-doc"/>,
+      <xref linkend="json-glib"/>, and
       <xref linkend="libsoup"/>
     </para>
 
@@ -86,12 +87,13 @@
     <para role="recommended">
       <xref linkend="gobject-introspection"/>
     </para>
+    <!--
+    Install phase fails without gtk-doc.
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="gtk-doc"/>
     </para>
-
+    -->
     <para condition="html" role="usernotes">
       User Notes: <ulink url="&blfs-wiki;/geocode-glib"/>
     </para>
@@ -105,8 +107,8 @@
       commands:
     </para>
 
-<screen><userinput>mkdir build &amp;&amp;
-cd build &amp;&amp;
+    <screen><userinput>mkdir build            &amp;&amp;
+cd    build            &amp;&amp;
 meson --prefix /usr .. &amp;&amp;
 ninja</userinput></screen>
 
diff --git a/gnome/platform/libgee.xml b/gnome/platform/libgee.xml
index 9e7fc03a41..98fae918c7 100644
--- a/gnome/platform/libgee.xml
+++ b/gnome/platform/libgee.xml
@@ -6,10 +6,10 @@
 
   <!ENTITY libgee-download-http "&gnome-download-http;/libgee/0.20/libgee-&libgee-version;.tar.xz">
   <!ENTITY libgee-download-ftp  "&gnome-download-ftp;/libgee/0.20/libgee-&libgee-version;.tar.xz">
-  <!ENTITY libgee-md5sum        "66a4bfb6d7b03248acb99d140aac127d">
-  <!ENTITY libgee-size          "664 KB">
-  <!ENTITY libgee-buildsize     "192 MB (with tests)">
-  <!ENTITY libgee-time          "0.8 SBU (with tests)">
+  <!ENTITY libgee-md5sum        "d224dca55bb909f6730f40cc267337be">
+  <!ENTITY libgee-size          "668 KB">
+  <!ENTITY libgee-buildsize     "31 MB (add 3 MB for tests)">
+  <!ENTITY libgee-time          "0.1 SBU (using parallelism=4; add 0.7 SBU for tests)">
 ]>
 
 <sect1 id="libgee" xreflabel="libgee-&libgee-version;" revision="systemd">
@@ -35,7 +35,7 @@
       structures.
     </para>
 
-    &lfs81_checked;
+    &lfs82_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 7fa98f9ca1..a6ed83bce3 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -44,6 +44,18 @@
     <listitem>
       <para>February 26th, 2018</para>
      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to libgee-0.20.1. Fixes
+          <ulink url="&blfs-ticket-root;10368">#10368</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to libwacom-0.28. Fixes
+          <ulink url="&blfs-ticket-root;10352">#10352</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to xf86-input-wacom-0.36.0. Fixes
+          <ulink url="&blfs-ticket-root;10297">#10297</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[bdubbs] - Update to xfce4-terminal-0.8.7.1. Fixes
           <ulink url="&blfs-ticket-root;10426">#10426</ulink>.</para>
diff --git a/packages.ent b/packages.ent
index c712a60c8b..5ce7ae58aa 100644
--- a/packages.ent
+++ b/packages.ent
@@ -168,7 +168,7 @@ which is built separately after libxml2.so has been installed,
 to avoid building libxml2 twice, which is slow with all deps -->
 <!ENTITY libxml2-version              "2.9.7">
 <!ENTITY libxslt-version              "1.1.32">
-<!ENTITY libwacom-version             "0.27">
+<!ENTITY libwacom-version             "0.28">
 <!ENTITY libzeitgeist-version         "0.3.18">
 <!ENTITY lzo-version                  "2.10">
 <!ENTITY mtdev-version                "1.1.5">
diff --git a/x/installing/x7driver-wacom.xml b/x/installing/x7driver-wacom.xml
index 07ca4ab92b..2930d8f398 100644
--- a/x/installing/x7driver-wacom.xml
+++ b/x/installing/x7driver-wacom.xml
@@ -4,13 +4,13 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY xorg-wacom-driver-version "0.35.0">
+  <!ENTITY xorg-wacom-driver-version "0.36.0">
 
   <!ENTITY xorg-wacom-driver-download-http "&sourceforge-dl;/linuxwacom/xf86-input-wacom-&xorg-wacom-driver-version;.tar.bz2">
   <!ENTITY xorg-wacom-driver-download-ftp  " ">
-  <!ENTITY xorg-wacom-driver-md5sum        "cb137465f139bb014883b0d7b0c500b2">
-  <!ENTITY xorg-wacom-driver-size          "588 KB">
-  <!ENTITY xorg-wacom-driver-buildsize     "11 MB (with tests)">
+  <!ENTITY xorg-wacom-driver-md5sum        "d1d45f05cf1877b181dc324ce1deb7e9">
+  <!ENTITY xorg-wacom-driver-size          "600 KB">
+  <!ENTITY xorg-wacom-driver-buildsize     "10 MB (with tests)">
   <!ENTITY xorg-wacom-driver-time          "0.1 SBU (with tests)">
 ]>