Index: gnome/applications/evince.xml
===================================================================
--- gnome/applications/evince.xml	(revision eb19654e4240741274c8232a93440a0230796749)
+++ gnome/applications/evince.xml	(revision c96e7946575b9e0e2c5ac618592637b8e73987d8)
@@ -6,10 +6,10 @@
 
   <!ENTITY evince-download-http
-     "&gnome-download-http;/evince/&gnome-minor-38;/evince-&evince-version;.tar.xz">
+     "&gnome-download-http;/evince/&gnome-40;/evince-&evince-version;.tar.xz">
   <!ENTITY evince-download-ftp
-     "&gnome-download-ftp;/evince/&gnome-minor-38;/evince-&evince-version;.tar.xz">
-  <!ENTITY evince-md5sum        "29dd770b8255bdf6343f83419c975905">
+     "&gnome-download-ftp;/evince/&gnome-40;/evince-&evince-version;.tar.xz">
+  <!ENTITY evince-md5sum        "bf78a8e8c384bbd2780b7be0ac917e79">
   <!ENTITY evince-size          "2.8 MB">
-  <!ENTITY evince-buildsize     "84 MB">
+  <!ENTITY evince-buildsize     "63 MB">
   <!ENTITY evince-time          "0.4 SBU (Using parallelism=4)">
 ]>
@@ -19,5 +19,4 @@
 
   <sect1info>
-    <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
@@ -40,5 +39,5 @@
     </para>
 
-    &lfs10_checked;
+    &lfs110a_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -84,4 +83,5 @@
       <xref linkend="gtk3"/>,
       <xref linkend="itstool"/>,
+      <xref linkend="libhandy1"/>,
       <xref linkend="libxml2"/>, and
       <xref linkend="openjpeg2"/>
@@ -129,6 +129,5 @@
     </para>
 
-<screen><userinput remap="pre">export CFLAGS="$CFLAGS -I/opt/texlive/&texlive-year;/include" &amp;&amp;
-export CXXFLAGS="$CXXFLAGS -I/opt/texlive/&texlive-year;/include" &amp;&amp;
+<screen><userinput remap="pre">export CPPFLAGS="-I/opt/texlive/&texlive-year;/include" &amp;&amp;
 export LDFLAGS="$LDFLAGS -L/opt/texlive/&texlive-year;/lib"</userinput></screen>
 
@@ -141,5 +140,8 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr -Dgtk_doc=false -Dsystemduserunitdir=no .. &amp;&amp;
+meson --prefix=/usr       \
+      --buildtype=release \
+      -Dgtk_doc=false     \
+      -Dsystemduserunitdir=no .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -147,5 +149,5 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr -Dgtk_doc=false .. &amp;&amp;
+meson --prefix=/usr --buildtype=release -Dgtk_doc=false .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -167,4 +169,8 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/meson-buildtype-release.xml"/>
+
     <!--
     <para>
@@ -175,11 +181,8 @@
     -->
 
-<!-- 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
+    <para>
+      <parameter>CPPFLAGS="..." LDFLAGS="$LDFLAGS ..."</parameter>: If
       <application>TeXLive</application> has been installed in
-      <filename class="directory">/opt/texlive-&texlive-year;</filename> the
+      <filename class="directory">/opt/texlive/&texlive-year;</filename> the
       configure script will find <filename class='libraryfile'>libkpathsea.so</filename>
       and enable the DVI backend, but without this addition the compile will fail
@@ -188,5 +191,5 @@
       build.
     </para>
--->
+
     <para>
       <parameter>-Dgtk_doc=false</parameter>: This switch disables generating
@@ -225,4 +228,10 @@
       <application>libsecret</application>. Use this switch
       if <application>libsecret</application> is not installed.
+    </para>
+
+    <para>
+      <option>-Dps=enabled</option>: Use this switch if
+      <application>libspectre</application> is installed and you want to
+      view PostScript files with <application>Evince</application>.
     </para>
 
@@ -263,5 +272,5 @@
         <listitem>
           <para>
-            is a multiple format document viewer.
+            is a multiple format document viewer
           </para>
           <indexterm zone="evince evince-prog">
@@ -275,5 +284,5 @@
         <listitem>
           <para>
-            is an applicaton that implements the printing previewer.
+            is an applicaton that implements the printing previewer
           </para>
           <indexterm zone="evince evince-previewer">
@@ -288,5 +297,5 @@
           <para>
             is a simple program used to create thumbnail images of
-            supported documents.
+            supported documents
           </para>
           <indexterm zone="evince evince-thumbnailer">
