Changeset 488b738f


Ignore:
Timestamp:
04/04/2018 04:58:01 PM (6 years ago)
Author:
Pierre Labastie <pieere@…>
Branches:
10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, perl-modules, 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:
d560d4b2
Parents:
2faa98e3
Message:

Updates:
icu-61.1, + modify libreoffice instructions to allow building with this

version of icu

vala-0.40.2
apache-ant-1.10.3
dovecot-2.3.1

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

Files:
7 edited

Legend:

Unmodified
Added
Removed

  • general/genlib/icu.xml

    r2faa98e3 r488b738f  
    88           "http://download.icu-project.org/files/icu4c/&icu-version;/icu4c-&icu-dl-version;-src.tgz">
    99  <!ENTITY icu-download-ftp  " ">
    10   <!ENTITY icu-md5sum        "43861b127744b3c0b9d7f386f4b9fa40">
     10  <!ENTITY icu-md5sum        "68fe38999fef94d622bd6843d43c0615">
    1111  <!ENTITY icu-size          "22 MB">
    12   <!ENTITY icu-buildsize     "293 MB (add 33 MB for tests)">
    13   <!ENTITY icu-time          "0.4 SBU (using parallelism=4; add 1.4 SBU for tests)">
     12  <!ENTITY icu-buildsize     "330 MB (add 32 MB for tests)">
     13  <!ENTITY icu-time          "1.7 SBU (add 1.6 SBU for tests)">
    1414]>
    1515

  • general/prog/apache-ant.xml

    r2faa98e3 r488b738f  
    77  <!ENTITY apache-ant-download-http "https://archive.apache.org/dist/ant/source/apache-ant-&apache-ant-version;-src.tar.xz">
    88  <!ENTITY apache-ant-download-ftp  " ">
    9   <!ENTITY apache-ant-md5sum        "57235f3dccfc4b18a260862905ce6c04">
    10   <!ENTITY apache-ant-size          "3.6 MB">
    11   <!ENTITY apache-ant-buildsize     "262 MB">
    12   <!ENTITY apache-ant-time          "0.3 SBU (with a JVM using 4 cores)">
     9  <!ENTITY apache-ant-md5sum        "9db4b8ebdf3ee3a50aceb96ee6d54e6a">
     10  <!ENTITY apache-ant-size          "4.0 MB">
     11  <!ENTITY apache-ant-buildsize     "262 MB (not including downloaded files">
     12  <!ENTITY apache-ant-time          "0.3 SBU (with 4 cores; add download time)">
    1313]>
    1414
    … …  
    6363      </listitem>
    6464    </itemizedlist>
    65 
     65<!--
    6666    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
    6767    <itemizedlist spacing="compact">
    … …  
    9191      </listitem>
    9292    </itemizedlist>
    93 
     93-->
    9494    <bridgehead renderas="sect3">Apache Ant Dependencies</bridgehead>
    9595
    … …  
    112112  <sect2 role="installation">
    113113    <title>Installation of Apache Ant</title>
    114 
     114<!--
    115115    <note><para>Several dependent packages have moved since the packaging of
    116116    <application>Ant</application> requiring download of the above extra files.
    … …  
    122122      ../xz-1.0.jar  lib     &amp;&amp;
    123123unzip -p ../NetRexx-3.06-GA.zip lib/NetRexxC.jar > lib/NetRexxC.jar</userinput></screen>
    124 
    125     <para>Build a limited bootstrap version of <application>Apache
    126     Ant</application> using the following command:</para>
     124-->
     125    <para>
     126      Build a limited bootstrap version of <application>Apache
     127      Ant</application> using the following command:
     128    </para>
    127129
    128130<screen><userinput>./bootstrap.sh</userinput></screen>
    129131
    130     <para>Download the rest of the runtime dependencies using the
    131     <filename>fetch.xml</filename> ant build script:</para>
    132 
    133 <screen><userinput>bootstrap/bin/ant -f fetch.xml -Ddest=system || true &amp;&amp;
     132    <para>
     133      Download the runtime dependencies using the
     134      <filename>fetch.xml</filename> ant build script:
     135    </para>
     136
     137<screen><userinput>bootstrap/bin/ant -f fetch.xml -Ddest=system &amp;&amp;
    134138cp -v lib/*.jar lib/optional/</userinput></screen>
    135139
    136     <para>Build <application>Apache Ant</application> by running the following
    137     command:</para>
     140    <para>
     141      Build <application>Apache Ant</application> by running the following
     142      command:
     143    </para>
    138144
    139145<screen><userinput>./build.sh -Ddist.dir=$PWD/ant-&apache-ant-version; dist</userinput></screen>
    140146
    141     <para>Install, as the <systemitem class="username">root</systemitem> user:</para>
     147    <para>
     148      Install, as the <systemitem class="username">root</systemitem> user:
     149    </para>
    142150
    143151<screen role="root"><userinput>cp -rv ant-&apache-ant-version; /opt/            &amp;&amp;
    … …  
    150158    <title>Command Explanations</title>
    151159
    152     <para><command>bootstrap/bin/ant -f fetch.xml -Ddest=system ||
    153     true</command>: These commands download the rest of the missing dependencies
    154     into the source tree (in the <filename>lib/</filename> directory).</para>
    155 
    156     <para><command>cp -v ... lib/optional</command>: This command copies the
    157     previously downloaded jar files to the expected place in the source
    158     tree so that <command>ant</command> picks them up at buld time.</para>
    159 
    160     <para><command>./build.sh -Ddist.dir=$PWD/ant-&apache-ant-version;
    161     dist</command>: This command builds, tests, then
    162     installs the package into
    163     <filename class='directory'>a temporary directory.</filename>.</para>
     160    <para>
     161      <command>bootstrap/bin/ant -f fetch.xml -Ddest=system</command>:
     162      Downloads the missing dependencies to user's home directory, and copy
     163      them into the source tree (in the <filename>lib/</filename> directory).
     164    </para>
     165
     166    <para>
     167      <command>cp -v ... lib/optional</command>: This command copies the
     168      previously downloaded jar files to the expected place in the source
     169      tree so that <command>ant</command> picks them up at buld time.
     170    </para>
     171
     172    <para>
     173      <command>./build.sh -Ddist.dir=$PWD/ant-&apache-ant-version;
     174      dist</command>: This command builds, tests, then installs the package
     175      into a temporary directory.
     176    </para>
    164177
    165178  </sect2>
    … …  
    222235
    223236      <seglistitem>
    224         <seg>ant, antRun, antRun.pl, complete-ant-cmd.pl, runant.pl, and runant.py</seg>
    225         <seg>ant*.jar</seg>
     237        <seg>
     238          ant, antRun, antRun.pl, complete-ant-cmd.pl, runant.pl, and runant.py         </seg>
     239        <seg>
     240          Numerous <filename>ant*.jar</filename>  and dependant libraries in
     241          <envar>$ANT_HOME</envar><filename>/lib</filename>
     242        </seg>
    226243        <seg>/opt/ant-&apache-ant-version;</seg>
    227244      </seglistitem>

  • general/prog/vala.xml

    r2faa98e3 r488b738f  
    77  <!ENTITY vala-download-http "&gnome-download-http;/vala/&vala-major-version;/vala-&vala-version;.tar.xz">
    88  <!ENTITY vala-download-ftp  "&gnome-download-ftp;/vala/&vala-major-version;/vala-&vala-version;.tar.xz">
    9   <!ENTITY vala-md5sum        "cabefb88e75c4d729cdd2db4ba7eff13">
     9  <!ENTITY vala-md5sum        "e7d05683bcac0306fc8d7c875eb3fef1">
    1010  <!ENTITY vala-size          "3.2 MB">
    11   <!ENTITY vala-buildsize     "111 MB (including tests)">
    12   <!ENTITY vala-time          "0.8 SBU (using parallelism=4; with tests)">
     11  <!ENTITY vala-buildsize     "142 MB (including tests)">
     12  <!ENTITY vala-time          "1.1 SBU (add 0.6 SBU for tests)">
    1313]>
    1414
    … …  
    150150          vala-&vala-major-version;,
    151151          valac,
    152           valadoc,
    153           vala-gen-introspect,
    154           vapicheck, and
     152          valadoc (not built if the sed is applied),
     153          vala-gen-introspect, and
    155154          vapigen (symlinks);
    156155
    157156          valac-&vala-major-version;,
    158           valadoc-&vala-major-version;,
    159           vala-gen-introspect-&vala-major-version;,
    160           vapicheck-&vala-major-version;, and
     157          valadoc-&vala-major-version; (not built if the sed is applied),
     158          vala-gen-introspect-&vala-major-version;, and
    161159          vapigen-&vala-major-version;
    162160        </seg>
    163161        <seg>
    164162          libvala-&vala-major-version;.so and
    165           libvaladoc-&vala-major-version;.so
     163          libvaladoc-&vala-major-version;.so (not built if the sed is applied)
    166164        </seg>
    167165        <seg>
    168166          /usr/include/vala-&vala-major-version;,
    169           /usr/include/valadoc-&vala-major-version;,
     167          /usr/include/valadoc-&vala-major-version; (not built if the sed is applied),
    170168          /usr/lib/vala-&vala-major-version;,
    171           /usr/lib/valadoc,
     169          /usr/lib/valadoc (not built if the sed is applied),
    172170          /usr/share/vala,
    173           /usr/share/valadoc,
     171          /usr/share/valadoc (not built if the sed is applied),
    174172          /usr/share/devhelp/books/vala-&vala-major-version;, and
    175173          /usr/share/vala-&vala-major-version;
    … …  
    209207      </varlistentry>
    210208
     209<!--
    211210      <varlistentry id="vapicheck">
    212211        <term><command>vapicheck</command></term>
    … …  
    219218          </indexterm>
    220219        </listitem>
    221       </varlistentry>
     220      </varlistentry>-->
    222221
    223222      <varlistentry id="vapigen">

  • introduction/welcome/changelog.xml

    r2faa98e3 r488b738f  
    4646      <itemizedlist>
    4747        <listitem>
     48          <para>[pierre] - Update to dovecot-2.3.1. Fixes
     49          <ulink url="&blfs-ticket-root;10588">#10588</ulink>.</para>
     50        </listitem>
     51        <listitem>
     52          <para>[pierre] - Update to apache-ant-1.10.3. Fixes
     53          <ulink url="&blfs-ticket-root;10586">#10586</ulink>.</para>
     54        </listitem>
     55        <listitem>
     56          <para>[pierre] - Update to vala-0.40.2. Fixes
     57          <ulink url="&blfs-ticket-root;10582">#10582</ulink>.</para>
     58        </listitem>
     59        <listitem>
     60          <para>[pierre] - Update to icu-61.1. Add a switch to allow
     61          building libreoffice with this version of icu. Fixes
     62          <ulink url="&blfs-ticket-root;10581">#10581</ulink>.</para>
     63        </listitem>
     64        <listitem>
    4865          <para>[timtas] - Update to cups-filters-1.20.2. Fixes
    4966          <ulink url="&blfs-ticket-root;10612">#10612</ulink>.</para>

  • packages.ent

    r2faa98e3 r488b738f  
    110110<!ENTITY gsl-version                  "2.4">
    111111
    112 <!ENTITY icu-major                    "60">
    113 <!ENTITY icu-minor                    "2">
     112<!ENTITY icu-major                    "61">
     113<!ENTITY icu-minor                    "1">
    114114<!ENTITY icu-patch                    "0">
    115115<!ENTITY icu-version                  "&icu-major;.&icu-minor;"><!-- .&icu-patch;-->
    … …  
    341341<!ENTITY tk-version                   "8.6.8">
    342342<!ENTITY vala-major-version           "0.40">  <!-- even minors only -->
    343 <!ENTITY vala-version                 "&vala-major-version;.0">
     343<!ENTITY vala-version                 "&vala-major-version;.2">
    344344<!ENTITY valgrind-version             "3.13.0">
    345345<!ENTITY yasm-version                 "1.3.0">
    346346
    347 <!ENTITY apache-ant-version           "1.10.2">
     347<!ENTITY apache-ant-version           "1.10.3">
    348348<!ENTITY maven-version                "3.5.3">
    349349<!ENTITY junit-major                  "4">
    … …  
    502502<!ENTITY dovecot-major                "2">
    503503<!ENTITY dovecot-minor                "3">
    504 <!ENTITY dovecot-micro                "0.1">
     504<!ENTITY dovecot-micro                "1">
    505505<!ENTITY dovecot-version              "&dovecot-major;.&dovecot-minor;.&dovecot-micro;">
    506506

  • server/mail/dovecot.xml

    r2faa98e3 r488b738f  
    88  "https://www.dovecot.org/releases/&dovecot-major;.&dovecot-minor;/dovecot-&dovecot-version;.tar.gz">
    99  <!ENTITY dovecot-download-ftp  " ">
    10   <!ENTITY dovecot-md5sum        "865d6ad94c98ac3289fa06a77b1c014e">
    11   <!ENTITY dovecot-size          "6.2 MB">
    12   <!ENTITY dovecot-buildsize     "171 MB (add 6.8 MB for tests)">
    13   <!ENTITY dovecot-time          "1.2 SBU (add 0.2 SBU for tests)">
     10  <!ENTITY dovecot-md5sum        "fc89b6130bcc09e99ae21003b474acc2">
     11  <!ENTITY dovecot-size          "6.4 MB">
     12  <!ENTITY dovecot-buildsize     "173 MB (add 6.8 MB for tests)">
     13  <!ENTITY dovecot-time          "1.4 SBU (add 0.2 SBU for tests)">
    1414]>
    1515

  • xsoft/office/libreoffice.xml

    r2faa98e3 r488b738f  
    399399    </para>
    400400
    401 <screen><userinput>make build-nocheck</userinput></screen>
     401<screen><userinput>CPPFLAGS='-DU_USE_ICU_NAMESPACE=1' make build-nocheck</userinput></screen>
    402402
    403403    <para>
    … …  
    566566      versions of these dependencies. If you've not installed some of the
    567567      dependencies, remove the corresponding switches.
     568    </para>
     569
     570    <para>
     571      <command>CPPFLAGS='-DU_USE_ICU_NAMESPACE=1' make ...</command>: <xref
     572      linkend="icu"/> has removed an implicit namespace <quote>using</quote>
     573      from its headers files. Setting <envar>U_USE_ICU_NAMESPACE</envar> to
     574      1 allows to restore the former behavior, which is required for building
     575      <application>libreoffice</application>.
    568576    </para>
    569577
Note: See TracChangeset for help on using the changeset viewer.