From 820d6822e172b0027f2d28c23da5f4bb196d5f9c Mon Sep 17 00:00:00 2001
From: Pierre Labastie <pieere@linuxfromscratch.org>
Date: Wed, 30 Aug 2017 10:18:35 +0000
Subject: [PATCH] Fix midori build with newer vala

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@19144 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general.ent                        |  4 ++--
 introduction/welcome/changelog.xml | 12 +++++++++++-
 xsoft/graphweb/midori.xml          | 24 +++++++++++++++++++++---
 3 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/general.ent b/general.ent
index 465c9b595f..00701abf8a 100644
--- a/general.ent
+++ b/general.ent
@@ -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 -->
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index d3e13f4613..4ec08cc84f 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -42,6 +42,16 @@
     </listitem>
 -->
 
+    <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>
@@ -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>
diff --git a/xsoft/graphweb/midori.xml b/xsoft/graphweb/midori.xml
index e2e99c2946..bb0fb6245d 100644
--- a/xsoft/graphweb/midori.xml
+++ b/xsoft/graphweb/midori.xml
@@ -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 @@ make</userinput></screen>
   <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