Changeset 388747dd


Ignore:
Timestamp:
10/13/2020 07:07:33 PM (2 years ago)
Author:
Bruce Dubbs <bdubbs@…>
Branches:
10.1, 11.0, 11.1, 11.2, lazarus, plabs/python-mods, qt5new, trunk, upgradedb, xry111/intltool, xry111/soup3, xry111/test-20220226
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

Files:
5 edited

Legend:

Unmodified
Added
Removed
  • general.ent

    rac278af2 r388747dd  
    11<!-- $LastChangedBy$ $Date$ -->
    22
    3 <!ENTITY day          "12">                   <!-- Always 2 digits -->
     3<!ENTITY day          "13">                   <!-- Always 2 digits -->
    44<!ENTITY month        "10">                   <!-- Always 2 digits -->
    55<!ENTITY year         "2020">
     
    77<!ENTITY copyholder   "The BLFS Development Team">
    88<!ENTITY version      "&year;-&month;-&day;">
    9 <!ENTITY releasedate  "October 12th, &year;">
     9<!ENTITY releasedate  "October 13th, &year;">
    1010<!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
    1111<!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
  • introduction/welcome/changelog.xml

    rac278af2 r388747dd  
    4343    -->
    4444    <listitem>
     45      <para>October 13th, 2020</para>
     46      <itemizedlist>
     47        <listitem>
     48          <para>[bdubbs] - Update to mupdf-1.18.0. Fixes
     49          <ulink url="&blfs-ticket-root;14110">#14110</ulink>.</para>
     50        </listitem>
     51        <listitem>
     52          <para>[bdubbs] - Update to mariadb-10.5.6. Fixes
     53          <ulink url="&blfs-ticket-root;14109">#14109</ulink>.</para>
     54        </listitem>
     55      </itemizedlist>
     56    </listitem>
     57
     58    <listitem>
    4559      <para>October 12th, 2020</para>
    4660      <itemizedlist>
  • packages.ent

    rac278af2 r388747dd  
    665665<!ENTITY db-version                   "5.3.28">
    666666<!ENTITY lmdb-version                 "0.9.24">
    667 <!ENTITY mariadb-version              "10.5.5">
     667<!ENTITY mariadb-version              "10.5.6">
    668668<!ENTITY postgresql-version           "13.0">
    669669<!ENTITY sqlite-version               "3.33.0">
     
    10751075<!ENTITY epdfview-version             "0.1.8">
    10761076<!ENTITY fop-version                  "2.5">
    1077 <!ENTITY mupdf-version                "1.17.0">
     1077<!ENTITY mupdf-version                "1.18.0">
    10781078<!ENTITY paps-version                 "0.7.1">
    10791079
  • pst/ps/mupdf.xml

    rac278af2 r388747dd  
    99  <!ENTITY mupdf-download-http "http://www.mupdf.com/downloads/archive/mupdf-&mupdf-version;-source.tar.gz">
    1010  <!ENTITY mupdf-download-ftp  " ">
    11   <!ENTITY mupdf-md5sum        "f6ffcd81fcd4c57016eb630bcd617c50">
    12   <!ENTITY mupdf-size          "62 MB">
    13   <!ENTITY mupdf-buildsize     "301 MB">
    14   <!ENTITY mupdf-time          "0.1 SBU (Using parallelism=4)">
     11  <!ENTITY mupdf-md5sum        "6f42be1365350f05270f8776517a3872">
     12  <!ENTITY mupdf-size          "69 MB">
     13  <!ENTITY mupdf-buildsize     "322 MB">
     14  <!ENTITY mupdf-time          "0.2 SBU (Using parallelism=4)">
    1515]>
    1616
     
    7272    </itemizedlist>
    7373
    74     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
    75     <itemizedlist spacing="compact">
    76       <listitem>
    77         <para>
    78           Recommended patch:
    79           <ulink url="&patch-root;/mupdf-&mupdf-version;-shared_libs-1.patch"/>
    80         </para>
    81       </listitem>
    82     </itemizedlist>
    83 
    8474    <bridgehead renderas="sect3">MuPDF Dependencies</bridgehead>
    8575
     
    9181    <bridgehead renderas="sect4">Recommended</bridgehead>
    9282    <para role="recommended">
    93       <xref linkend="freeglut"/>,
     83      <!--<xref linkend="freeglut"/>, -->
    9484      <xref linkend="harfbuzz"/>,
    9585      <!-- This no-longer gets linked in with our system libs patch
     
    120110    <title>Installation of MuPDF</title>
    121111
     112    <para>First, fix the Makefile to link properly with the shared library:</para>
     113
     114<screen><userinput>sed -i '/MU.*_EXE. :/{
     115        s/.(MUPDF_LIB)//
     116        N
     117        s/$/ -lmupdf/
     118        }' Makefile</userinput></screen>
     119
     120
    122121    <para>
    123122      Install <application>MuPDF</application> by running the following
     
    125124    </para>
    126125
    127 <screen><userinput>patch -Np1 -i ../mupdf-&mupdf-version;-shared_libs-1.patch &amp;&amp;
    128 
    129 USE_SYSTEM_LIBS=yes make</userinput></screen>
     126<screen><userinput>cat &gt; user.make &lt;&lt; EOF &amp;&amp;
     127USE_SYSTEM_FREETYPE := yes
     128USE_SYSTEM_HARFBUZZ := yes
     129USE_SYSTEM_JBIG2DEC := no
     130USE_SYSTEM_JPEGXR := no # not used without HAVE_JPEGXR
     131USE_SYSTEM_LCMS2 := no # need lcms2-art fork
     132USE_SYSTEM_LIBJPEG := yes
     133USE_SYSTEM_MUJS := no # build needs source anyways
     134USE_SYSTEM_OPENJPEG := yes
     135USE_SYSTEM_ZLIB := yes
     136USE_SYSTEM_GLUT := no # need freeglut2-art fork
     137USE_SYSTEM_CURL := yes
     138USE_SYSTEM_GUMBO := no
     139EOF
     140
     141export XCFLAGS=-fPIC          &amp;&amp;
     142make build=release shared=yes &amp;&amp;
     143unset XCFLAGS</userinput></screen>
    130144
    131145    <para>
     
    137151    </para>
    138152
    139 <screen role="root"><userinput>USE_SYSTEM_LIBS=yes                     \
    140 make prefix=/usr                        \
    141      build=release                      \
     153<screen role="root"><userinput>make prefix=/usr                        \
     154     shared=yes                         \
    142155     docdir=/usr/share/doc/mupdf-&mupdf-version; \
    143156     install                            &amp;&amp;
    144157
    145 ln -sfv mupdf-x11 /usr/bin/mupdf        &amp;&amp;
    146 ldconfig</userinput></screen>
     158chmod 755 /usr/lib/libmupdf.so          &amp;&amp;
     159ln -sfv mupdf-x11 /usr/bin/mupdf</userinput></screen>
    147160
    148161  </sect2>
     
    172185          mupdf-gl,
    173186          mupdf-x11,
     187          mupdf-x11-curl,
    174188          muraster, and
    175189          mutool
    176190        </seg>
    177191        <seg>
    178           libmupdf.so,
    179           libmupdfthird.so,
    180           libmupdf-pkcs7.so, and
    181           libmupdf-threads.so
     192          libmupdf.so
    182193        </seg>
    183194        <seg>
     
    268279      </varlistentry>
    269280
    270       <varlistentry id="libmupdfthird">
    271         <term><filename class="libraryfile">libmupdfthird.so</filename></term>
    272         <listitem>
    273           <para>
    274             contains the third party libraries compiled for mudpf.
    275           </para>
    276           <indexterm zone="mupdf libmupdfthird">
    277             <primary sortas="c-libmupdfthird">libmupdfthird.so</primary>
    278           </indexterm>
    279         </listitem>
    280       </varlistentry>
    281 
    282281    </variablelist>
    283282
  • server/databases/mariadb.xml

    rac278af2 r388747dd  
    88  <!ENTITY mariadb-download-http "https://downloads.mariadb.org/interstitial/mariadb-&mariadb-version;/source/mariadb-&mariadb-version;.tar.gz">
    99  <!ENTITY mariadb-download-ftp  "ftp://mirrors.fe.up.pt/pub/mariadb/mariadb-&mariadb-version;/source/mariadb-&mariadb-version;.tar.gz">
    10   <!ENTITY mariadb-md5sum        "1604076fb0ba31c8c4ed78cbbf10a148">
     10  <!ENTITY mariadb-md5sum        "add57692b7a6888c3ffb304222e2cb80">
    1111  <!ENTITY mariadb-size          "83 MB">
    12   <!ENTITY mariadb-buildsize     "1.7 GB (639 MB installed)">
    13   <!ENTITY mariadb-time          "9.4 SBU (with parallelism=4, add 0.4 SBU for tests)">
     12  <!ENTITY mariadb-buildsize     "2.3 GB (639 MB installed)">
     13  <!ENTITY mariadb-time          "7.0 SBU (with parallelism=4, add 0.5 SBU for tests)">
    1414]>
    1515
Note: See TracChangeset for help on using the changeset viewer.