Changeset 0293de0 for xsoft


Ignore:
Timestamp:
02/25/2019 03:49:35 PM (5 years ago)
Author:
Douglas R. Reno <renodr@…>
Branches:
10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 8.4, 9.0, 9.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:
9e31c896
Parents:
cc2e1ac6
Message:

Update systemd security patch
Update to libreoffice-6.2.0.3

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

File:
1 edited

Legend:

Unmodified
Added
Removed

  • xsoft/office/libreoffice.xml

    rcc2e1ac6 r0293de0  
    88
    99  <!ENTITY libreoffice-core-download-http "&libreoffice-dl;/libreoffice-&libreoffice-dlversion;.tar.xz">
    10   <!ENTITY libreoffice-core-md5sum        "f6e69df90d8d6de6dd223d5309f71caa">
    11   <!ENTITY libreoffice-core-size          "198 MB">
     10  <!ENTITY libreoffice-core-md5sum        "b559a89014fdcadabdb7469e0ab6b37c">
     11  <!ENTITY libreoffice-core-size          "204 MB">
    1212
    1313  <!ENTITY libreoffice-dict-download-http "&libreoffice-dl;/libreoffice-dictionaries-&libreoffice-dlversion;.tar.xz">
    14   <!ENTITY libreoffice-dict-md5sum        "e5bb56a92b72c3102f4917aafebba3b4">
    15   <!ENTITY libreoffice-dict-size          "42 MB">
     14  <!ENTITY libreoffice-dict-md5sum        "875a61fbb92696d73e04856a67065d81">
     15  <!ENTITY libreoffice-dict-size          "43 MB">
    1616
    1717  <!ENTITY libreoffice-help-download-http "&libreoffice-dl;/libreoffice-help-&libreoffice-dlversion;.tar.xz">
    18   <!ENTITY libreoffice-help-md5sum        "e02680a25ab4f5eee112170f20bf47d0">
    19   <!ENTITY libreoffice-help-size          "16 MB">
     18  <!ENTITY libreoffice-help-md5sum        "4a50d93f25f09f3d47f7dc110955c9c0">
     19  <!ENTITY libreoffice-help-size          "15 MB">
    2020
    2121  <!ENTITY libreoffice-translations-download-http "&libreoffice-dl;/libreoffice-translations-&libreoffice-dlversion;.tar.xz">
    22   <!ENTITY libreoffice-translations-md5sum        "8c99e7da7bfc9515f5d074ca7449471b">
     22  <!ENTITY libreoffice-translations-md5sum        "1d3b58c790c64d9d4f82c333e2aa0f21">
    2323  <!ENTITY libreoffice-translations-size          "135 MB">
    2424
    … …  
    2727   the built source after initial DESTDIR install doesn't take a vast time -->
    2828
    29   <!ENTITY libreoffice-buildsize  "6.4 GB (756 MB installed). Installing the whole set of languages was previously reported to require up to 26 GB (2.9 GB installed)">
     29  <!ENTITY libreoffice-buildsize  "8.9 GB (827 MB installed). Installing the whole set of languages was previously reported to require up to 26 GB (2.9 GB installed)">
    3030
    3131  <!-- for 6.1.2.1 I allowed 2 SBU for downloads, my total was
    … …  
    6060    </para>
    6161
    62     &lfs83_checked;
     62    &lfs84_checked;
    6363
    6464    <bridgehead renderas="sect3">Package Information</bridgehead>
    … …  
    148148
    149149
    150 <!-- keep one commented patch, it's sure to again need one or more in a few months -->
     150<!-- keep one commented patch, it's sure to again need one or more in a few months:
     151For libreoffice 6.2.0.4, almost blfs 8.4: no patch needed, only a sed below
    151152      <listitem>
    152153        <para>
    … …  
    156157        </para>
    157158      </listitem>
    158 
    159       <listitem>
    160         <para>
    161           Required patch to allow building against <xref linkend="openjdk"/>:
    162           <ulink url="&patch-root;/libreoffice-&libreoffice-dlversion;-jdk11_fixes-1.patch"/>
    163         </para>
    164       </listitem>
     159-->
    165160
    166161    </itemizedlist>
    … …  
    229224<!-- not anymore in the book, but included in apache-ant
    230225     <xref linkend="junit"/>, -->
    231 <!--      <xref linkend="kdelibs"/>, -->
     226      <xref linkend="kf5-frameworks"/>,
    232227      <xref linkend="mariadb"/> or <ulink url="http://www.mysql.com/">MySQL</ulink>,
    233228      <xref linkend="mitkrb"/>,
    … …  
    305300cd libreoffice-&libreoffice-dlversion;</userinput></screen>
    306301
    307 <!-- keep a commented instruction if no patches are currently required -->
    308     <para> <!-- for all recent versions -->
     302<!-- keep a commented instruction if no patches are currently required
     303    <para> <!- - for all recent versions - ->
    309304     Fix build failures introduced by recent versions of <xref linkend="poppler"/>
    310305     and <xref linkend="boost"/>:
    … …  
    312307
    313308<screen><userinput>patch -Np1 -i ../libreoffice-&libreoffice-dlversion;-consolidated_fixes-1.patch</userinput></screen>
    314 
    315     <para>
    316       Fix a build failure introduced by recent versions of
    317       <xref linkend="openjdk"/>:
    318       <!-- Needed for OpenJDK-11.0.2+7 AND 9 - removed method calls -->
    319     </para>
    320 
    321 <screen><userinput>patch -Np1 -i ../libreoffice-&libreoffice-dlversion;-jdk11_fixes-1.patch</userinput></screen>
     309-->
     310    <para>
     311      Fix a type mismatch introduced by recent versions of <xref
     312      linkend="boost"/>:
     313    </para>
     314
     315<screen><userinput>sed -i 's/loaded;/bool{loaded};/' sfx2/source/appl/shutdownicon.cxx</userinput></screen>
    322316
    323317    <para>
    … …  
    373367sed -e "/distro-install-file-lists/d" -i Makefile.in &amp;&amp;
    374368
     369<!-- Removed in 6.2             - -with-alloc=system         \-->
    375370./autogen.sh --prefix=$LO_PREFIX         \
    376371             --sysconfdir=/etc           \
    … …  
    379374             --with-help                 \
    380375             --with-myspell-dicts        \
    381              --with-alloc=system         \
    382376             --without-junit             \
    383377             --without-system-dicts      \
    … …  
    424418    </para>
    425419
    426 <screen><userinput>CPPFLAGS='-DU_USING_ICU_NAMESPACE=1' make build-nocheck</userinput></screen>
     420<screen><userinput>make build-nocheck</userinput></screen>
     421<!--<screen><userinput>CPPFLAGS='-DU_USING_ICU_NAMESPACE=1' make build-nocheck</userinput></screen>-->
    427422
    428423    <para>
    … …  
    588583    </para>
    589584
     585<!--
    590586    <para>
    591587      <command>CPPFLAGS='-DU_USING_ICU_NAMESPACE=1' make ...</command>: <xref
    … …  
    595591      <application>libreoffice</application>.
    596592    </para>
     593-->
     594    <para>
     595      <command>make distro-pack-install</command>: this does a normal
     596      install, but if you add a DESTDIR environment variable it will also
     597      install a lot of (text) gid_Module_* files in the DESTDIR, to help
     598      distributions which want to break the package into parts.
     599    </para>
    597600
    598601    <para>
    … …  
    642645
    643646    <para>
    644       <option>--with-java</option>: This switch enables
     647      <option>--without-java</option>: This switch disables
    645648      <application>Java</application> support in
    646649      <application>LibreOffice</application>. Java is needed for the
    647650      deprecated HSQLDB driver, which allows reading databases created by
    648651      other programs or in earlier versions of libreoffice
    649       <application>base</application>. You may also need to add:
    650       <option>--with-junit=/opt/ant/lib/junit-4.12.jar</option>
    651       <option>--with-jdk-home=/opt/jdk</option>
    652       <option>--with-hamcrest=/opt/ant/lib/hamcrest-core-1.3.jar</option>
     652      <application>base</application>.
     653    </para>
     654
     655    <para>
     656      <option>--with-junit=/opt/ant/lib/junit-4.12.jar</option> and
     657      <option>--with-hamcrest=/opt/ant/lib/hamcrest-core-1.3.jar</option>:
     658      Those options are needed if you want to run the tests.
    653659    </para>
    654660
    … …  
    661667
    662668    <para>
    663       <parameter>make distro-pack-install</parameter>: this does a normal
    664       install, but if you add a DESTDIR environment variable it will also
    665       install a lot of (text) gid_Module_* files in the DESTDIR, to help
    666       distributions which want to break the package into parts.
     669      <option>--with-kde5</option>: Builds with KDE/Plasma integration. If
     670      <xref linkend="qt5"/> and/or <xref linkend="kf5-frameworks"/> are not
     671      installed in <filename class="directory">/usr</filename>, the include
     672      and library directories must be specified in <envar>QT5INC</envar>,
     673      <envar>QT5LIB</envar>, <envar>KF5INC</envar>, and <envar>KF5LIB</envar>,
     674      respectively.
    667675    </para>
    668676
Note: See TracChangeset for help on using the changeset viewer.