Changeset 18b304df for xsoft/office

Timestamp:

11/28/2019 12:15:58 AM (4 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 9.1, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, 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:

4980195

Parents:

1dee513

Message:

Update to abiword 3.0.4.
Update to icewm-1.6.3.
Update to imlib2-1.6.0.
Update to postfix-3.4.8.
Update to librsvg-2.46.4.

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

File:

• xsoft/office/abiword.xml (modified) (6 diffs)

xsoft/office/abiword.xml

@@ -6 +6 @@
 
   <!ENTITY AbiWord-minor-version "3.0">
+  <!ENTITY AbiWord-docs-version "3.0.2">
 
   <!ENTITY AbiWord-download-http
            "http://www.abisource.com/downloads/abiword/&AbiWord-version;/source/abiword-&AbiWord-version;.tar.gz">
   <!ENTITY AbiWord-download-ftp  " ">
-  <!ENTITY AbiWord-md5sum        "cda6dd58c747c133b421cc7eb18f5796">
+  <!ENTITY AbiWord-md5sum        "04e31887049a8c72297881bc153b77c4">
   <!ENTITY AbiWord-size          "11 MB">
 
   <!ENTITY AbiWordDocs-download-http
-           "http://www.abisource.com/downloads/abiword/&AbiWord-version;/source/abiword-docs-&AbiWord-version;.tar.gz">
+           "http://www.abisource.com/downloads/abiword/&AbiWord-docs-version;/source/abiword-docs-&AbiWord-docs-version;.tar.gz">
   <!ENTITY AbiWordDocs-md5sum        "c92c0e1e2081db20757231a53d80c338">
   <!ENTITY AbiWordDocs-size          "1.5 MB">
 
-  <!ENTITY AbiWord-buildsize     "626 MB, additional 12 MB for docs (73 MB installed - additional 3.1 MB for docs)">
-  <!ENTITY AbiWord-time          "6.5 SBU - additional 0.5 SBU for docs">
+  <!ENTITY AbiWord-buildsize     "605 MB, with docs (76 MB installed)">
+  <!ENTITY AbiWord-time          "2.4 SBU (Using parallelism=4, with docs)">
 ]>
 
@@ -105 +106 @@
         <para>
           AbiWord Docs size: &AbiWordDocs-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Required patch (fixes GTK+-3.22.x rendering):
-          <ulink url="&patch-root;/abiword-&AbiWord-version;-gtk3_22_render_fix-1.patch"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Recommended patch (fixes flickering and caret problems):
-          <ulink url="&patch-root;/abiword-&AbiWord-version;-fix_flicker-1.patch"/>
         </para>
       </listitem>
@@ -183 +172 @@
     </para>
 
-<screen><userinput>patch -Np1 -i ../abiword-&AbiWord-version;-gtk3_22_render_fix-1.patch &amp;&amp;
-
-patch -Np1 -i ../abiword-&AbiWord-version;-fix_flicker-1.patch &amp;&amp;
-   
-sed -e "s/free_suggestions/free_string_list/" \
+<screen><userinput>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      &amp;&amp;
 
-sed -e "/icaltime_from_timet/{s/timet/&amp;_with_zone/;s/0/0, 0/}" \
-    -i src/text/ptbl/xp/pd_DocumentRDF.cpp &amp;&amp;
-
-./configure --prefix=/usr --without-evolution-data-server &amp;&amp;
+./configure --prefix=/usr &amp;&amp;
 make</userinput></screen>
 
@@ -218 +200 @@
       If you wish to install the local help files, untar and build them first:
     </para>
+
+    <note><para>The current version of the docs expands to abiword-docs-3.0.1
+    and not the expected abiword-docs-3.0.2.</para></note>
 
 <!-- I had to hardcode the docs version here, as it doesn't decompress to
@@ -238 +223 @@
 
     <para>
-      <command>sed ...</command>: These commands correct the source for
-      changes in dependencies <xref linkend="enchant"/> and 
-      <xref linkend="libical"/>.
-    </para>
-
-    <para>
-      <parameter>--without-evolution-data-server</parameter>: This switch
+      <command>sed ...</command>: This command corrects the source for
+      changes in the dependency <xref linkend="enchant"/>.
+    </para>
+<!--
+    <para>
+      <parameter>- -without-evolution-data-server</parameter>: This switch
       disables <application>AbiWord</application>
       <application>Evolution Data Server</application> support which is known
@@ -250 +234 @@
       <application>Evolution Data Server</application>.
     </para>
-
+-->
     <para>
       <option>--enable-plugins="collab openxml goffice grammar"</option>: Build