[blfs-book] r19144 - in trunk/BOOK: . introduction/welcome xsoft/graphweb

[via blfs-book]

Author: pierre
Date: Wed Aug 30 03:18:35 2017
New Revision: 19144

Log:
Fix midori build with newer vala

Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/xsoft/graphweb/midori.xml

Modified: trunk/BOOK/general.ent
==============================================================================
--- trunk/BOOK/general.ent      Tue Aug 29 20:55:36 2017        (r19143)
+++ trunk/BOOK/general.ent      Wed Aug 30 03:18:35 2017        (r19144)
@@ -1,12 +1,12 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "30">                   <!-- Always 2 digits -->
+<!ENTITY day          "31">                   <!-- Always 2 digits -->
 <!ENTITY month        "08">                   <!-- Always 2 digits -->
 <!ENTITY year         "2017">
 <!ENTITY copyrightdate "2001-&year;">
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "August 30th, &year;">
+<!ENTITY releasedate  "August 31st, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
 <!ENTITY lfs-version  "development">          <!-- x.y|development -->

Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml       Tue Aug 29 20:55:36 
2017        (r19143)
+++ trunk/BOOK/introduction/welcome/changelog.xml       Wed Aug 30 03:18:35 
2017        (r19144)
@@ -43,6 +43,16 @@
 -->
 
     <listitem>
+      <para>August 31st, 2017</para>
+      <itemizedlist>
+        <listitem>
+          <para>[pierre] - Fix midori build with newer vala. Thanks to
+          Christoph Feikes for the report. Fix taken from Archlinux.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>August 30th, 2017</para>
       <itemizedlist>
         <listitem>
@@ -55,7 +65,7 @@
       <para>August 29th, 2017</para>
       <itemizedlist>
         <listitem>
-          <para>[bdinns] - Promote highlight to a recommended dependency for
+          <para>[bdubbs] - Promote highlight to a recommended dependency for
           gtk-doc.</para>
         </listitem>
         <listitem>

Modified: trunk/BOOK/xsoft/graphweb/midori.xml
==============================================================================
--- trunk/BOOK/xsoft/graphweb/midori.xml        Tue Aug 29 20:55:36 2017        
(r19143)
+++ trunk/BOOK/xsoft/graphweb/midori.xml        Wed Aug 30 03:18:35 2017        
(r19144)
@@ -110,7 +110,17 @@
       commands:
     </para>
 
-<screen><userinput>mkdir build &amp;&amp;
+<screen><userinput>sed -e 's/protected Tally/public Tally/g'  \
+    -i midori/midori-notebook.vala         &amp;&amp;
+sed -e 's/%d other files/%u other files/g' \
+    -i extensions/transfers.vala           &amp;&amp;
+
+for f in transfers adblock/widgets apps history-list notes; do
+    sed -e 's/.remove (iter/.remove (ref iter/g' \
+        -i "extensions/$f.vala"
+done        &amp;&amp;
+
+mkdir build &amp;&amp;
 cd    build &amp;&amp;
 
 cmake -DCMAKE_INSTALL_PREFIX=/usr \
@@ -136,8 +146,16 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <para><parameter>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch is
-    used to apply a higher level of compiler optimizations.</para>
+    <para>
+      <command>sed ...</command>: The recent release of vala generates errors
+      for some constructs that were accepted before. The <command>sed</command>
+      commands fix those errors.
+    </para>
+
+    <para>
+      <parameter>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch is
+      used to apply a higher level of compiler optimizations.
+    </para>
 
     <para>
       <parameter>-DUSE_ZEITGEIST=OFF</parameter>: Remove this switch if
-- 
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page