From 0cce05931f10d49929a82b07fb9126754f5420e6 Mon Sep 17 00:00:00 2001
From: Ken Moffat <ken@linuxfromscratch.org>
Date: Sun, 18 Feb 2018 23:54:16 +0000
Subject: [PATCH] Update to pcre2-10.31 and gtk+-3.22.28.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@19797 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general/genlib/pcre2.xml           |  6 +++---
 introduction/welcome/changelog.xml |  8 ++++++++
 packages.ent                       |  4 ++--
 x/lib/gtk+3.xml                    | 10 +++++-----
 4 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/general/genlib/pcre2.xml b/general/genlib/pcre2.xml
index cd8305e5fd..3acaed7ac6 100644
--- a/general/genlib/pcre2.xml
+++ b/general/genlib/pcre2.xml
@@ -6,9 +6,9 @@
 
   <!ENTITY pcre2-download-http "&sourceforge-dl;/pcre/pcre2-&pcre2-version;.tar.bz2">
   <!ENTITY pcre2-download-ftp  "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre2-&pcre2-version;.tar.bz2">
-  <!ENTITY pcre2-md5sum        "d3adf4b130eed854a530390f00020a65">
-  <!ENTITY pcre2-size          "1.5 MB">
-  <!ENTITY pcre2-buildsize     "15 MB (with tests)">
+  <!ENTITY pcre2-md5sum        "e0b91c891a3c49050f7fd15de33d0ba4">
+  <!ENTITY pcre2-size          "1.6 MB">
+  <!ENTITY pcre2-buildsize     "19 MB (with tests)">
   <!ENTITY pcre2-time          "0.3 SBU (with tests)">
 ]>
 
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 431036eed7..90728c091b 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -44,6 +44,14 @@
     <listitem>
       <para>February 18th, 2018</para>
       <itemizedlist>
+        <listitem>
+          <para>[ken] - Update to gtk+-3.22.28. Fixes
+          <ulink url="&blfs-ticket-root;10396">#10396</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[ken] - Update to pcre2-10.31. Fixes
+          <ulink url="&blfs-ticket-root;10370">#10370</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[bdubbs] - Update to dbus-1.12.4. Fixes 
           <ulink url="&blfs-ticket-root;10358">#10358</ulink>.</para>
diff --git a/packages.ent b/packages.ent
index 3a2d823eb5..bc1461e5a6 100644
--- a/packages.ent
+++ b/packages.ent
@@ -177,7 +177,7 @@ to avoid building libxml2 twice, which is slow with all deps -->
 <!ENTITY nspr-version                 "4.18">
 <!ENTITY openobex-version             "1.7.2">
 <!ENTITY pcre-version                 "8.41">
-<!ENTITY pcre2-version                "10.30">
+<!ENTITY pcre2-version                "10.31">
 <!ENTITY popt-version                 "1.16">
 <!ENTITY pth-version                  "2.0.7">
 <!ENTITY ptlib-version                "2.10.11">
@@ -564,7 +564,7 @@ to avoid building libxml2 twice, which is slow with all deps -->
 <!ENTITY glu-version                  "9.0.0">
 <!ENTITY goffice010-version           "0.10.38">
 <!ENTITY gtk2-version                 "2.24.32">
-<!ENTITY gtk3-version                 "3.22.26">
+<!ENTITY gtk3-version                 "3.22.28">
 <!ENTITY gtk-engines-version          "2.20.2">
 <!ENTITY gtkmm2-version               "2.24.5">
 <!ENTITY gtkmm3-version               "3.22.2">
diff --git a/x/lib/gtk+3.xml b/x/lib/gtk+3.xml
index d4b7b0d3a5..f6d4a03985 100644
--- a/x/lib/gtk+3.xml
+++ b/x/lib/gtk+3.xml
@@ -6,10 +6,10 @@
 
   <!ENTITY gtk3-download-http "&gnome-download-http;/gtk+/&gnome-minor-22;/gtk+-&gtk3-version;.tar.xz">
   <!ENTITY gtk3-download-ftp  "&gnome-download-ftp;/gtk+/&gnome-minor-22;/gtk+-&gtk3-version;.tar.xz">
-  <!ENTITY gtk3-md5sum        "eeeb8038fe0d386c7516fa46cd4fff6b">
-  <!ENTITY gtk3-size          "18 MB">
-  <!ENTITY gtk3-buildsize     "430 MB (add 9 MB for tests)">
-  <!ENTITY gtk3-time          "1.8 SBU (using parallelism=4, add 0.5 SBU for tests)">
+  <!ENTITY gtk3-md5sum        "8c1f5ab987ddc7dab3e59660f89dcd9b">
+  <!ENTITY gtk3-size          "22 MB">
+  <!ENTITY gtk3-buildsize     "548 MB (add 8 MB for tests)">
+  <!ENTITY gtk3-time          "1.8 SBU (using parallelism=4, add 0.6 SBU for tests)">
 ]>
 
 <sect1 id="gtk3" xreflabel="GTK+-&gtk3-version;">
@@ -162,7 +162,7 @@ make</userinput></screen>
     <para>
       To test the results you need a graphical session, then issue
       <command>make -k check</command>. 
-      Two gtk-reftest tests are known to fail.
+      Several gtk-reftest tests are known to fail.
     </para>
 
     <para>