Changeset 820d6822

Timestamp:

08/30/2017 10:18:35 AM (7 years ago)

Author:

Pierre Labastie <pieere@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

8ebf0b04

Parents:

fe316a64

Message:

Fix midori build with newer vala

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

Files:

• general.ent (modified) (2 diffs)
• introduction/welcome/changelog.xml (modified) (2 diffs)
• xsoft/graphweb/midori.xml (modified) (2 diffs)

general.ent

@@ -1 +1 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "30">                   <!-- Always 2 digits -->
+<!ENTITY day          "31">                   <!-- Always 2 digits -->
 <!ENTITY month        "08">                   <!-- Always 2 digits -->
 <!ENTITY year         "2017">
@@ -7 +7 @@
 <!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 #] -->

introduction/welcome/changelog.xml

@@ -44 +44 @@
 
     <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>
@@ -56 +66 @@
       <itemizedlist>
         <listitem>
-          <para>[bdinns] - Promote highlight to a recommended dependency for
+          <para>[bdubbs] - Promote highlight to a recommended dependency for
           gtk-doc.</para>
         </listitem>

xsoft/graphweb/midori.xml

@@ -111 +111 @@
     </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;
 
@@ -137 +147 @@
     <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>