Index: gnome/applications/gucharmap.xml
===================================================================
--- gnome/applications/gucharmap.xml	(revision 45ab6c70c2ce8889cae87537e28608d4e61ff5d3)
+++ gnome/applications/gucharmap.xml	(revision ca33d3b2e5b486ca40dbd9c85383a0d7fa9f2ddb)
@@ -5,12 +5,13 @@
   %general-entities;
 
-  <!ENTITY gucharmap-download-http
-       "&gnome-download-http;/gucharmap/12.0/gucharmap-&gucharmap-version;.tar.xz">
-  <!ENTITY gucharmap-download-ftp
-       "&gnome-download-ftp;/gucharmap/12.0/gucharmap-&gucharmap-version;.tar.xz">
-  <!ENTITY gucharmap-md5sum        "0c34aa29657a41712d011d939c5bc85e">
-  <!ENTITY gucharmap-size          "1.6 MB">
-  <!ENTITY gucharmap-buildsize     "56 MB">
-  <!ENTITY gucharmap-time          "0.4 SBU (with a fast internet connection)">
+  <!-- found by looking at souce of https://gitlab.gnome.org/GNOME/gucharmap/-/tags
+   in seamonkey, finding the .tar.bz2 and putting the gitlab.gnome.org prefix
+   onto it -->
+  <!ENTITY gucharmap-download-http "https://gitlab.gnome.org/GNOME/gucharmap/-/archive/&gucharmap-version;/gucharmap-&gucharmap-version;.tar.bz2">
+  <!ENTITY gucharmap-download-ftp  " ">
+  <!ENTITY gucharmap-md5sum        "5dbe3a3f6d063f819f82f15d6613a7a4">
+  <!ENTITY gucharmap-size          "1.3 MB">
+  <!ENTITY gucharmap-buildsize     "77 MB">
+  <!ENTITY gucharmap-time          "0.1 SBU">
 ]>
 
@@ -75,4 +76,22 @@
     </itemizedlist>
 
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+
+      <bridgehead renderas="sect4">Unicode Character Database files</bridgehead>
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para>
+            Download: <ulink url="https://www.unicode.org/Public/zipped/&gucharmap-major-version;.0/UCD.zip"> https://www.unicode.org/Public/zipped/&gucharmap-major-version;.0/UCD.zip</ulink>
+            (Unicode Character Database)
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download: <ulink url="https://www.unicode.org/Public/zipped/&gucharmap-major-version;.0/Unihan.zip"> https://www.unicode.org/Public/zipped/&gucharmap-major-version;.0/Unihan.zip</ulink>
+            (CJK Unified Ideographs)
+          </para>
+        </listitem>
+      </itemizedlist>
+
     <bridgehead renderas="sect3">Gucharmap Dependencies</bridgehead>
 
@@ -80,8 +99,8 @@
     <para role="required">
       <xref linkend="desktop-file-utils"/>,
+      <xref linkend="gsettings-desktop-schemas"/>,
       <xref linkend="gtk3"/>,
-      <xref linkend="itstool"/>,
-      <xref linkend="unzip"/>, and
-      <xref linkend="wget"/> (used to download data from unicode.org)
+      <xref linkend="itstool"/>, and
+      <xref linkend="unzip"/>
     </para>
 
@@ -112,13 +131,19 @@
     </para>
 
-<screen><userinput>LIBS="-ldl"               \
-./configure --prefix=/usr \
-            --enable-vala \
-            --with-unicode-data=download &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package&apos;s testsuite is only intended to be used by the
-      maintainer to check the i18n help files.
+<screen><userinput>mkdir build              &amp;&amp;
+cd build                 &amp;&amp;
+mkdir ucd                &amp;&amp;
+pushdir ucd              &amp;&amp;
+unzip ../../UCD.zip      &amp;&amp;
+cp -v ../../Unihan.zip . &amp;&amp;
+popd                     &amp;&amp;
+meson --prefix=/usr      \
+      --strip            \
+      -Ducd_path=./ucd   \
+      -Ddocs=false ..    &amp;&amp;
+ninja</userinput></screen>
+
+    <para>
+      This package does not have a testsuite.
     </para>
 
@@ -127,5 +152,6 @@
     </para>
 
-<screen role="root"><userinput>make install</userinput></screen>
+<screen role="root"><userinput>rm  -fv /usr/share/glib-2.0/schemas/org.gnome.Charmap.enums.xml &amp;&amp;
+ninja install</userinput></screen>
 
   </sect2>
@@ -134,25 +160,39 @@
     <title>Command Explanations</title>
 
-<!-- Needed in Gucharmap 10.0.4: should be fixed in subsequent versions -->
-    <para>
-      <command>LIBS="-ldl" ...</command>: Allows linking some system libraries.
-      This is currently broken in version 10.0.4.
-    </para>
-
-    <para>
-      <parameter>--with-unicode-data=download</parameter>: This switch forces
-      the build process to download the <application>Unicode</application> data
-      instead of trying to look for it locally.
-    </para>
-
-    <para>
-      <parameter>--enable-vala</parameter>: This switch enables building of the
-      <application>Vala</application> bindings (auto-detection of
-      <command>vapigen</command> is currently broken). Remove if you don't
-      have <xref linkend="vala"/> installed.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
+    <!-- 13.0.8, meson 58 series - file reports 'with debug_info, not stripped'.
+     The build still used -O3 and claimed to not be a debug version -->
+    <para>
+      <parameter>--strip</parameter>: Although the package defaults to a release
+      build without debug information, without this switch there will be some
+      debug information in the binaries.
+    </para>
+
+    <para>
+      <parameter>-Ducd_path=./ucd</parameter>: This points to where the extracted
+      main Unicode data files, and the zipped Unihan archive can be found.
+    </para>
+
+    <para>
+      <command>rm  -fv /usr/share/glib-2.0/schemas/org.gnome.Charmap.enums.xml</command>:
+      Old versions of this package installed an obsolete file that prevents the
+      program from running, as if the main schema has not been installed.
+      Forcibly removing works even if the old file is not present.
+    </para>
+
+    <para>
+      <parameter>-Ddocs=false</parameter>: This allows the package to build even
+      if <application>gtk-doc</application> has not been installed. Remove this
+      if you have installed that and wish to build the documentation.
+    </para>
+
+    <para>
+      <option>-Dgir=false</option>: Use this if you have not installed
+      <xref linkend="gobject-introspection"/>.
+    </para>
+
+    <para>
+      <option>-Dvapi=false</option>: Use this if you have not installed
+      <xref linkend="vala"/>.
+    </para>
 
   </sect2>
@@ -168,5 +208,6 @@
       <seglistitem>
         <seg>
-          charmap, gnome-character-map (both symlinks), and gucharmap
+          <!-- these appear to no-longer get created
+          charmap, gnome-character-map (both symlinks), and--> gucharmap
         </seg>
         <seg>
