Index: archive/libhandy.xml
===================================================================
--- archive/libhandy.xml	(revision fb9b0c1c0f7958f22a5304a5bd694dd14efabbd9)
+++ archive/libhandy.xml	(revision fb9b0c1c0f7958f22a5304a5bd694dd14efabbd9)
@@ -0,0 +1,184 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY libhandy-download-http "https://source.puri.sm/Librem5/libhandy/-/archive/v&libhandy-version;/libhandy-v&libhandy-version;.tar.bz2">
+  <!ENTITY libhandy-download-ftp  " ">
+  <!ENTITY libhandy-md5sum        "932ba6e80908c7579fa0392d6e0d0ceb">
+  <!ENTITY libhandy-size          "388 KB">
+  <!ENTITY libhandy-buildsize     "16 MB (with tests)">
+  <!ENTITY libhandy-time          "0.2 SBU (with tests)">
+]>
+
+<sect1 id="libhandy" xreflabel="libhandy-&libhandy-version;">
+  <?dbhtml filename="libhandy.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Libhandy-&libhandy-version;</title>
+
+  <indexterm zone="libhandy">
+    <primary sortas="a-libhandy">libhandy</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to libhandy</title>
+
+    <para>
+      The <application>libhandy</application> package provides additional
+      GTK UI widgets for use in developing user interfaces.
+    </para>
+
+    &lfs10_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&libhandy-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&libhandy-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &libhandy-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &libhandy-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &libhandy-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &libhandy-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">libhandy Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="gtk3"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="vala"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="gtk-doc"/> and
+      <ulink url="https://glade.gnome.org/">Glade</ulink>
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/libhandy"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of libhandy</title>
+
+    <para>
+      Install <application>libhandy</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>mkdir build &amp;&amp;
+cd    build &amp;&amp;
+
+meson --prefix=/usr .. &amp;&amp;
+ninja</userinput></screen>
+
+    <para>
+      To test the results, issue: <command>ninja test</command>.
+      The tests must be run from a graphical session.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>ninja install</userinput></screen>
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <option>-Dgtk_doc=true</option>: Use this option if you have
+      <xref linkend="gtk-doc"/> installed and wish to install the documentation.
+    </para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          handy-demo-0.0
+        </seg>
+        <seg>
+          libhandy-0.0.so
+        </seg>
+        <seg>
+          /usr/include/libhandy-0.0
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="handy-demo-0.0">
+        <term><command>handy-demo-0.0</command></term>
+        <listitem>
+          <para>
+            provides an example of how to use the
+            <application>libhandy</application> library.
+          </para>
+          <indexterm zone="libhandy handy-demo-0.0">
+            <primary sortas="b-handy-demo-0.0">handy-demo-0.0</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libhandy-0.0">
+        <term><filename class="libraryfile">libhandy-0.0.so</filename></term>
+        <listitem>
+          <para>
+            provides additional GTK widgets for use in creating user interfaces.
+          </para>
+          <indexterm zone="libhandy libhandy-0.0">
+            <primary sortas="c-libhandy-0.0">libhandy-0.0.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </sect2>
+</sect1>
Index: gnome/applications/gnome-tweaks.xml
===================================================================
--- gnome/applications/gnome-tweaks.xml	(revision 6746ab16f5d51512678482af52189339df8b5863)
+++ gnome/applications/gnome-tweaks.xml	(revision fb9b0c1c0f7958f22a5304a5bd694dd14efabbd9)
@@ -73,4 +73,14 @@
     </itemizedlist>
 
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Required patch:
+          <ulink url="&patch-root;/gnome-tweaks-&gnome-tweaks-version;-port_to_libhandy1-1.patch"/>
+        </para>
+      </listitem>
+    </itemizedlist>
+
     <bridgehead renderas="sect3">GNOME Tweaks Dependencies</bridgehead>
 
@@ -79,5 +89,5 @@
       <xref linkend="gtk3"/>,
       <xref linkend="gsettings-desktop-schemas"/>,
-      <xref linkend="libhandy"/>,
+      <xref linkend="libhandy1"/>,
       <xref linkend="pygobject3"/>, and
       <xref linkend="sound-theme-freedesktop"/>
@@ -91,4 +101,10 @@
   <sect2 role="installation">
     <title>Installation of GNOME Tweaks</title>
+
+    <para>
+      First, port gnome-tweaks to libhandy-1.x:
+    </para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../gnome-tweaks-&gnome-tweaks-version;-port_to_libhandy1-1.patch</userinput></screen>
 
     <para>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 6746ab16f5d51512678482af52189339df8b5863)
+++ introduction/welcome/changelog.xml	(revision fb9b0c1c0f7958f22a5304a5bd694dd14efabbd9)
@@ -47,4 +47,11 @@
       <itemizedlist>
         <listitem>
+          <para>[renodr] - Archive libhandy-0.x.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Port gnome-tweaks to libhandy1. Fixes
+          <ulink url="&blfs-ticket-root;14226">#14226</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[renodr] - Update to mesa-20.2.2. Fixes
           <ulink url="&blfs-ticket-root;14219">#14219</ulink>.</para>
Index: packages.ent
===================================================================
--- packages.ent	(revision 6746ab16f5d51512678482af52189339df8b5863)
+++ packages.ent	(revision fb9b0c1c0f7958f22a5304a5bd694dd14efabbd9)
@@ -745,5 +745,5 @@
 <!ENTITY keybinder3-version           "0.3.2">
 <!ENTITY libdazzle-version            "3.38.0">
-<!ENTITY libhandy-version             "0.0.13">
+<!--<!ENTITY libhandy-version             "0.0.13">-->
 <!ENTITY libhandy1-version            "1.0.1">
 <!ENTITY libnotify-version            "0.7.9">
Index: x/lib/lib.xml
===================================================================
--- x/lib/lib.xml	(revision 6746ab16f5d51512678482af52189339df8b5863)
+++ x/lib/lib.xml	(revision fb9b0c1c0f7958f22a5304a5bd694dd14efabbd9)
@@ -60,5 +60,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="keybinder3.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libdazzle.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libhandy.xml"/>
+<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libhandy.xml"/> -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libhandy1.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libdrm.xml"/>
Index: lib/libhandy.xml
===================================================================
--- x/lib/libhandy.xml	(revision 6746ab16f5d51512678482af52189339df8b5863)
+++ 	(revision )
@@ -1,184 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY libhandy-download-http "https://source.puri.sm/Librem5/libhandy/-/archive/v&libhandy-version;/libhandy-v&libhandy-version;.tar.bz2">
-  <!ENTITY libhandy-download-ftp  " ">
-  <!ENTITY libhandy-md5sum        "932ba6e80908c7579fa0392d6e0d0ceb">
-  <!ENTITY libhandy-size          "388 KB">
-  <!ENTITY libhandy-buildsize     "16 MB (with tests)">
-  <!ENTITY libhandy-time          "0.2 SBU (with tests)">
-]>
-
-<sect1 id="libhandy" xreflabel="libhandy-&libhandy-version;">
-  <?dbhtml filename="libhandy.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Libhandy-&libhandy-version;</title>
-
-  <indexterm zone="libhandy">
-    <primary sortas="a-libhandy">libhandy</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libhandy</title>
-
-    <para>
-      The <application>libhandy</application> package provides additional
-      GTK UI widgets for use in developing user interfaces.
-    </para>
-
-    &lfs10_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libhandy-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libhandy-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libhandy-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libhandy-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libhandy-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libhandy-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libhandy Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk3"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/> and
-      <ulink url="https://glade.gnome.org/">Glade</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/libhandy"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libhandy</title>
-
-    <para>
-      Install <application>libhandy</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson --prefix=/usr .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>.
-      The tests must be run from a graphical session.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>-Dgtk_doc=true</option>: Use this option if you have
-      <xref linkend="gtk-doc"/> installed and wish to install the documentation.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          handy-demo-0.0
-        </seg>
-        <seg>
-          libhandy-0.0.so
-        </seg>
-        <seg>
-          /usr/include/libhandy-0.0
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="handy-demo-0.0">
-        <term><command>handy-demo-0.0</command></term>
-        <listitem>
-          <para>
-            provides an example of how to use the
-            <application>libhandy</application> library.
-          </para>
-          <indexterm zone="libhandy handy-demo-0.0">
-            <primary sortas="b-handy-demo-0.0">handy-demo-0.0</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libhandy-0.0">
-        <term><filename class="libraryfile">libhandy-0.0.so</filename></term>
-        <listitem>
-          <para>
-            provides additional GTK widgets for use in creating user interfaces.
-          </para>
-          <indexterm zone="libhandy libhandy-0.0">
-            <primary sortas="c-libhandy-0.0">libhandy-0.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
