Changeset 388747dd for pst/ps

Timestamp:

10/13/2020 07:07:33 PM (4 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

17facb1

Parents:

ac278af2

Message:

Update to mupdf-1.18.0.
Update to mariadb-10.5.6.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@23805 af4574ff-66df-0310-9fd7-8a98e5e911e0

File:

• pst/ps/mupdf.xml (modified) (8 diffs)

pst/ps/mupdf.xml

@@ -9 +9 @@
   <!ENTITY mupdf-download-http "http://www.mupdf.com/downloads/archive/mupdf-&mupdf-version;-source.tar.gz">
   <!ENTITY mupdf-download-ftp  " ">
-  <!ENTITY mupdf-md5sum        "f6ffcd81fcd4c57016eb630bcd617c50">
-  <!ENTITY mupdf-size          "62 MB">
-  <!ENTITY mupdf-buildsize     "301 MB">
-  <!ENTITY mupdf-time          "0.1 SBU (Using parallelism=4)">
+  <!ENTITY mupdf-md5sum        "6f42be1365350f05270f8776517a3872">
+  <!ENTITY mupdf-size          "69 MB">
+  <!ENTITY mupdf-buildsize     "322 MB">
+  <!ENTITY mupdf-time          "0.2 SBU (Using parallelism=4)">
 ]>
 
@@ -72 +72 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Recommended patch:
-          <ulink url="&patch-root;/mupdf-&mupdf-version;-shared_libs-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
     <bridgehead renderas="sect3">MuPDF Dependencies</bridgehead>
 
@@ -91 +81 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="freeglut"/>,
+      <!--<xref linkend="freeglut"/>, -->
       <xref linkend="harfbuzz"/>,
       <!-- This no-longer gets linked in with our system libs patch
@@ -120 +110 @@
     <title>Installation of MuPDF</title>
 
+    <para>First, fix the Makefile to link properly with the shared library:</para>
+
+<screen><userinput>sed -i '/MU.*_EXE. :/{
+        s/.(MUPDF_LIB)//
+        N
+        s/$/ -lmupdf/
+        }' Makefile</userinput></screen>
+
+
     <para>
       Install <application>MuPDF</application> by running the following
@@ -125 +124 @@
     </para>
 
-<screen><userinput>patch -Np1 -i ../mupdf-&mupdf-version;-shared_libs-1.patch &amp;&amp;
-
-USE_SYSTEM_LIBS=yes make</userinput></screen>
+<screen><userinput>cat &gt; user.make &lt;&lt; EOF &amp;&amp;
+USE_SYSTEM_FREETYPE := yes
+USE_SYSTEM_HARFBUZZ := yes
+USE_SYSTEM_JBIG2DEC := no
+USE_SYSTEM_JPEGXR := no # not used without HAVE_JPEGXR
+USE_SYSTEM_LCMS2 := no # need lcms2-art fork
+USE_SYSTEM_LIBJPEG := yes
+USE_SYSTEM_MUJS := no # build needs source anyways
+USE_SYSTEM_OPENJPEG := yes
+USE_SYSTEM_ZLIB := yes
+USE_SYSTEM_GLUT := no # need freeglut2-art fork
+USE_SYSTEM_CURL := yes
+USE_SYSTEM_GUMBO := no
+EOF
+
+export XCFLAGS=-fPIC          &amp;&amp;
+make build=release shared=yes &amp;&amp;
+unset XCFLAGS</userinput></screen>
 
     <para>
@@ -137 +151 @@
     </para>
 
-<screen role="root"><userinput>USE_SYSTEM_LIBS=yes                     \
-make prefix=/usr                        \
-     build=release                      \
+<screen role="root"><userinput>make prefix=/usr                        \
+     shared=yes                         \
      docdir=/usr/share/doc/mupdf-&mupdf-version; \
      install                            &amp;&amp;
 
-ln -sfv mupdf-x11 /usr/bin/mupdf        &amp;&amp;
-ldconfig</userinput></screen>
+chmod 755 /usr/lib/libmupdf.so          &amp;&amp;
+ln -sfv mupdf-x11 /usr/bin/mupdf</userinput></screen>
 
   </sect2>
@@ -172 +185 @@
           mupdf-gl, 
           mupdf-x11, 
+          mupdf-x11-curl,
           muraster, and
           mutool
         </seg>
         <seg>
-          libmupdf.so, 
-          libmupdfthird.so, 
-          libmupdf-pkcs7.so, and 
-          libmupdf-threads.so
+          libmupdf.so
         </seg>
         <seg>
@@ -268 +279 @@
       </varlistentry>
 
-      <varlistentry id="libmupdfthird">
-        <term><filename class="libraryfile">libmupdfthird.so</filename></term>
-        <listitem>
-          <para>
-            contains the third party libraries compiled for mudpf.
-          </para>
-          <indexterm zone="mupdf libmupdfthird">
-            <primary sortas="c-libmupdfthird">libmupdfthird.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
     </variablelist>