Changeset 4199730 for xsoft

Timestamp:

01/01/2019 01:59:37 AM (6 years ago)

Author:

DJ Lucas <dj@…>

Branches:

elogind

Children:

8f6f10e

Parents:

b98dbfd

Message:

Merge to HEAD 20898.

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

Location:

xsoft

Files:

• graphweb/falkon.xml (modified) (4 diffs)
• office/gnumeric.xml (modified) (1 diff)

xsoft/graphweb/falkon.xml

@@ -128 +128 @@
 <screen><userinput>rm -rf po/</userinput></screen>
 
-    <para>
+<!--<para>
       In case you wish to run the tests, fix one of them so that it will
       work correctly with both Qt-5.10 and Qt-5.11:
@@ -134 +134 @@
 
 <screen><userinput>sed -i 's/"5.11.", 5) == 0 ? 1 : 2/"5.10.", 5) &gt;= 0 ? 2 : 1/' \
-  autotests/webviewtest.cpp</userinput></screen>
+  autotests/webviewtest.cpp</userinput></screen>-->
 
     <para>
@@ -173 +173 @@
     <title>Command Explanations</title>
 
-    <para>
+<!--<para>
       <command>sed -i 's/"5.11.", 5) == 0 ? 1 : 2/"5.10.", 5) &gt;= 0 ? 2 : 1/' ...</command>:
       This test previously looked for QtWebengine-5.10 which had changed its
@@ -179 +179 @@
       was bumped but the results were swapped. Change it to examine if the version
       is <emphasis>at least 5.10</emphasis>, and to swap the expected results back.
-    </para>
-
-    <para>
-      <option>-DBUILD_TESTING=OFF</option>: This will save some time and space by
+    </para>-->
+
+    <para>
+      <option>-DBUILD_TESTING=OFF</option>: This will save a little time and space by
       not building the test programs, use this if you do not wish to run the test.
     </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        "4e6adca1643c1ad36aaa0bf5c550f66b">
+  <!ENTITY gnumeric-md5sum        "0650750707491b4fcea0eb3010cafbb1">
   <!ENTITY gnumeric-size          "17 MB">
-  <!ENTITY gnumeric-buildsize     "335 MB (add 18 MB for tests)">
-  <!ENTITY gnumeric-time          "1.7 SBU (add 4.6 SBU for tests)">
+  <!ENTITY gnumeric-buildsize     "262 MB (add 4 MB for tests)">
+  <!ENTITY gnumeric-time          "1.1 SBU (Using parallelism=4; add 3.9 SBU for tests)">
 ]>