Author: bdubbs Date: Mon Oct 30 14:21:30 2017 New Revision: 19421 Log: Update abiword instructions to build with current dependencies. Update to libical-3.0.0. Update to libsoup-2.60.2.
Modified: trunk/BOOK/general/genlib/libical.xml trunk/BOOK/introduction/welcome/changelog.xml trunk/BOOK/networking/netlibs/libsoup.xml trunk/BOOK/packages.ent trunk/BOOK/xsoft/office/abiword.xml Modified: trunk/BOOK/general/genlib/libical.xml ============================================================================== --- trunk/BOOK/general/genlib/libical.xml Mon Oct 30 14:17:51 2017 (r19420) +++ trunk/BOOK/general/genlib/libical.xml Mon Oct 30 14:21:30 2017 (r19421) @@ -6,10 +6,10 @@ <!ENTITY libical-download-http "https://github.com/libical/libical/releases/download/v&libical-version;/libical-&libical-version;.tar.gz"> <!ENTITY libical-download-ftp " "> - <!ENTITY libical-md5sum "6bf8e5f5a3ba88baf390d0134e05d76e"> - <!ENTITY libical-size "684 KB"> - <!ENTITY libical-buildsize "14 MB, with tests (additional 12 MB for the API documentation)"> - <!ENTITY libical-time "0.3 SBU (with tests and API documentation)"> + <!ENTITY libical-md5sum "f55d44e5ce1f9297fa9a9d278b50203e"> + <!ENTITY libical-size "836 KB"> + <!ENTITY libical-buildsize "24 MB, with tests (additional 7 MB for the API documentation)"> + <!ENTITY libical-time "0.5 SBU (with tests and API documentation)"> ]> <sect1 id="libical" xreflabel="libical-&libical-version;"> @@ -37,23 +37,7 @@ &lfs81_checked; <bridgehead renderas="sect3">Package Information</bridgehead> -<!-- - <note> - <para>The download link below obtains - <filename>libical-&libical-version;.tar.gz</filename> if a web browser - such as <xref linkend="firefox"/> is used. This is the correct name - for the archive, because it saves the file as <filename - class="directory">libical-&libical-version;</filename>. However, if - another method is used for downloading, e.g. <xref linkend="wget"/>, the - file name is <filename>v&libical-version;.tar.gz</filename>, which is not - acceptable. The file should be renamed to the correct filename - <filename>libical-&libical-version;.tar.gz</filename>. You can achieve - this automatically by using the command:</para> - - <screen><userinput>wget <ulink url="&libical-download-http;"/> -O libical-&libical-version;.tar.gz</userinput></screen> - </note> ---> <itemizedlist spacing="compact"> <listitem> <para> @@ -89,8 +73,6 @@ <bridgehead renderas="sect3">libical Dependencies</bridgehead> - <!-- Upstream recommends to use CMake since autotools - doesn't bump soname for 0.48 -> 1.0 incompatibility --> <bridgehead renderas="sect4">Required</bridgehead> <para role="required"> <xref linkend="cmake"/> @@ -104,13 +86,6 @@ <xref linkend="icu"/> </para> - <!-- Can't be built using CMake - <bridgehead renderas="sect4">Optional</bridgehead> - <para role="optional"> - <xref linkend="openjdk"/> and - <xref linkend="python2"/> (must have <xref linkend="swig"/> also) - </para> --> - <para condition="html" role="usernotes">User Notes: <ulink url="&blfs-wiki;/libical"/> </para> @@ -142,6 +117,7 @@ <para> To test the results, issue: <command>make test</command>. + One test, timezones, is known to fail. </para> <para> Modified: trunk/BOOK/introduction/welcome/changelog.xml ============================================================================== --- trunk/BOOK/introduction/welcome/changelog.xml Mon Oct 30 14:17:51 2017 (r19420) +++ trunk/BOOK/introduction/welcome/changelog.xml Mon Oct 30 14:21:30 2017 (r19421) @@ -45,6 +45,19 @@ <para>October 30th, 2017</para> <itemizedlist> <listitem> + <para>[bdubbs] - Update abiword instructions to build + with current dependencies. Fixes + <ulink url="&blfs-ticket-root;9939">#9939</ulink>.</para> + </listitem> + <listitem> + <para>[bdubbs] - Update to libical-3.0.0. Fixes + <ulink url="&blfs-ticket-root;9948">#9948</ulink>.</para> + </listitem> + <listitem> + <para>[bdubbs] - Update to libsoup-2.60.2. Fixes + <ulink url="&blfs-ticket-root;9945">#9945</ulink>.</para> + </listitem> + <listitem> <para>[renodr] - Update to pygobject3-3.26.1. Fixes <ulink url="&blfs-ticket-root;9944">#9944</ulink>.</para> </listitem> Modified: trunk/BOOK/networking/netlibs/libsoup.xml ============================================================================== --- trunk/BOOK/networking/netlibs/libsoup.xml Mon Oct 30 14:17:51 2017 (r19420) +++ trunk/BOOK/networking/netlibs/libsoup.xml Mon Oct 30 14:21:30 2017 (r19421) @@ -8,8 +8,8 @@ "&gnome-download-http;/libsoup/2.60/libsoup-&libsoup-version;.tar.xz"> <!ENTITY libsoup-download-ftp "&gnome-download-ftp;/libsoup/2.60/libsoup-&libsoup-version;.tar.xz"> - <!ENTITY libsoup-md5sum "4b3fb98f742d81f1850c0846a40470e2"> - <!ENTITY libsoup-size "1.7 MB"> + <!ENTITY libsoup-md5sum "9c49831b62c4bf18cdb81c86ac6516fd"> + <!ENTITY libsoup-size "1.8 MB"> <!ENTITY libsoup-buildsize "39 MB (with tests)"> <!ENTITY libsoup-time "0.5 SBU (using parallelism=4 and with tests)"> ]> Modified: trunk/BOOK/packages.ent ============================================================================== --- trunk/BOOK/packages.ent Mon Oct 30 14:17:51 2017 (r19420) +++ trunk/BOOK/packages.ent Mon Oct 30 14:21:30 2017 (r19421) @@ -143,7 +143,7 @@ <!ENTITY libgsf-version "1.14.41"> <!ENTITY libgudev-version "232"> <!ENTITY libgusb-version "0.2.11"> -<!ENTITY libical-version "2.0.0"> +<!ENTITY libical-version "3.0.0"> <!ENTITY libidn-version "1.33"> <!ENTITY libidn2-version "2.0.4"> <!ENTITY libiodbc-version "3.52.12"> @@ -463,7 +463,7 @@ <!ENTITY libpcap-version "1.8.1"> <!ENTITY libndp-version "1.6"> <!ENTITY libproxy-version "0.4.7"> -<!ENTITY libsoup-version "2.60.1"> +<!ENTITY libsoup-version "2.60.2"> <!ENTITY libtirpc-version "1.0.2"> <!ENTITY neon-version "0.30.2"> <!ENTITY nghttp2-version "1.27.0"> Modified: trunk/BOOK/xsoft/office/abiword.xml ============================================================================== --- trunk/BOOK/xsoft/office/abiword.xml Mon Oct 30 14:17:51 2017 (r19420) +++ trunk/BOOK/xsoft/office/abiword.xml Mon Oct 30 14:21:30 2017 (r19421) @@ -172,6 +172,15 @@ </para> <screen><userinput>patch -Np1 -i ../abiword-&AbiWord-version;-gtk3_22_render_fix-1.patch && + +sed -e "s/free_suggestions/free_string_list/" \ + -e "s/_to_personal//" \ + -e "s/in_session/added/" \ + -i src/af/xap/xp/enchant_checker.cpp && + +sed -e "/icaltime_from_timet/{s/timet/&_with_zone/;s/0/0, 0/}" \ + -i src/text/ptbl/xp/pd_DocumentRDF.cpp && + ./configure --prefix=/usr && make</userinput></screen> @@ -215,6 +224,12 @@ <title>Command Explanations</title> <para> + <command>sed ...</command>: These commands correc the source for + changes in dependencies <xref linkend="enchant"/> and + <xref linkend="libical"/>. + </para> + + <para> <option>--without-evolution-data-server</option>: This switch disables <application>AbiWord</application> <application>Evolution Data Server</application> support which is known -- http://lists.linuxfromscratch.org/listinfo/blfs-book FAQ: http://www.linuxfromscratch.org/blfs/faq.html Unsubscribe: See the above information page
