Changeset ac38e9dc for xsoft/office

Timestamp:

08/01/2015 04:26:22 AM (9 years ago)

Author:

Douglas R. Reno <renodr@…>

Branches:

systemd-13485

Children:

ad6910d

Parents:

4a83293

Message:

Import back into SVN from Github

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

Location:

xsoft/office

Files:

• abiword.xml (modified) (7 diffs)
• gnumeric.xml (modified) (6 diffs)
• libreoffice-systemd.xml (added)
• office.xml (modified) (1 diff)

xsoft/office/abiword.xml

@@ -11 +11 @@
   <!ENTITY AbiWord-download-ftp  " ">
   <!ENTITY AbiWord-md5sum        "f3f8052e7b4979a43b75775a381e6cb8">
-  <!ENTITY AbiWord-size          "10.6 MB">
+  <!ENTITY AbiWord-size          "11 MB">
 
   <!ENTITY AbiWordDocs-download-http
            "http://www.abisource.com/downloads/abiword/&AbiWord-version;/source/abiword-docs-&AbiWord-version;.tar.gz">
-  <!ENTITY AbiWordDocs-md5sum        "1.5 MB">
-  <!ENTITY AbiWordDocs-size          "c9b78cb5f9c415ed63ce1cf9874fa8a4">
-
-  <!ENTITY AbiWord-buildsize     "405.2 MB">
-  <!ENTITY AbiWord-time          "6.7 SBU">
+  <!ENTITY AbiWordDocs-md5sum        "c9b78cb5f9c415ed63ce1cf9874fa8a4">
+  <!ENTITY AbiWordDocs-size          "1.5">
+
+  <!ENTITY AbiWord-buildsize     "575 MB (73 MB installed)">
+  <!ENTITY AbiWord-time          "7.7 SBU - additional 0.5 SBU for docs">
 ]>
 
@@ -44 +44 @@
     </para>
 
-    &lfs76_checked;
+    &lfs77_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -95 +95 @@
         <para>
           AbiWord Docs size: &AbiWordDocs-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Required patch: <ulink url="http://www.linuxfromscratch.org/patches/blfs/svn/abiword-&AbiWord-version;-libgcrypt_1_6_0-1.patch"/>
         </para>
       </listitem>
@@ -121 +116 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <ulink url="http://aiksaurus.sourceforge.net/">Aiksaurus</ulink>,
       <xref linkend="dbus-glib"/>,
       <xref linkend="evolution-data-server"/>,
       <xref linkend="gobject-introspection"/>,
-      <ulink url="http://helm.cs.unibo.it/mml-widget/">GtkMathView</ulink>,
       <xref linkend="libchamplain"/>,
       <xref linkend="libgcrypt"/>,
       <xref linkend="libical"/>,
       <xref linkend="libsoup"/>,
+      <xref linkend="redland"/>,
+      <xref linkend="telepathy-glib"/>,
+      <xref linkend="valgrind"/>,
+      <ulink url="http://aiksaurus.sourceforge.net/">Aiksaurus</ulink>,
+      <ulink url="http://helm.cs.unibo.it/mml-widget/">GtkMathView</ulink>,
       <ulink url="http://sourceforge.net/projects/wvware">libwmf</ulink>,
       <ulink url="http://sourceforge.net/projects/libwpd/">libwpd</ulink>,
@@ -137 +135 @@
       Link Grammar Parser</ulink>,
       <ulink url="&gnome-download-http;/loudmouth">Loudmouth</ulink>,
-      <xref linkend="redland"/>,
-      <xref linkend="telepathy-glib"/>,
-      <ulink url="http://libots.sourceforge.net/">OTS</ulink>
-      <ulink url="http://software.frodo.looijaard.name/psiconv/">Psiconv</ulink>, and
-      <xref linkend="valgrind"/>
+      <ulink url="http://libots.sourceforge.net/">OTS</ulink>, and
+      <ulink url="http://software.frodo.looijaard.name/psiconv/">Psiconv</ulink>
     </para>
 
@@ -166 +161 @@
     </para>
 
-<screen><userinput>patch -Np1 -i ../abiword-&AbiWord-version;-libgcrypt_1_6_0-1.patch &amp;&amp;
-./configure --prefix=/usr                              &amp;&amp;
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
 make</userinput></screen>
 
@@ -180 +174 @@
 <screen role="root"><userinput>make install</userinput></screen>
 
-    <para>
-      If you wish to install the local help files, untar and build them first
+    <note>
+      <para>
+        In order to install the local help files,
+        a graphics session is recommended.
+      </para>
+    </note>
+
+    <para>
+      If you wish to install the local help files, untar and build them first:
     </para>
 

xsoft/office/gnumeric.xml

@@ -7 +7 @@
   <!ENTITY gnumeric-download-http "&gnome-download-http;/gnumeric/1.12/gnumeric-&gnumeric-version;.tar.xz">
   <!ENTITY gnumeric-download-ftp  "&gnome-download-ftp;/gnumeric/1.12/gnumeric-&gnumeric-version;.tar.xz">
-  <!ENTITY gnumeric-md5sum        "14897887000c7c6ca4e1e1d2dd230ee7">
+  <!ENTITY gnumeric-md5sum        "84e39df0028b3b6091ca55a3b538070e">
   <!ENTITY gnumeric-size          "18 MB">
-  <!ENTITY gnumeric-buildsize     "252 MB (additional 2 MB for the tests)">
-  <!ENTITY gnumeric-time          "1.8 SBU (additional 1.5 SBU for the tests)">
+  <!ENTITY gnumeric-buildsize     "298 MB (additional 2 MB for the tests)">
+  <!ENTITY gnumeric-time          "1.6 SBU (additional 6.8 SBU for the tests)">
 ]>
 
@@ -35 +35 @@
     </para>
 
-    &lfs76_checked;
+    &lfs77_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -79 +79 @@
     </para>
 
+    <bridgehead renderas="sect4">Recommended Runtime</bridgehead>
+    <para role="recommended runtime">
+       an icon theme such as <xref linkend="adwaita-icon-theme"/> or
+       <xref linkend="oxygen-icons"/>
+       <xref linkend="x-window-system"/>, and
+       <xref linkend="yelp"/> for the buit-in help functionality
+    </para>
+
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
+      <xref linkend="dconf"/> (to prevent some test failures),
       <xref linkend="gobject-introspection"/>,
       <xref linkend="pygobject3"/>,
@@ -92 +101 @@
     </para>
 
-    <note>
+<!--  Now in "recommendended runtime deps". Keeping as a comment because it
+      is easier to revert
+   <note>
       <para>
         Though only a run-time dependency, if you don't install the
@@ -99 +110 @@
       </para>
     </note>
-
+-->
     <para condition="html" role="usernotes">User Notes:
       <ulink url="&blfs-wiki;/gnumeric"/>
@@ -127 +138 @@
     <para>
       If you wish to test the results, issue <command>make -k check</command>.
-      A few tests fail, some for known reasons.
+      Tests must be run from an active X session, and <xref linkend="dconf"/>
+      should be installed to prevent some failures. Even so, a few tests fail,
+      some for known reasons.
     </para>
 

xsoft/office/office.xml

@@ -24 +24 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="abiword.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnumeric.xml"/>
-<!-- Hopefully gnucash will come back when updated  
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnucash.xml"/> -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libreoffice.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libreoffice-systemd.xml"/>
 </chapter>