linux-from-scratch/glfs
1
0
Fork 0
mirror of https://github.com/Zeckmathederg/glfs.git synced 2025-01-24 23:32:12 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update both gtkwebkit sections to build with glib-2.44 and later.

Browse Source 
git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@15760 af4574ff-66df-0310-9fd7-8a98e5e911e0
This commit is contained in:
Bruce Dubbs 2015-03-31 17:06:00 +00:00
parent 6c4a1f8b68
commit 6621c93699
3 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
introduction/welcome/changelog.xml
View File

@ -47,6 +47,10 @@
<listitem>
<para>March 31st, 2015</para>
<itemizedlist>
<listitem>
<para>[bdubbs] - Update both gtkwebkit sections to build with
glib-2.44 and later.</para>
</listitem>
<listitem>
<para>[fernando] - Update to yelp-3.16.0. Partially fixes
<ulink url="&blfs-ticket-root;6311">#6311</ulink>.</para>

10
x/lib/webkitgtk2.xml
View File

@ -127,8 +127,14 @@
cause <command>make install</command> to fail:
</para>
<screen><userinput>sed -i '/generate-gtkdoc --rebase/s:^:# :' \
GNUmakefile.in</userinput></screen>
<screen><userinput>sed -i '/generate-gtkdoc --rebase/s:^:# :' GNUmakefile.in</userinput></screen>
<para>Fix some code when building with glib-2.44 and later:</para>
<screen><userinput>pushd Source/WebCore/platform/graphics/gstreamer &amp;&amp;
sed -i 's/GMutexLocker /WebCore::&amp;/' \
VideoSinkGStreamer.cpp WebKitWebSourceGStreamer.cpp &amp;&amp;
popd</userinput></screen>
<para>
Upstream standard now is to link this package against <application>GTK+

11
x/lib/webkitgtk26.xml
View File

@ -119,6 +119,17 @@
<bridgehead renderas="sect3">Installation of
<application>WebKitGTK+</application></bridgehead>
<para>First, fix some code when building with glib-2.44 and later:</para>
<screen><userinput>pushd Source/WebCore/platform/graphics/gstreamer &amp;&amp;
sed -i 's/GMutexLocker&lt;/WTF::&amp;/' \
MediaPlayerPrivateGStreamerBase.cpp \
VideoSinkGStreamer.cpp \
WebKitWebSourceGStreamer.cpp &amp;&amp;
popd &amp;&amp;
sed -i '/using/d' Source/WTF/wtf/gobject/GMutexLocker.h</userinput></screen>
<para>
Install <application>WebKitGTK+</application> by running the
following commands: