Changeset 17a61a18

Timestamp:

12/02/2014 09:36:37 PM (9 years ago)

Author:

Christopher Gregory <cjg@…>

Branches:

systemd-13485

Children:

6ed1066

Parents:

5fe331d

Message:

Merged midori-0.5.9 update from trunk.

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

Files:

• introduction/welcome/changelog.xml (modified) (1 diff)
• packages.ent (modified) (1 diff)
• xfce/apps/midori.xml (modified) (5 diffs)

introduction/welcome/changelog.xml

@@ -44 +44 @@
 
 -->
+    <listitem>
+      <para>December 2nd, 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[fernando] - Update to midori_0.5.9. Fixes
+          <ulink url="&blfs-ticket-root;5805">#5805</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>November 26th, 2014</para>

packages.ent

@@ -538 +538 @@
 
 <!-- Chapter 33 -->
-<!ENTITY midori-version               "0.5.8">
+<!ENTITY midori-version               "0.5.9">
 <!ENTITY parole-version               "0.5.4">
 <!ENTITY gtksourceview2-version       "2.10.5">

xfce/apps/midori.xml

@@ -8 +8 @@
            "http://www.midori-browser.org/downloads/midori_&midori-version;_all_.tar.bz2">
   <!ENTITY midori-download-ftp  " ">
-  <!ENTITY midori-md5sum        "b89e25e74199d705e74767499a415976">
+  <!ENTITY midori-md5sum        "a0af659e0f1d6edb2c97aefdc8c0f097">
   <!ENTITY midori-size          "1.3 MB">
-  <!ENTITY midori-buildsize     "63 MB (additional 1 MB for the tests)">
-  <!ENTITY midori-time          "0.5 SBU (additional less than 0.1 SBU
-                                 for the tests)">
+  <!ENTITY midori-buildsize     "71 MB (additional 2 MB for the tests)">
+  <!ENTITY midori-time          "0.7 SBU (additional less than 0.1 SBU for the tests)">
 ]>
 
@@ -90 +89 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
+      <xref linkend="gcr"/>,
       <xref linkend="gtk-doc"/> and
       <xref linkend="libzeitgeist"/>
@@ -105 +105 @@
 
     <para>
-      The tarball is not compressed from a directory, thus it is better to
-      create a directory to uncompress it:
-    </para>
-
-<screen><userinput>mkdir -v midori-&midori-version; &amp;&amp;
-tar xf midori_&midori-version;_all_.tar.bz2 -C midori-&midori-version; &amp;&amp;
-cd midori-&midori-version;</userinput></screen>
-
-    <para>
       Install <application>Midori</application> by running the following
       commands:
     </para>
 
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
+<screen><userinput>mkdir -v build &amp;&amp;
+cd build &amp;&amp;
+cmake -DCMAKE_INSTALL_PREFIX=/usr \
+      -DCMAKE_BUILD_TYPE=Release  \
+      -DUSE_ZEITGEIST=OFF         \
+      -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/midori-&midori-version; \
+      ..  &amp;&amp;
 make</userinput></screen>
 
     <para>
       To test the results, issue: <command>make check</command> from an X
-      terminal emulator.
+      terminal emulator. Test suite performance is poor: almost 1/3 fails.
+      Another simple test is to run <command>midori/midori</command> from the
+      <filename class="directory">build</filename> directory,
+      before installing.
     </para>
 
@@ -135 +135 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
+
+    <para><parameter>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch is
+    used to force building with Qt4 even if Qt5 is found.</para>
 
     <para>
@@ -176 +179 @@
         </seg>
         <seg>
-          libmidori-core.so and several libraries under /usr/lib/midori
+          libmidori-core.so
         </seg>
         <seg>
           /etc/xdg/midori,
           /usr/lib/midori,
-          /usr/share/doc/midori and
+          /usr/share/doc/midori-&midori-version; and
           /usr/share/midori
         </seg>