Index: gnome/applications/evince.xml
===================================================================
--- gnome/applications/evince.xml	(revision 13ad127bfadb6103f478959c2bf0c23c375e7210)
+++ gnome/applications/evince.xml	(revision d8321785da3a83d811b51ed0b6d3348cbfe26e00)
@@ -9,8 +9,8 @@
   <!ENTITY evince-download-ftp
      "&gnome-download-ftp;/evince/&gnome-minor-36;/evince-&evince-version;.tar.xz">
-  <!ENTITY evince-md5sum        "0acb95730933fb4b591c73c3fc7fc688">
-  <!ENTITY evince-size          "2.5 MB">
-  <!ENTITY evince-buildsize     "74 MB">
-  <!ENTITY evince-time          "0.7 SBU (Using parallelism=4)">
+  <!ENTITY evince-md5sum        "9762dabdde37a804072bccbfd311d357">
+  <!ENTITY evince-size          "2.8 MB">
+  <!ENTITY evince-buildsize     "84 MB">
+  <!ENTITY evince-time          "0.4 SBU (Using parallelism=4)">
 ]>
 
@@ -129,21 +129,15 @@
     </para>
 
-<screen revision="sysv"><userinput>CFLAGS="$CFLAGS -I/opt/texlive/&texlive-year;/include    " \
-CXXFLAGS="$CXXFLAGS -I/opt/texlive/&texlive-year;/include" \
-./configure --prefix=/usr                         \
-            --enable-introspection                \
-            --without-gspell                      \
-            --disable-static                      \
-            --with-systemduserunitdir=no         &amp;&amp;
-make</userinput></screen>
-
-<screen revision="systemd"><userinput>CFLAGS="$CFLAGS -I/opt/texlive/&texlive-year;/include"      \
-CXXFLAGS="$CXXFLAGS -I/opt/texlive/&texlive-year;/include"  \
-LDFLAGS="$LDFLAGS -L/opt/texlive/&texlive-year;/lib"        \
-./configure --prefix=/usr                         \
-            --enable-introspection                \
-            --without-gspell                      \
-            --disable-static                     &amp;&amp;
-make</userinput></screen>
+<screen revision="sysv"><userinput>mkdir build &amp;&amp;
+cd    build &amp;&amp;
+
+meson --prefix=/usr -Dgtk_doc=false -Dsystemduserunitdir=no .. &amp;&amp;
+ninja</userinput></screen>
+
+<screen revision="systemd"><userinput>mkdir build &amp;&amp;
+cd    build &amp;&amp;
+
+meson --prefix=/usr -Dgtk_doc=false .. &amp;&amp;
+ninja</userinput></screen>
 
     <para>
@@ -155,5 +149,5 @@
     </para>
 
-<screen role="root"><userinput>make install</userinput></screen>
+<screen role="root"><userinput>ninja install</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -172,4 +166,7 @@
     -->
 
+<!-- When moving to Meson, I installed the whole texlive suite from source.
+     I was able to verify that this is no longer required. I'm assuming it was
+     one of evince-3.36.3 or texlive-2020 that fixed this.
     <para>
       <parameter>CFLAGS="$CFLAGS ..." CXXFLAGS="$CXXFLAGS ..." LDFLAGS="$LDFLAGS ..."</parameter>: If
@@ -182,17 +179,24 @@
       build.
     </para>
-
-    <para>
-      <parameter>--without-gspell</parameter>: This switch turns off support
-      for the spell checking plugin. Remove this if you have gspell installed.
-    </para>
-
-    <para>
-      <parameter>--enable-introspection</parameter>: By default, the
-      <application>Gobject Introspection</application> support is
-      turned off, even though that package is an expected component
-      of the <application>GNOME</application> Desktop.
-    </para>
-
+-->
+    <para>
+      <parameter>-Dgtk_doc=false</parameter>: This switch disables generating
+      the gtk-doc API reference documentation. If you have
+      <xref role="nodep" linkend="gtk-doc"/> installed and wish to generate
+      the API reference documentation, remove this switch.
+    </para>
+
+    <para>
+      <option>-Dgspell=false</option>: This switch turns off support
+      for the spell checking plugin.
+    </para>
+
+    <para>
+      <option>-Dintrospection=false</option>: Use this option if you
+      don't have <xref role="nodep" linkend="gobject-introspection"/> 
+      installed and don't wish to have introspection support built into Evince.
+    </para>
+
+<!--
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/static-libraries.xml"/>
@@ -200,7 +204,8 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-    <para>
-      <option>--disable-nautilus</option>: This switch disables building
+-->
+
+    <para>
+      <option>-Dnautilus=false</option>: This switch disables building
       the <application>Nautilus</application> Plugin. Use this switch
       if <application>Nautilus</application> is not installed.
@@ -208,5 +213,5 @@
 
     <para>
-      <option>--without-keyring</option>: This switch disables the use of
+      <option>-Dkeyring=false</option>: This switch disables the use of
       <application>libsecret</application>. Use this switch
       if <application>libsecret</application> is not installed.
Index: gnome/platform/gjs.xml
===================================================================
--- gnome/platform/gjs.xml	(revision 13ad127bfadb6103f478959c2bf0c23c375e7210)
+++ gnome/platform/gjs.xml	(revision d8321785da3a83d811b51ed0b6d3348cbfe26e00)
@@ -7,7 +7,7 @@
   <!ENTITY gjs-download-http "&gnome-download-http;/gjs/1.64/gjs-&gjs-version;.tar.xz">
   <!ENTITY gjs-download-ftp  "&gnome-download-ftp;/gjs/1.64/gjs-&gjs-version;.tar.xz">
-  <!ENTITY gjs-md5sum        "bd2f7f411b46016e8ee2d2c8d3c140d9">
-  <!ENTITY gjs-size          "412 KB">
-  <!ENTITY gjs-buildsize     "314 MB (with tests)">
+  <!ENTITY gjs-md5sum        "e25ca40cd2c1b88e4778ddb6bb7f4d64">
+  <!ENTITY gjs-size          "416 KB">
+  <!ENTITY gjs-buildsize     "273 MB (with tests)">
   <!ENTITY gjs-time          "0.6 SBU (with tests)">
 ]>
@@ -111,7 +111,9 @@
          to adding symbolic link support for Windows NT-based platforms.
          This shouldn't affect us, so let's create the symlink manually
-         like we do in other packages.-->
-
-<screen><userinput remap="pre">sed -i '/symlink-gjs.py/s/^/#/g' meson.build</userinput></screen>
+         like we do in other packages.
+         Invalid with 1.64.3. Make sure you don't have DESTDIR
+         set, such as you'd do in an update script.-->
+
+<!--<screen><userinput remap="pre">sed -i '/symlink-gjs.py/s/^/#/g' meson.build</userinput></screen>-->
 
     <para>
@@ -131,5 +133,5 @@
       tests will fail if not running in an Xorg session. One test,
       <filename>gjs: Scripts/CommandLine</filename>, is known to fail.
-      On some systems, up to four tests may fail with an error.
+      On some systems, up to six tests may fail with an error.
       <!-- Still fails with 1.58.5. -->
     </para>
