From 7553afee9340ec699211a2fd3b7490fdca5be302 Mon Sep 17 00:00:00 2001
From: "Douglas R. Reno" <renodr@linuxfromscratch.org>
Date: Sun, 30 Jun 2019 04:24:52 +0000
Subject: [PATCH] Update to gnome-control-center-3.32.2 Update to
 colord-gtk-0.2.0

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@21771 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 gnome.ent                               |  2 +-
 gnome/platform/gnome-control-center.xml |  2 +-
 introduction/welcome/changelog.xml      |  8 +++
 packages.ent                            |  2 +-
 x/lib/colord-gtk.xml                    | 65 ++++++++++++++++++++-----
 5 files changed, 64 insertions(+), 15 deletions(-)

diff --git a/gnome.ent b/gnome.ent
index 847a6e1edf..5ea789330f 100644
--- a/gnome.ent
+++ b/gnome.ent
@@ -59,7 +59,7 @@
 <!ENTITY gnome-bluetooth-version           "3.32.1">
 <!ENTITY gnome-keyring-version             "3.28.2">
 <!ENTITY gnome-settings-daemon-version     "3.32.1">
-<!ENTITY gnome-control-center-version      "3.32.1">
+<!ENTITY gnome-control-center-version      "3.32.2">
 <!ENTITY mutter-version                    "3.32.1">
 <!ENTITY gnome-shell-version               "3.32.1">
 <!ENTITY gnome-shell-extensions-version    "3.32.1">
diff --git a/gnome/platform/gnome-control-center.xml b/gnome/platform/gnome-control-center.xml
index bca4302411..f3c1027ac8 100644
--- a/gnome/platform/gnome-control-center.xml
+++ b/gnome/platform/gnome-control-center.xml
@@ -8,7 +8,7 @@
            "&gnome-download-http;/gnome-control-center/&gnome-minor-32;/gnome-control-center-&gnome-control-center-version;.tar.xz">
   <!ENTITY gnome-control-center-download-ftp
            "&gnome-download-ftp;/gnome-control-center/&gnome-minor-32;/gnome-control-center-&gnome-control-center-version;.tar.xz">
-  <!ENTITY gnome-control-center-md5sum        "307d87113d66a9b0cfe15d7b7888ca7e">
+  <!ENTITY gnome-control-center-md5sum        "547288caf3891543b19caa8b84d34b67">
   <!ENTITY gnome-control-center-size          "5.7 MB">
   <!ENTITY gnome-control-center-buildsize     "174 MB (with tests)">
   <!ENTITY gnome-control-center-time          "1.4 SBU (with tests)">
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index ee0c173240..61a5c0735c 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -44,6 +44,14 @@
     <listitem>
       <para>June 29th, 2019</para>
       <itemizedlist>
+        <listitem>
+          <para>[renodr] - Update to colord-gtk-0.2.0. Fixes
+          <ulink url="&blfs-ticket-root;12180">#12180</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to gnome-control-center-3.32.2. Fixes
+          <ulink url="&blfs-ticket-root;12098">#12098</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[renodr] - Update to gnome-settings-daemon-3.32.1. Fixes
           <ulink url="&blfs-ticket-root;12175">#12175</ulink>.</para>
diff --git a/packages.ent b/packages.ent
index 9f5424f1a7..d8604c1166 100644
--- a/packages.ent
+++ b/packages.ent
@@ -683,7 +683,7 @@ to avoid building libxml2 twice, which is slow with all deps -->
 <!ENTITY clutter-version              "1.26.2">
 <!ENTITY clutter-gst-version          "3.0.27">
 <!ENTITY clutter-gtk-version          "1.8.4">
-<!ENTITY colord-gtk-version           "0.1.26">
+<!ENTITY colord-gtk-version           "0.2.0">
 <!ENTITY fltk-version                 "1.3.5">
 <!ENTITY freeglut-version             "3.0.0">
 <!ENTITY gdk-pixbuf-version           "2.38.1">
diff --git a/x/lib/colord-gtk.xml b/x/lib/colord-gtk.xml
index 4e5079aba9..639e8ae546 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        "bb9d6f3c037152ad791003375aa6c16c">
-  <!ENTITY colord-gtk-size          "276 KB">
-  <!ENTITY colord-gtk-buildsize     "4.2 MB">
+  <!ENTITY colord-gtk-md5sum        "66d048803c8b89e5e63da4b461484933">
+  <!ENTITY colord-gtk-size          "20 KB">
+  <!ENTITY colord-gtk-buildsize     "41 MB">
   <!ENTITY colord-gtk-time          "less than 0.1 SBU">
 ]>
 
@@ -111,37 +111,66 @@
       commands:
     </para>
 
-<screen><userinput>./configure --prefix=/usr    \
-            --enable-vala    \
-            --disable-static &amp;&amp;
-make</userinput></screen>
+<screen><userinput>mkdir build &amp;&amp;
+cd    build &amp;&amp;
+
+meson --prefix=/usr  \
+      -Dgtk2=true    \
+      -Dvapi=true    \
+      -Ddocs=false   \
+      -Dman=false .. &amp;&amp;
+ninja</userinput></screen>
 
     <para>
-      To test the results, issue: <command>make check</command>.
+      To test the results, issue: <command>ninja test</command>.
+      The tests need to be run from an X session, and may require
+      a color profile for your primary display.
+      <!-- on an ASUS 32" IPS display, I have a color profile and it works
+           properly. On the other hand, with a Dell SP2208WFP LCD, 
+           no color profile is available and the tests fail. It seems to
+           depend on the system/display. -->
     </para>
 
     <para>
       Now, as the <systemitem class="username">root</systemitem> user:
     </para>
 
-<screen role="root"><userinput>make install</userinput></screen>
+<screen role="root"><userinput>ninja install</userinput></screen>
   </sect2>
 
   <sect2 role="commands">
     <title>Command Explanations</title>
 
     <para>
-      <parameter>--enable-vala</parameter>: This switch enables
+      <parameter>-Dvapi=true</parameter>: This switch enables
       building of the Vala bindings. Remove if you don't
       have <xref linkend="vala"/> installed.
     </para>
 
+    <para>
+      <parameter>-Dgtk2=true</parameter>: This switch enables building
+      the GTK+-2 bindings for colord.
+    </para>
+
+    <para>
+      <parameter>-Ddocs=false</parameter>: This switch disables building
+      GTK-DOC based documentation. Even if GTK-DOC is installed, you will
+      need the namespaced versions of the Docbook XSL stylesheets.
+    </para>
+
+    <para>
+      <parameter>-Dman=false</parameter>: This switch disables generating
+      the manual pages for this package. Remove this switch if you have
+      namespaced versions of the Docbook XSL stylesheets installed.
+    </para>
+
+    <!--
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/static-libraries.xml"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/gtk-doc-rebuild.xml"/>
-
+    -->
   </sect2>
 
   <sect2 role="content">
@@ -157,7 +186,7 @@ make</userinput></screen>
           cd-convert
         </seg>
         <seg>
-          libcolord-gtk.so
+          libcolord-gtk.so and libcolord-gtk2.so
         </seg>
         <seg>
           /usr/include/colord-1/colord-gtk and
@@ -196,6 +225,18 @@ make</userinput></screen>
         </listitem>
       </varlistentry>
 
+      <varlistentry id="libcolord-gtk2">
+        <term><filename class="libraryfile">libcolord-gtk2.so</filename></term>
+        <listitem>
+          <para>
+            contains the <application>Colord</application>
+            <application>GTK+-2</application> bindings.
+          </para>
+          <indexterm zone="colord-gtk libcolord-gtk2">
+            <primary sortas="c-libcolord-gtk2">libcolord-gtk2.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
     </variablelist>
 
   </sect2>