Changeset 5be9aa62 for xsoft


Ignore:
Timestamp:
08/21/2014 07:19:59 PM (10 years ago)
Author:
Krejzi <krejzi@…>
Branches:
7.6-blfs, 7.6-systemd, kde5-14269, kde5-14686, systemd-13485
Children:
9f465ac
Parents:
f53f4d1b
Message:

Switch libreoffice prefix to /usr by default - everything is installed in /usr/lib/libreoffice anyways, simplify some instructions and explanations, fix typos.

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

File:
1 edited

Legend:

Unmodified
Added
Removed

  • xsoft/office/libreoffice.xml

    rf53f4d1b r5be9aa62  
    130130      <listitem>
    131131        <para>
    132           Required patch for i686 systems, in order to fix a problem inroduced
     132          Required patch for i686 systems, in order to fix a problem introduced
    133133          by <application>&gcc-490;</application>:
    134134          <ulink url="&patch-root;/libreoffice-&libreoffice-dlversion;-gcc_4_9_0-1.patch"/>
    … …  
    153153        Most of these packages are recommended because if they're not installed,
    154154        the build process will compile and install its own (often older)
    155         version.
     155        version. If you have not installed some of the dependencies listed below,
     156        make sure you examine <command>./configure --help</command> output for
     157        information on switches that are needed to disable them.
    156158      </para>
    157159    </note>
    158160
    159161    <para role="recommended">
    160       <xref linkend="libjpeg"/>,
    161       <xref linkend="glu"/>,
    162       <xref linkend="gtk2"/>,
    163       <xref linkend="boost"/>,
     162      <!--<xref linkend="boost"/>,-->
    164163      <xref linkend="clucene"/>,
    165164      <xref linkend="cups"/>,
    166165      <xref linkend="curl"/>,
    167166      <xref linkend="dbus-glib"/>,
     167      <xref linkend="glu"/>,
    168168      <xref linkend="graphite2"/>,
    169169      <xref linkend="gst-plugins-base"/> or
    170170      <xref linkend="gst10-plugins-base"/>,
     171      <xref linkend="gtk2"/>,
    171172      <xref linkend="harfbuzz"/>,
    172173      <xref linkend="icu"/>,
    173174      <xref linkend="lcms2"/>,
     175      <xref linkend="libjpeg"/>,
    174176      <xref linkend="librsvg"/>,
    175177      <xref linkend="libxml2"/> and
    … …  
    193195      <xref linkend="doxygen"/> (not relevant if using --disable-odk),
    194196      <ulink url="http://sourceforge.net/projects/cppunit/">Cppunit</ulink>,
    195       <ulink url="http://www.firebirdsql.org/">firebird</ulink>,
     197      <ulink url="http://www.firebirdsql.org/">Firebird</ulink>,
    196198      <xref linkend="gdb"/>,
    197199      <xref linkend="gtk3"/>,
    … …  
    225227      <xref linkend="sane"/>,
    226228      <xref linkend="vlc"/>, and
    227       <ulink url="&gnome-download-http;/zenity/">Zenity</ulink>
     229      <xref linkend="zenity"/>
    228230    </para>
    229231
    … …  
    257259        You can avoid this unpleasantness by
    258260        <emphasis>not</emphasis> untaring it as
    259         <systemitem class="username">root</systemitem>. If you must untar it as
    260         <systemitem class="username">root</systemitem> pass the option
    261         <option>--no-overwrite-dir</option> to tar. This is the default when you
    262         untar as a user but has to be passed as an option when untaring as
    263         <systemitem class="username">root</systemitem>:
     261        <systemitem class="username">root</systemitem>. If you must untar
     262        it as <systemitem class="username">root</systemitem> pass the
     263        option <option>--no-overwrite-dir</option> to tar when untaring
     264        as <systemitem class="username">root</systemitem>:
    264265      </para>
    265266    </warning>
    … …  
    270271    <para>
    271272      Unpack the dictionaries file and create symlinks to tarballs from the
    272       source directory so they won't get downloaded again (it is not necessary
    273       to unpack the help nor the translations tarballs):
     273      source directory so they won't get downloaded again:
    274274    </para>
    275275
    … …  
    277277
    278278tar -xf ../libreoffice-dictionaries-&libreoffice-dlversion;.tar.xz --no-overwrite-dir --strip-components=1 &amp;&amp;
    279 <!-- Not necessary for this version
    280 tar -xf ../libreoffice-help-&libreoffice-dlversion;.tar.xz -\-no-overwrite-dir -\-strip-components=1 &amp;&amp;
    281 -->
    282 ln -sv ../../libreoffice-dictionaries-&libreoffice-dlversion;.tar.xz src/ &amp;&amp;
    283 ln -sv ../../libreoffice-help-&libreoffice-dlversion;.tar.xz src/</userinput></screen>
    284 
    285 <!-- Not necessary for this version
    286     <para>
    287       If you have downloaded the translations tarball, unpack it:
    288     </para>
    289 
    290 <screen><userinput>tar -xf ../libreoffice-translations-&libreoffice-dlversion;.tar.xz -\-no-overwrite-dir -\-strip-components=1 &amp;&amp;
    291 ln -sv ../../libreoffice-translations-&libreoffice-dlversion;.tar.xz src/</userinput></screen>
    292 -->
     279ln -sfv ../../libreoffice-dictionaries-&libreoffice-dlversion;.tar.xz src/ &amp;&amp;
     280ln -sfv ../../libreoffice-help-&libreoffice-dlversion;.tar.xz src/</userinput></screen>
     281
    293282    <para>
    294283      If you have downloaded the translations tarball, create a symlink:
    295284    </para>
    296285
    297 <screen><userinput>ln -sv ../../libreoffice-translations-&libreoffice-dlversion;.tar.xz src/</userinput></screen>
     286<screen><userinput>ln -sfv ../../libreoffice-translations-&libreoffice-dlversion;.tar.xz src/</userinput></screen>
    298287
    299288    <note>
    … …  
    307296
    308297    <para>
    309       In the rest of the page, locales "en-US" and "pt-BR" are examples; you
    310       can change them to suit your needs - you might want to read the
    311       "Command Explanations", further below, before proceeding.
    312     </para>
    313 
    314     <para>
    315       Due to the large size of the package, you may prefer to install it in
    316       <filename class="directory">/opt</filename>, instead of
    317       <filename class="directory">/usr</filename>. Depending on your choice,
    318       replace <replaceable>&lt;PREFIX&gt;</replaceable> by
    319       <filename class="directory">/usr</filename> or by
    320       <filename class="directory">/opt/libreoffice-&libreoffice-dlversion;</filename>:
    321     </para>
    322 
    323 <screen><userinput>export LO_PREFIX=<replaceable>&lt;PREFIX&gt;</replaceable></userinput></screen>
     298      In the rest of the page, locales "en-US" and "pt-BR" are examples. Change
     299      them to suit your needs. You might want to read the "Command Explanations"
     300      further below before proceeding.
     301    </para>
    324302
    325303    <para>
    … …  
    346324    -i bin/unpack-sources                          &amp;&amp;
    347325
    348 ./autogen.sh --prefix=$LO_PREFIX         \
     326./autogen.sh --prefix=/usr               \
    349327             --sysconfdir=/etc           \
    350328             --with-vendor="BLFS"        \
    … …  
    356334             --disable-odk               \
    357335             --disable-postgresql-sdbc   \
    358              --enable-release-build=yes  \
     336             --enable-release-build      \
    359337             --enable-python=system      \
    360338             --with-system-boost         \
    … …  
    398376    </para>
    399377
    400 <screen role="root"><userinput>make distro-pack-install                                  &amp;&amp;
    401 install -v -m755 -d $LO_PREFIX/share/appdata              &amp;&amp;
    402 install -v -m644    sysui/desktop/appstream-appdata/*.xml \
    403                     $LO_PREFIX/share/appdata</userinput></screen>
     378<screen role="root"><userinput>make distro-pack-install             &amp;&amp;
     379install -v -dm755 /usr/share/appdata &amp;&amp;
     380install -v -m644  sysui/desktop/appstream-appdata/*.xml \
     381                  /usr/share/appdata</userinput></screen>
    404382
    405383    <para>
    … …  
    408386    </para>
    409387
    410 <screen role="root"><userinput>chown -cR 0:0 dictionaries/                                                        &amp;&amp;
    411 mkdir -pv $LO_PREFIX/lib/libreoffice/share/extensions/dict-en                      &amp;&amp;
    412 cp -vR dictionaries/en/*    $LO_PREFIX/lib/libreoffice/share/extensions/dict-en    &amp;&amp;
    413 mkdir -pv $LO_PREFIX/lib/libreoffice/share/extensions/dict-pt-BR                   &amp;&amp;
    414 cp -vR dictionaries/pt_BR/* $LO_PREFIX/lib/libreoffice/share/extensions/dict-pt-BR</userinput></screen>
    415 
    416     <para>
    417        If installed in <filename class="directory">/opt/libreoffice-&libreoffice-dlversion;</filename>
    418        and the icons in the new items of the desktop menu are not properly displayed,
    419        optionally run the following commands, as
    420        <systemitem class="username">root</systemitem> user (it may be necessary
    421        to logout the session, before the icons appear):
    422     </para>
    423 
    424 <screen role="root"><userinput>mkdir -pv /usr/share/pixmaps &amp;&amp;
    425 for i in writer base calc draw impress math startcenter writer
    426 do
    427   ln -svf /opt/libreoffice-&libreoffice-dlversion;/share/icons/hicolor/32x32/apps/libreoffice-$i.png \
    428           /usr/share/pixmaps/
    429 done
    430 unset i</userinput></screen>
     388<screen role="root"><userinput>chown -cR 0:0 dictionaries/                                                  &amp;&amp;
     389mkdir -pv /usr/lib/libreoffice/share/extensions/dict-en                      &amp;&amp;
     390cp -rv    dictionaries/en/* /usr/lib/libreoffice/share/extensions/dict-en    &amp;&amp;
     391mkdir -pv /usr/lib/libreoffice/share/extensions/dict-pt-BR                   &amp;&amp;
     392cp -rv    dictionaries/pt_BR/* /usr/lib/libreoffice/share/extensions/dict-pt-BR</userinput></screen>
    431393
    432394  </sect2>
    … …  
    449411      the vendor which is mentioned when you click "About" on the toolbar.
    450412    </para>
    451 <!-- I believe en-US is not necessary anymore
    452     <para>
    453       <parameter>-\-with-lang="en-US pt-BR"</parameter>: This switch sets
    454       what languages to support. en-US is always needed. To list several
    455       languages, separate them with a space. For all languages, use
    456       <parameter>-\-with-lang=ALL</parameter>
    457     </para>
    458 -->
    459413
    460414    <para>
    461415      <parameter>--with-lang="en-US pt-BR"</parameter>: This switch sets
    462       what languages to support. To list several languages, separate them with
    463       a space. For all languages, use
     416      what languages to support. To list several languages, separate them
     417      with a space. For all languages, use
    464418      <parameter>--with-lang=ALL</parameter>.
    465419    </para>
    466420
    467     <note><para>
    468       For a list of the available languages, you can uncompress the
    469       translations tarball, <command>tar -xf
    470       ../libreoffice-translations-&libreoffice-dlversion;.tar.xz
    471       --no-overwrite-dir -C /tmp</command>, and run <command>ls
    472       /tmp/libreoffice-&libreoffice-dlversion;/translations/source</command>.
    473     </para></note>
    474 
    475     <para>
    476       <parameter>--with-help</parameter>: Without this switch, the help files
    477       are not built.
     421    <note>
     422      <para>
     423        For a list of the available languages, you can uncompress the
     424        translations tarball by running the following command:
     425        <command>tar -xf
     426        ../libreoffice-translations-&libreoffice-dlversion;.tar.xz
     427        --no-overwrite-dir -C /tmp</command> and proceed to examine
     428        the contents of <filename
     429        class="directory">/tmp/libreoffice-&libreoffice-dlversion;/translations/source</filename>.
     430      </para>
     431    </note>
     432
     433    <para>
     434      <parameter>--with-help</parameter>: This switch is used to build
     435      the help files.
    478436    </para>
    479437
    … …  
    514472 
    515473    <para>
    516       <parameter>--enable-release-build=yes</parameter>: This switch enables a
    517       Release Build.
    518       <application>LibreOffice</application> can be built as a Release Build or
    519       as a Developer Build, because their default installation paths and user
    520       profile paths are different. Developer Build displays the words "Dev" and
    521       "Beta" in several places (e.g, menu and splash scren).
     474      <parameter>--enable-release-build</parameter>: This switch is used to
     475      remove "Beta" or "Dev" from <application>LibreOffice</application>
     476      splash screen and "About" menu.
    522477    </para>
    523478
    … …  
    545500
    546501    <para>
    547       <option>--disable-cups</option>: Use this switch if you don't need
    548       printing support.
    549     </para>
    550 
    551     <para>
    552       <option>--disable-dbus</option>: Use this switch if you've not
    553       installed D-Bus-1.8.0. It also disables Bluetooth support and
    554       font install via PackageKit.
    555     </para>
    556 
    557     <para>
    558502      <option>--disable-gstreamer-0-10</option>: Use this switch if you've
    559503      not installed <xref linkend="gst-plugins-base"/>.
    … …  
    584528      <segtitle>Installed Programs</segtitle>
    585529      <segtitle>Installed Libraries</segtitle>
    586       <segtitle>Installed Directory</segtitle>
     530      <segtitle>Installed Directories</segtitle>
    587531
    588532      <seglistitem>
    589533        <seg>
    590534          libreoffice, lobase, localc, lodraw, loffice, lofromtemplate,
    591           loimpress, lomath, loweb, lowriter, soffice and unopkg;
    592           several programs under
    593           $LO_PREFIX/lib/libreoffice/program
     535          loimpress, lomath, loweb, lowriter, soffice and unopkg
    594536        </seg>
    595537        <seg>
    596           several libraries under
    597           $LO_PREFIX/lib/libreoffice/{ure/lib,program}
     538          None
    598539        </seg>
    599540        <seg>
    600           $LO_PREFIX/lib/libreoffice
     541          /usr/lib/libreoffice
    601542        </seg>
    602543      </seglistitem>
Note: See TracChangeset for help on using the changeset viewer.