Fix midori build with newer vala

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@19144 af4574ff-66df-0310-9fd7-8a98e5e911e0
This commit is contained in:
Pierre Labastie 2017-08-30 10:18:35 +00:00
parent fe316a6434
commit 820d6822e1
3 changed files with 34 additions and 6 deletions

View File

@ -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 -->

View File

@ -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>

View File

@ -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