Changeset 64135787 for xsoft/office

Timestamp:

04/13/2021 09:31:15 PM (3 years ago)

Author:

Xi Ruoyao <xry111@…>

Branches:

kde5-14269

Parents:

1ec0251

git-author:

Krejzi <krejzi@…> (09/13/2014 05:36:06 PM)

git-committer:

Xi Ruoyao <xry111@…> (04/13/2021 09:31:15 PM)

Message:

Begin manually (while modifying stuff) merging trunk and systemd branches since revision 14087.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/kde5@14270 af4574ff-66df-0310-9fd7-8a98e5e911e0

File:

• xsoft/office/libreoffice.xml (modified) (13 diffs)

xsoft/office/libreoffice.xml

@@ -8 +8 @@
 
   <!ENTITY libreoffice-core-download-http "&libreoffice-dl;/libreoffice-&libreoffice-dlversion;.tar.xz">
-  <!ENTITY libreoffice-core-md5sum        "de0d9322f3aaeb20abd5e06c5c0972bb">
-  <!ENTITY libreoffice-core-size          "145 MB">
+  <!ENTITY libreoffice-core-md5sum        "cf750c01b6cd0b5c6fdd1760672e67d4">
+  <!ENTITY libreoffice-core-size          "146 MB">
 
   <!ENTITY libreoffice-dict-download-http "&libreoffice-dl;/libreoffice-dictionaries-&libreoffice-dlversion;.tar.xz">
-  <!ENTITY libreoffice-dict-md5sum        "cd27ec060c68079a13abf0984dbbf5fa">
+  <!ENTITY libreoffice-dict-md5sum        "aae27f6c9db741c42acae48a1dfb0f5e">
   <!ENTITY libreoffice-dict-size          "36 MB">
 
   <!ENTITY libreoffice-help-download-http "&libreoffice-dl;/libreoffice-help-&libreoffice-dlversion;.tar.xz">
-  <!ENTITY libreoffice-help-md5sum        "89d9da0ff2d5ea07f8c30c680fee2b0a">
+  <!ENTITY libreoffice-help-md5sum        "24692bf69bbe877ad2524653c991705a">
   <!ENTITY libreoffice-help-size          "1.8 MB">
 
   <!ENTITY libreoffice-translations-download-http "&libreoffice-dl;/libreoffice-translations-&libreoffice-dlversion;.tar.xz">
-  <!ENTITY libreoffice-translations-md5sum        "8e2f7905a0f827f655a1e21d93c6ddf7">
+  <!ENTITY libreoffice-translations-md5sum        "b8d3445100c10bb4f21f6c8f25c5c600">
   <!ENTITY libreoffice-translations-size          "121 MB">
 
-  <!ENTITY libreoffice-buildsize          "8.23 GB (497 MB installed), 9.6 GB (528 MB installed) with translations">
-  <!ENTITY libreoffice-time               "144.3 SBU, with translations">
+  <!ENTITY libreoffice-buildsize          "8.1 GB (497 MB installed)">
+  <!ENTITY libreoffice-time               "200 SBU">
 ]>
 
@@ -130 +130 @@
       <listitem>
         <para>
-          Required patch for i686 systems, in order to fix a problem introduced
-          by <application>&gcc-490;</application>:
+          Required patch to fix building with system Boost:
+          <ulink url="&patch-root;/libreoffice-&libreoffice-dlversion;-boost_1_56_0-1.patch"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Required patch to fix building on i686 systems:
           <ulink url="&patch-root;/libreoffice-&libreoffice-dlversion;-gcc_4_9_0-1.patch"/>
         </para>
@@ -161 +166 @@
 
     <para role="recommended">
-      <!--<xref linkend="boost"/>,-->
+      <xref linkend="boost"/>,
       <xref linkend="clucene"/>,
       <xref linkend="cups"/>,
@@ -208 +213 @@
       <ulink url="http://sourceforge.net/projects/cppunit/">Cppunit</ulink>,
       <ulink url="http://www.firebirdsql.org/">Firebird</ulink>,
+      <ulink url="http://sourceforge.net/projects/glew/">GLEW</ulink>,
       <ulink url="http://hunspell.sourceforge.net/">Hunspell</ulink>,
       <ulink url="http://sourceforge.net/projects/hunspell/files/Hyphen/">Hyphen</ulink>,
@@ -220 +226 @@
       <ulink url="http://sourceforge.net/projects/libmwaw/">libmwaw</ulink>,
       <ulink url="http://sourceforge.net/projects/libwpd/files/libodfgen/">libodfgen</ulink>,
+      <ulink url="http://sourceforge.net/projects/libwpd/files/librevenge/">librevenge</ulink>,
       <ulink url="http://www.freedesktop.org/wiki/Software/libvisio/">libvisio</ulink>,
       <ulink url="http://libwpd.sourceforge.net/">libwpd</ulink>,
@@ -227 +234 @@
       <ulink url="http://code.google.com/p/multidimalgorithm/">mdds</ulink>,
       <ulink url="http://sourceforge.net/projects/hunspell/files/MyThes/">MyThes</ulink>,
-      <ulink url="https://gitorious.org/orcus">Orcus</ulink>, and
+      <ulink url="http://sourceforge.net/projects/ogl-math/">OGL-Math</ulink>,
+      <ulink url="https://gitorious.org/orcus/">Orcus</ulink>, and
       <ulink url="http://hci.iwr.uni-heidelberg.de/vigra/">VIGRA</ulink>
     </para>
@@ -243 +251 @@
     <title>Installation of LibreOffice</title>
 
-    <warning>
-      <para>
-        Untaring the libreoffice-&libreoffice-dlversion; tarball as
-        <systemitem class="username">root</systemitem> has the curious effect of
-        changing the ownership of the <emphasis>parent</emphasis> directory
-        to a user with numerical id 11012 and with the permissions set to allow
-        read, write and execute for that user only! If you untared as
-        <systemitem class="username">root</systemitem> in your home folder you
-        could end up unable to log in again. If you untared it in
-        <filename class="directory">/usr</filename> you would find your user
-        account unable to access any file in
-        <filename class="directory">/usr</filename>.
-      </para>
-
-      <para>
-        You can avoid this unpleasantness by
-        <emphasis>not</emphasis> untaring it as
-        <systemitem class="username">root</systemitem>. If you must untar
-        it as <systemitem class="username">root</systemitem> pass the
-        option <option>--no-overwrite-dir</option> to tar when untaring
-        as <systemitem class="username">root</systemitem>:
-      </para>
-    </warning>
-
-<screen role="root"><userinput>tar -xf libreoffice-&libreoffice-dlversion;.tar.xz --no-overwrite-dir &amp;&amp;
-cd libreoffice-&libreoffice-dlversion;</userinput></screen>
-
     <para>
       Unpack the dictionaries file and create symlinks to tarballs from the
@@ -278 +259 @@
 
 tar -xf ../libreoffice-dictionaries-&libreoffice-dlversion;.tar.xz --no-overwrite-dir --strip-components=1 &amp;&amp;
-ln -sfv ../../libreoffice-dictionaries-&libreoffice-dlversion;.tar.xz external/tarballs/ &amp;&amp;
-ln -sfv ../../libreoffice-help-&libreoffice-dlversion;.tar.xz external/tarballs/</userinput></screen>
+ln -sfv ../../../libreoffice-dictionaries-&libreoffice-dlversion;.tar.xz external/tarballs/ &amp;&amp;
+ln -sfv ../../../libreoffice-help-&libreoffice-dlversion;.tar.xz external/tarballs/</userinput></screen>
 
     <para>
@@ -285 +266 @@
     </para>
 
-<screen><userinput>ln -sfv ../../libreoffice-translations-&libreoffice-dlversion;.tar.xz external/tarballs/</userinput></screen>
+<screen><userinput>
+ln -sfv ../../../libreoffice-translations-&libreoffice-dlversion;.tar.xz external/tarballs/</userinput></screen>
 
     <note>
@@ -303 +285 @@
 
     <para>
-     For i686 systems, fix a problem introduced by
-     <application>&gcc-490;</application>:
+     If building on an i686 system, fix a problem introduced by
+     <application>GCC-4.9.0</application>:
     </para>
 
@@ -314 +296 @@
     </para>
 
-<screen><userinput>sed -e "/gzip -f/d"   \
+<screen><userinput>patch -Np1 -i ../libreoffice-&libreoffice-dlversion;-boost_1_56_0-1.patch &amp;&amp;
+
+sed -e "/gzip -f/d"   \
     -e "s|.1.gz|.1|g" \
     -i bin/distro-install-desktop-integration        &amp;&amp;
 sed -e "/distro-install-file-lists/d" -i Makefile.in &amp;&amp;
 
-sed -e "/distro-install-file-lists/d"           \
-    -e "s:fetch_Download_item:&amp;_unchecked:"     \
-    -e "/fetch_Download_item/s:,no-check::"     \
-   -i Makefile.in                                  &amp;&amp;
+sed -e "/distro-install-file-lists/d" -i Makefile.in &amp;&amp;
 
 chmod -v +x bin/unpack-sources                     &amp;&amp;
@@ -341 +322 @@
              --disable-postgresql-sdbc   \
              --enable-release-build      \
-             --enable-python=system      \<!--
-             - -with-system-boost    \ -->
+             --enable-python=system      \
+             --with-system-boost         \
              --with-system-clucene       \
              --with-system-cairo         \
@@ -413 +394 @@
       <command>sed -e ...</command>: First sed prevents compression of the
       manual pages, the second one prevents a script that causes install to
-      fail from running, the third one fixes the download location
-      and the fourth one fixes the unpack script.
+      fail from running and the third one fixes the unpack script.
     </para>