From 9499bbf062c5c00468574dbffcf79a5cfab3ac19 Mon Sep 17 00:00:00 2001
From: "Douglas R. Reno" <renodr@linuxfromscratch.org>
Date: Thu, 24 Feb 2022 23:19:56 -0600
Subject: [PATCH] Package Updates and Tags

Update to colord-gtk-0.3.0
Update to mutter-41.4
Update to gnome-shell-extensions-41.2
Update to gnome-shell-41.4
---
 gnome.ent                                 |  6 ++--
 gnome/applications/gnome-logs.xml         |  2 +-
 gnome/platform/gnome-shell-extensions.xml | 10 ++++--
 gnome/platform/gnome-shell.xml            |  8 ++---
 gnome/platform/mutter.xml                 | 11 +++---
 introduction/welcome/changelog.xml        | 16 +++++++++
 packages.ent                              |  2 +-
 x/lib/colord-gtk.xml                      | 41 ++++++++++++++++++-----
 8 files changed, 69 insertions(+), 27 deletions(-)

diff --git a/gnome.ent b/gnome.ent
index a44406f922..4923bb3305 100644
--- a/gnome.ent
+++ b/gnome.ent
@@ -64,9 +64,9 @@
 <!ENTITY gnome-keyring-version             "40.0">
 <!ENTITY gnome-settings-daemon-version     "41.0">
 <!ENTITY gnome-control-center-version      "41.4">
-<!ENTITY mutter-version                    "41.3">
-<!ENTITY gnome-shell-version               "41.3">
-<!ENTITY gnome-shell-extensions-version    "41.1">
+<!ENTITY mutter-version                    "41.4">
+<!ENTITY gnome-shell-version               "41.4">
+<!ENTITY gnome-shell-extensions-version    "41.2">
 <!ENTITY gnome-session-version             "41.3">
 <!ENTITY gdm-version                       "41.3">
 <!ENTITY gnome-user-docs-version           "41.2">
diff --git a/gnome/applications/gnome-logs.xml b/gnome/applications/gnome-logs.xml
index 072f2ad626..3a5326ab48 100644
--- a/gnome/applications/gnome-logs.xml
+++ b/gnome/applications/gnome-logs.xml
@@ -37,7 +37,7 @@
       for the systemd journal.
     </para>
 
-    &lfs110a_checked;
+    &lfs111_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/gnome/platform/gnome-shell-extensions.xml b/gnome/platform/gnome-shell-extensions.xml
index 0859a3db92..5a672d0946 100644
--- a/gnome/platform/gnome-shell-extensions.xml
+++ b/gnome/platform/gnome-shell-extensions.xml
@@ -8,8 +8,8 @@
            "&gnome-download-http;/gnome-shell-extensions/&gnome-41;/gnome-shell-extensions-&gnome-shell-extensions-version;.tar.xz">
   <!ENTITY gnome-shell-extensions-download-ftp
            "&gnome-download-ftp;/gnome-shell-extensions/&gnome-41;/gnome-shell-extensions-&gnome-shell-extensions-version;.tar.xz">
-  <!ENTITY gnome-shell-extensions-md5sum        "2e47b5cc0ee28246fe655bc0fa0e8419">
-  <!ENTITY gnome-shell-extensions-size          "216 KB">
+  <!ENTITY gnome-shell-extensions-md5sum        "9178c6aa39e2ba5471acf895a0825ad9">
+  <!ENTITY gnome-shell-extensions-size          "220 KB">
   <!ENTITY gnome-shell-extensions-buildsize     "5.2 MB">
   <!ENTITY gnome-shell-extensions-time          "less than 0.1 SBU">
 ]>
@@ -36,7 +36,7 @@
       functionality to the <application>GNOME Shell</application>.
     </para>
 
-    &lfs110a_checked;
+    &lfs111_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -72,6 +72,7 @@
       </listitem>
     </itemizedlist>
 
+    <!--
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
@@ -81,6 +82,7 @@
         </para>
       </listitem>
     </itemizedlist>
+    -->
 
     <bridgehead renderas="sect3">GNOME Shell Extensions Dependencies</bridgehead>
 
@@ -102,12 +104,14 @@
   <sect2 role="installation">
     <title>Installation of GNOME Shell Extensions</title>
 
+    <!--
     <para>
       First, fix an issue in the window-list extension that causes icons to not
       be displayed at the bottom for open applications:
     </para>
 
 <screen><userinput remap="pre">patch -Np1 -i ../gnome-shell-extensions-&gnome-shell-extensions-version;-upstream_fix-1.patch</userinput></screen>
+    -->
 
     <para>
       Install <application>GNOME Shell Extensions</application> by running the
diff --git a/gnome/platform/gnome-shell.xml b/gnome/platform/gnome-shell.xml
index 998f9aaa46..cafcee7c75 100644
--- a/gnome/platform/gnome-shell.xml
+++ b/gnome/platform/gnome-shell.xml
@@ -8,10 +8,10 @@
            "&gnome-download-http;/gnome-shell/&gnome-41;/gnome-shell-&gnome-shell-version;.tar.xz">
   <!ENTITY gnome-shell-download-ftp
            "&gnome-download-ftp;/gnome-shell/&gnome-41;/gnome-shell-&gnome-shell-version;.tar.xz">
-  <!ENTITY gnome-shell-md5sum        "eeed229dd4b05715dd0561e99a4a4041">
+  <!ENTITY gnome-shell-md5sum        "9f49da92233a918d9dd4fe9d736f285c">
   <!ENTITY gnome-shell-size          "1.8 MB">
-  <!ENTITY gnome-shell-buildsize     "71 MB (including tests)">
-  <!ENTITY gnome-shell-time          "0.2 SBU (Using parallelism=4, with tests)">
+  <!ENTITY gnome-shell-buildsize     "70 MB">
+  <!ENTITY gnome-shell-time          "0.2 SBU (Using parallelism=4)">
 ]>
 
 <sect1 id="gnome-shell" xreflabel="gnome-shell-&gnome-shell-version;">
@@ -35,7 +35,7 @@
       the <application>GNOME</application> Desktop environment.
     </para>
 
-    &lfs110a_checked;
+    &lfs111_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/gnome/platform/mutter.xml b/gnome/platform/mutter.xml
index 896f000e84..4d3ddc589d 100644
--- a/gnome/platform/mutter.xml
+++ b/gnome/platform/mutter.xml
@@ -6,10 +6,10 @@
 
   <!ENTITY mutter-download-http "&gnome-download-http;/mutter/&gnome-41;/mutter-&mutter-version;.tar.xz">
   <!ENTITY mutter-download-ftp  "&gnome-download-ftp;/mutter/&gnome-41;/mutter-&mutter-version;.tar.xz">
-  <!ENTITY mutter-md5sum        "14325de1366970d28d140feff4f79101">
+  <!ENTITY mutter-md5sum        "49766d24a63cb9ca3f6bf20c188ca9a5">
   <!ENTITY mutter-size          "2.6 MB">
-  <!ENTITY mutter-buildsize     "176 MB">
-  <!ENTITY mutter-time          "2.2 SBU (Using parallelism=4)">
+  <!ENTITY mutter-buildsize     "75 MB">
+  <!ENTITY mutter-time          "0.6 SBU (Using parallelism=4)">
 ]>
 
 <sect1 id="mutter" xreflabel="Mutter-&mutter-version;">
@@ -35,7 +35,7 @@
       machine with a hardware accelerated video driver).
     </para>
 
-    &lfs110a_checked;
+    &lfs111_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -241,8 +241,7 @@ ninja</userinput></screen>
           mutter
         </seg>
         <seg>
-          libmutter-9.so and
-          libmutter-test-9.so
+          libmutter-9.so
         </seg>
         <seg>
           /usr/{lib,include,libexec/installed-tests,share/{installed-tests}}/mutter-9
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 59e7c2c5e1..3ac7b66f72 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -44,6 +44,22 @@
     <listitem>
       <para>February 24th, 2022</para>
       <itemizedlist>
+        <listitem>
+          <para>[renodr] - Update to gnome-shell-extensions-41.2. Fixes
+          <ulink url="&blfs-ticket-root;16114">#16114</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to gnome-shell-41.4. Fixes
+          <ulink url="&blfs-ticket-root;16113">#16113</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to mutter-41.4. Fixes
+          <ulink url="&blfs-ticket-root;16115">#16115</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to colord-gtk-0.3.0. Fixes
+          <ulink url="&blfs-ticket-root;16120">#16120</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[ken] - Update to mutt-2.2.1. Fixes
           <ulink url="&blfs-ticket-root;16147">#16147</ulink>.</para>
diff --git a/packages.ent b/packages.ent
index 957a0159cf..98252f98a2 100644
--- a/packages.ent
+++ b/packages.ent
@@ -749,7 +749,7 @@ to avoid building libxml2 twice, which is slow with all deps -->
 <!ENTITY clutter-version              "1.26.4">
 <!ENTITY clutter-gst-version          "3.0.27">
 <!ENTITY clutter-gtk-version          "1.8.4">
-<!ENTITY colord-gtk-version           "0.2.0">
+<!ENTITY colord-gtk-version           "0.3.0">
 <!ENTITY fltk-version                 "1.3.8">
 <!ENTITY freeglut-version             "3.2.2">
 <!ENTITY gdk-pixbuf-version           "2.42.6">
diff --git a/x/lib/colord-gtk.xml b/x/lib/colord-gtk.xml
index 0e07c7bb41..be0037fb22 100644
--- a/x/lib/colord-gtk.xml
+++ b/x/lib/colord-gtk.xml
@@ -6,9 +6,9 @@
 
   <!ENTITY colord-gtk-download-http "https://www.freedesktop.org/software/colord/releases/colord-gtk-&colord-gtk-version;.tar.xz">
   <!ENTITY colord-gtk-download-ftp  " ">
-  <!ENTITY colord-gtk-md5sum        "66d048803c8b89e5e63da4b461484933">
-  <!ENTITY colord-gtk-size          "20 KB">
-  <!ENTITY colord-gtk-buildsize     "41 MB">
+  <!ENTITY colord-gtk-md5sum        "08c245d6482b3923a2b6a09f7fbbe612">
+  <!ENTITY colord-gtk-size          "24 KB">
+  <!ENTITY colord-gtk-buildsize     "6.1 MB">
   <!ENTITY colord-gtk-time          "less than 0.1 SBU">
 ]>
 
@@ -34,7 +34,7 @@
       <application>Colord</application>.
     </para>
 
-    &lfs110a_checked;
+    &lfs111_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -81,7 +81,8 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
       <xref linkend="gobject-introspection"/>,
-      <xref linkend="gtk2"/>, and
+      <xref linkend="gtk2"/>,
+      <xref linkend="gtk4"/>, and
       <xref linkend="vala"/>
     </para>
 
@@ -116,6 +117,7 @@ cd    build &amp;&amp;
 meson --prefix=/usr       \
       --buildtype=release \
       -Dgtk2=true         \
+      -Dgtk4=true         \
       -Dvapi=true         \
       -Ddocs=false        \
       -Dman=false ..      &amp;&amp;
@@ -146,8 +148,8 @@ ninja</userinput></screen>
 
     <para>
       <parameter>-Dvapi=true</parameter>: This switch enables
-      building of the Vala bindings. Remove if you don't
-      have <xref linkend="vala"/> installed.
+      building of the Vala bindings. Remove this switch if you don't
+      have <xref linkend="vala" role="nodep"/> installed.
     </para>
 
     <para>
@@ -155,9 +157,15 @@ ninja</userinput></screen>
       the GTK+-2 bindings for colord.
     </para>
 
+    <para>
+      <parameter>-Dgtk4=true</parameter>: This switch enables building
+      the GTK-4 bindings for colord. Set this option to 'false' if you
+      do not have <xref linkend="gtk4" role="nodep"/> installed.
+    </para>
+
     <para>
       <parameter>-Ddocs=false</parameter>: This switch disables building
-      GTK-DOC based documentation. Even if GTK-DOC is installed, you will
+      gtk-doc based documentation. Even if gtk-doc is installed, you will
       need the namespaced versions of the Docbook XSL stylesheets.
     </para>
 
@@ -189,7 +197,9 @@ ninja</userinput></screen>
           cd-convert
         </seg>
         <seg>
-          libcolord-gtk.so and libcolord-gtk2.so
+          libcolord-gtk.so,
+          libcolord-gtk2.so, and
+          libcolord-gtk4.so
         </seg>
         <seg>
           /usr/include/colord-1/colord-gtk and
@@ -240,6 +250,19 @@ ninja</userinput></screen>
           </indexterm>
         </listitem>
       </varlistentry>
+
+      <varlistentry id="libcolord-gtk4">
+        <term><filename class="libraryfile">libcolord-gtk4.so</filename></term>
+        <listitem>
+          <para>
+            contains the <application>Colord</application>
+            <application>GTK-4</application> bindings
+          </para>
+          <indexterm zone="colord-gtk libcolord-gtk4">
+            <primary sortas="c-libcolord-gtk4">libcolord-gtk4.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
     </variablelist>
 
   </sect2>