Changeset 6d28de3

Timestamp:

04/14/2023 10:47:46 AM (13 months ago)

Author:

Xi Ruoyao <xry111@…>

Branches:

12.0, 12.1, kea, ken/TL2024, ken/tuningfonts, lazarus, lxqt, plabs/newcss, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, xry111/llvm18, xry111/xf86-video-removal

Children:

95a526a5

Parents:

746cbd8

Message:

evince: Take the advantage of /usr/lib/libkpathsea.so symlink

So we can simply the instruction. Also remove a stale command
explanation referring to "configure script" (we are using meson now).

Simply the explanation for libkpathsea.so symlink in texlive too as we
don't distinguish "old" and "new" evince installations anymore. The
original explanation emphasizing "old" evince installation also does not
make sense to me: we have /etc/ld.so.conf addition which should be
enough for ld.so to find libkpathsea.so.6 when evince is used; and ld.so
only searches for "libkpathsea.so.6" (which is a DT_NEEDED entry in
evince libdvidocument.so), not unversioned libkpathsea.so.

Files:

• gnome/applications/evince.xml (modified) (4 diffs)
• pst/typesetting/texlive.xml (modified) (1 diff)

gnome/applications/evince.xml

@@ -122 +122 @@
 
     <para>
-      First, make sure that meson can find TeXLive if it is installed.
-      This has no effect on systems without TeXLive installed.
-    </para>
-
-<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>
-
-
-    <para>
       Install <application>Evince</application> by running the following
       commands:
@@ -138 +129 @@
 cd    build &amp;&amp;
 
+CPPFLAGS+=" -I/opt/texlive/&texlive-year;/include" \
 meson setup --prefix=/usr          \
             --buildtype=release    \
@@ -148 +140 @@
 cd    build &amp;&amp;
 
+CPPFLAGS+=" -I/opt/texlive/&texlive-year;/include" \
 meson setup --prefix=/usr          \
             --buildtype=release    \
@@ -187 +180 @@
 
     <para>
-      <parameter>CPPFLAGS="..." LDFLAGS="$LDFLAGS ..."</parameter>: If
-      <application>TeXLive</application> has been installed in
-      <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 because it
-      cannot find the required headers. Adding this to a system where
-      <application>TeXLive</application> has not been installed does not break
-      the build.
+      <parameter>CPPFLAGS+=" -I/opt/texlive/..."</parameter>: 
+      Make sure that meson can find libkpathsea headers from TeXLive if it
+      is installed. This has no effect on systems without TeXLive installed.
     </para>
 

pst/typesetting/texlive.xml

@@ -355 +355 @@
 
     <para>
-      To enable an existing install of <xref linkend="evince"/> to now
-      link to this new version of
-      <filename class="libraryfile">libkpathsea.so</filename> and to
-      allow a new <xref linkend="dvisvgm"/> to link to it, as the
-      <systemitem class="username">root</systemitem> user (re)create a
-      symlink from <filename class="directory">/usr/lib</filename>:
+      To allow <xref linkend="evince"/> or <xref linkend="dvisvgm"/> to
+      link to <filename class="libraryfile">libkpathsea.so</filename>,
+      as the &root; user (re)create a symlink from
+      <filename class="directory">/usr/lib</filename>:
     </para>