Changeset b8242d8


Ignore:
Timestamp:
10/08/2014 10:41:25 PM (8 years ago)
Author:
Christopher Gregory <cjg@…>
Branches:
kde5-14686, systemd-13485
Children:
d8f24ca
Parents:
0e2cc6f
Message:

Fix book validation due to libreoffice merge. Merge updates from trunk.

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

Files:
4 edited

Legend:

Unmodified
Added
Removed

  • introduction/welcome/changelog.xml

    r0e2cc6f rb8242d8  
    4545-->
    4646    <listitem>
     47      <para>October 8th, 2014</para>
     48      <itemizedlist>
     49        <listitem>
     50          <para>[fernando] - Update to sudo-1.8.11p1.  Fixes
     51          <ulink url="&blfs-ticket-root;5634">#5634</ulink>.</para>
     52        </listitem>
     53      </itemizedlist>
     54    </listitem>
     55
     56    <listitem>
    4757      <para>October 7th, 2014</para>
    4858      <itemizedlist>

  • packages.ent

    r0e2cc6f rb8242d8  
    3636<!ENTITY ssh-askpass-version          "&openssh-version;">
    3737<!ENTITY stunnel-version              "5.04">
    38 <!ENTITY sudo-version                 "1.8.11">
     38<!ENTITY sudo-version                 "1.8.11p1">
    3939<!ENTITY tripwire-version             "2.4.2.2">
    4040

  • postlfs/security/sudo.xml

    r0e2cc6f rb8242d8  
    77  <!ENTITY sudo-download-http "http://www.sudo.ws/sudo/dist/sudo-&sudo-version;.tar.gz">
    88  <!ENTITY sudo-download-ftp  "ftp://ftp.sudo.ws/pub/sudo/sudo-&sudo-version;.tar.gz">
    9   <!ENTITY sudo-md5sum        "9a642cf6aca5375f8569a2961f44d0f3">
     9  <!ENTITY sudo-md5sum        "5065deec62e8cd514fb04d1d1253db03">
    1010  <!ENTITY sudo-size          "2.3 MB">
    1111  <!ENTITY sudo-buildsize     "24 MB (additional 2 MB for tests)">
    12   <!ENTITY sudo-time          "0.5 SBU">
     12  <!ENTITY sudo-time          "0.5 SBU (additional 0.1 SBU for tests)">
    1313]>
    1414

  • xsoft/office/libreoffice.xml

    r0e2cc6f rb8242d8  
    175175        Most of these packages are recommended because if they're not installed,
    176176        the build process will compile and install its own (often older)
    177         version. If you have not installed some of the dependencies listed below,
    178         make sure you examine the <command>./configure --help</command> output
    179         for information on switches needed to prevent
    180         <command>./configure</command> to look for them.
     177        version.
    181178      </para>
    182179    </note>
    … …  
    188185      <xref linkend="curl"/>,
    189186      <xref linkend="dbus-glib"/>,
     187      <xref linkend="libjpeg"/>,
    190188      <xref linkend="glu"/>,
    191189      <xref linkend="graphite2"/>,
    … …  
    196194      <xref linkend="icu"/>,
    197195      <xref linkend="lcms2"/>,
    198       <xref linkend="libatomic_ops"/>,
    199       <xref linkend="libjpeg"/>,
    200196      <xref linkend="librsvg"/>,
    201197      <xref linkend="libxml2"/> and
    … …  
    221217      <xref linkend="gtk3"/>,
    222218      <xref linkend="kdelibs"/>,
    223       <xref linkend="mariadb"/>,
     219      <xref linkend="libatomic_ops"/>,
     220      <xref linkend="mariadb"/> or <ulink url="http://www.mysql.com/">MySQL</ulink>,
    224221      <xref linkend="mitkrb"/>,
    225222      <xref linkend="openjdk"/>,
    … …  
    227224      <xref linkend="sane"/>,
    228225      <xref linkend="vlc"/>,
    229       <xref linkend="zenity"/>,
    230226      <ulink url="http://sourceforge.net/projects/cppunit/">Cppunit</ulink>,
    231       <ulink url="http://www.firebirdsql.org/">Firebird</ulink>,
     227      <ulink url="http://www.firebirdsql.org/">firebird</ulink>,
     228      <ulink url="http://downloads.sourceforge.net/glew/">glew (OpenGL Extension Wrangler Library)</ulink>,
    232229      <ulink url="http://hunspell.sourceforge.net/">Hunspell</ulink>,
    233230      <ulink url="http://sourceforge.net/projects/hunspell/files/Hyphen/">Hyphen</ulink>,
    … …  
    242239      <ulink url="http://sourceforge.net/projects/libmwaw/">libmwaw</ulink>,
    243240      <ulink url="http://sourceforge.net/projects/libwpd/files/libodfgen/">libodfgen</ulink>,
     241      <ulink url="http://sourceforge.net/projects/libwpd/files/librevenge/">librevenge (WordPerfect Document importer)</ulink>,
    244242      <ulink url="http://www.freedesktop.org/wiki/Software/libvisio/">libvisio</ulink>,
    245243      <ulink url="http://libwpd.sourceforge.net/">libwpd</ulink>,
    … …  
    249247      <ulink url="http://code.google.com/p/multidimalgorithm/">mdds</ulink>,
    250248      <ulink url="http://sourceforge.net/projects/hunspell/files/MyThes/">MyThes</ulink>,
    251       <ulink url="https://gitorious.org/orcus">Orcus</ulink>, and
    252       <ulink url="http://hci.iwr.uni-heidelberg.de/vigra/">VIGRA</ulink>
     249      <ulink url="http://sourceforge.net/projects/ogl-math/">ogl-math - OpenGL Mathematics (GLM)</ulink>,
     250      <ulink url="https://gitorious.org/orcus/">Orcus</ulink>,
     251      <ulink url="http://hci.iwr.uni-heidelberg.de/vigra/">VIGRA</ulink>, and
     252      <ulink url="&gnome-download-http;/zenity/">Zenity</ulink>
    253253    </para>
    254254
    … …  
    312312    <para>
    313313      Unpack the dictionaries file and create symlinks to tarballs from the
    314       source directory so they won't get downloaded againi.  It is not necessary
     314      source directory so they won't get downloaded again.  It is not necessary
    315315      to unpack the help nor the translations tarballs:
    316316    </para>
    … …  
    319319
    320320tar -xf ../libreoffice-dictionaries-&libreoffice-dlversion;.tar.xz \
    321         --no-overwrite-dir --strip-components=1</userinput></screen>
    322 <!--    -\-no-overwrite-dir -\-strip-components=1    &amp;&amp; -->
     321        --no-overwrite-dir --strip-components=1    &amp;&amp;
    323322<!-- Not necessary for this version
    324323tar -xf ../libreoffice-help-&libreoffice-dlversion;.tar.xz -\-no-overwrite-dir -\-strip-components=1 &amp;&amp;
    … …  
    329328
    330329<!-- Not necessary for this version
     330    <para>
     331      If you have downloaded the translations tarball, unpack it:
     332    </para>
     333
     334<screen><userinput>tar -xf ../libreoffice-translations-&libreoffice-dlversion;.tar.xz -\-no-overwrite-dir -\-strip-components=1 &amp;&amp;
     335ln -sv ../../libreoffice-translations-&libreoffice-dlversion;.tar.xz src/</userinput></screen>
     336-->
    331337    <para>
    332338      If you have downloaded the translations tarball, create a symlink:
    … …  
    345351
    346352    <para>
    347       In the rest of the page, locales "en-US" and "pt-BR" are examples. Change
    348       them to suit your needs. You might want to read the "Command Explanations"
    349       further below before proceeding.
     353      In the rest of the page, locales "en-US" and "pt-BR" are examples; you
     354      can change them to suit your needs - you might want to read the
     355      "Command Explanations", further below, before proceeding.
    350356    </para>
    351357
    … …  
    382388chmod -v +x bin/unpack-sources                       &amp;&amp;
    383389
    384 chmod -v +x bin/unpack-sources                     &amp;&amp;
    385390sed -e "s/target\.mk/langlist\.mk/"                \
    386391    -e "s/tar -xf/tar -x --strip-components=1 -f/" \
    … …  
    388393    -i bin/unpack-sources                            &amp;&amp;
    389394
    390 ./autogen.sh --prefix=/usr               \
     395./autogen.sh --prefix=$LO_PREFIX         \
    391396             --sysconfdir=/etc           \
    392397             --with-vendor="BLFS"        \
    … …  
    410415             --with-system-jpeg          \
    411416             --with-system-lcms2         \
    412              --with-system-libatomic_ops \
    413417             --with-system-libpng        \
    414418             --with-system-libxml        \
    … …  
    431435    </para>
    432436
    433     <note>
    434       <para>
    435         The package needs to be built from an X terminal emulator.
    436       </para>
    437     </note>
    438 
    439437    <para>
    440438      Build the package:
    … …  
    447445    </para>
    448446
    449 <screen role="root"><userinput>make distro-pack-install             &amp;&amp;
    450 install -v -dm755 /usr/share/appdata &amp;&amp;
    451 install -v -m644  sysui/desktop/appstream-appdata/*.xml \
    452                   /usr/share/appdata</userinput></screen>
     447<screen role="root"><userinput>make distro-pack-install                                  &amp;&amp;
     448install -v -m755 -d $LO_PREFIX/share/appdata              &amp;&amp;
     449install -v -m644    sysui/desktop/appstream-appdata/*.xml \
     450                    $LO_PREFIX/share/appdata</userinput></screen>
    453451
    454452    <para>
    … …  
    457455    </para>
    458456
    459 <screen role="root"><userinput>chown -cR 0:0 dictionaries/                                                  &amp;&amp;
    460 mkdir -pv /usr/lib/libreoffice/share/extensions/dict-en                      &amp;&amp;
    461 cp -rv    dictionaries/en/* /usr/lib/libreoffice/share/extensions/dict-en    &amp;&amp;
    462 mkdir -pv /usr/lib/libreoffice/share/extensions/dict-pt-BR                   &amp;&amp;
    463 cp -rv    dictionaries/pt_BR/* /usr/lib/libreoffice/share/extensions/dict-pt-BR</userinput></screen>
     457<screen role="root"><userinput>chown -cR 0:0 dictionaries/                                                        &amp;&amp;
     458mkdir -pv $LO_PREFIX/lib/libreoffice/share/extensions/dict-en                      &amp;&amp;
     459cp -vR dictionaries/en/*    $LO_PREFIX/lib/libreoffice/share/extensions/dict-en    &amp;&amp;
     460mkdir -pv $LO_PREFIX/lib/libreoffice/share/extensions/dict-pt-BR                   &amp;&amp;
     461cp -vR dictionaries/pt_BR/* $LO_PREFIX/lib/libreoffice/share/extensions/dict-pt-BR</userinput></screen>
    464462
    465463    <para>
    … …  
    499497      the vendor which is mentioned when you click "About" on the toolbar.
    500498    </para>
     499<!-- I believe en-US is not necessary anymore
     500    <para>
     501      <parameter>-\-with-lang="en-US pt-BR"</parameter>: This switch sets
     502      what languages to support. en-US is always needed. To list several
     503      languages, separate them with a space. For all languages, use
     504      <parameter>-\-with-lang=ALL</parameter>
     505    </para>
     506-->
    501507
    502508    <para>
    503509      <parameter>--with-lang="en-US pt-BR"</parameter>: This switch sets
    504       what languages to support. To list several languages, separate them
    505       with a space. For all languages, use
     510      what languages to support. To list several languages, separate them with
     511      a space. For all languages, use
    506512      <parameter>--with-lang=ALL</parameter>.
    507513    </para>
    … …  
    515521
    516522    <para>
    517       <parameter>--with-help</parameter>: This switch is used to build
    518       the help files.
     523      <parameter>--with-help</parameter>: Without this switch, the help files
     524      are not built.
    519525    </para>
    520526
    … …  
    555561 
    556562    <para>
    557       <parameter>--enable-release-build</parameter>: This switch is used to
    558       remove "Beta" or "Dev" from <application>LibreOffice</application>
    559       splash screen and "About" menu.
     563      <parameter>--enable-release-build=yes</parameter>: This switch enables a
     564      Release Build.
     565      <application>LibreOffice</application> can be built as a Release Build or
     566      as a Developer Build, because their default installation paths and user
     567      profile paths are different. Developer Build displays the words "Dev" and
     568      "Beta" in several places (e.g, menu and splash screen).
    560569    </para>
    561570
    … …  
    581590
    582591    <para>
    583       <option>--disable-gstreamer-0-10</option>: Use this switch if you
    584       haven't installed <xref linkend="gst-plugins-base"/>.
     592      <option>--disable-cups</option>: Use this switch if you don't need
     593      printing support.
    585594    </para>
    586595
    … …  
    615624      <segtitle>Installed Programs</segtitle>
    616625      <segtitle>Installed Libraries</segtitle>
    617       <segtitle>Installed Directories</segtitle>
     626      <segtitle>Installed Directory</segtitle>
    618627
    619628      <seglistitem>
    620629        <seg>
    621630          libreoffice, lobase, localc, lodraw, loffice, lofromtemplate,
    622           loimpress, lomath, loweb, lowriter, soffice and unopkg
     631          loimpress, lomath, loweb, lowriter, soffice and unopkg;
     632          several programs under
     633          $LO_PREFIX/lib/libreoffice/program
    623634        </seg>
    624635        <seg>
    625           None
     636          several libraries under
     637          $LO_PREFIX/lib/libreoffice/{ure/lib,program}
    626638        </seg>
    627639        <seg>
    628           /usr/lib/libreoffice
     640          $LO_PREFIX/lib/libreoffice
    629641        </seg>
    630642      </seglistitem>
Note: See TracChangeset for help on using the changeset viewer.