From 4e0c76b37765ad998b5ae72fc6f5441792818d78 Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Sat, 21 May 2022 20:46:55 -0500
Subject: [PATCH] Update to gnome-keyring-42.0.

---
 gnome.ent                          |  2 +-
 gnome/platform/gnome-keyring.xml   | 21 ++++++++++++---------
 introduction/welcome/changelog.xml |  4 ++++
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/gnome.ent b/gnome.ent
index 207080490e..4f6532c836 100644
--- a/gnome.ent
+++ b/gnome.ent
@@ -64,7 +64,7 @@
 <!ENTITY nautilus-version                  "42.1.1">
 <!ENTITY zenity-version                    "3.42.1">
 <!ENTITY gnome-bluetooth-version           "42.0">
-<!ENTITY gnome-keyring-version             "40.0">
+<!ENTITY gnome-keyring-version             "42.0">
 <!ENTITY gnome-settings-daemon-version     "42.1">
 <!ENTITY gnome-control-center-version      "42.1">
 <!ENTITY mutter-version                    "42.1">
diff --git a/gnome/platform/gnome-keyring.xml b/gnome/platform/gnome-keyring.xml
index a08bed5bbd..d92d08285c 100644
--- a/gnome/platform/gnome-keyring.xml
+++ b/gnome/platform/gnome-keyring.xml
@@ -8,9 +8,9 @@
            "&gnome-download-http;/gnome-keyring/&gnome-40;/gnome-keyring-&gnome-keyring-version;.tar.xz">
   <!ENTITY gnome-keyring-download-ftp
            "&gnome-download-ftp;/gnome-keyring/&gnome-40;/gnome-keyring-&gnome-keyring-version;.tar.xz">
-  <!ENTITY gnome-keyring-md5sum        "f404b61683a0ff54fb264b337772cff2">
+  <!ENTITY gnome-keyring-md5sum        "dd3a191a2f61a14ca67ad6e2a3e6287e">
   <!ENTITY gnome-keyring-size          "1.3 MB">
-  <!ENTITY gnome-keyring-buildsize     "155 MB">
+  <!ENTITY gnome-keyring-buildsize     "116 MB">
   <!ENTITY gnome-keyring-time          "0.2 SBU (Using parallelism=4; add 0.3 SBU for tests)">
 ]>
 
@@ -102,6 +102,16 @@
   <sect2 role="installation">
     <title>Installation of GNOME Keyring</title>
 
+    <para>
+      First, fix a packaging error:
+    </para>
+
+<!-- This could be shortened to sed -i 's:/home.*dbus/::' daemon/dbus/*generated.c
+     but I expect a release of 42.1 soon to fix the problem.  -->
+
+<screen><userinput>sed -e 's:/home/niels/jhbuild/checkout/gnome-keyring/daemon/dbus/::' \
+    -i daemon/dbus/*generated.c</userinput></screen>
+
     <para>
       Install <application>GNOME Keyring</application> by running the
       following commands:
@@ -134,13 +144,6 @@ make</userinput></screen>
       deprecated entry in the schema template.
     </para>
 
-    <!-- FIXME: Removed with usr-merge
-    <para>
-      <parameter>- -with-pam-dir=/lib/security</parameter>: This switch
-      specifies where the PAM module will be installed.
-    </para>
-    -->
-
   </sect2>
 
   <sect2 role="content">
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index f9d59143b0..64a74aeb5b 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -45,6 +45,10 @@
     <listitem>
       <para>May 21st, 2022</para>
       <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to gnome-keyring-42.0. Fixes
+          <ulink url="&blfs-ticket-root;16565">#16565</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[bdubbs] - Update to seahorse-42.0. Fixes
           <ulink url="&blfs-ticket-root;16568">#16568</ulink>.</para>