Changeset 6621c93

Timestamp:

03/31/2015 05:06:00 PM (9 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 7.8, 7.9, 8.0, 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, nosym, 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:

1de357f4

Parents:

6c4a1f8b

Message:

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

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

Files:

• introduction/welcome/changelog.xml (modified) (1 diff)
• x/lib/webkitgtk2.xml (modified) (1 diff)
• x/lib/webkitgtk26.xml (modified) (1 diff)

introduction/welcome/changelog.xml

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

x/lib/webkitgtk2.xml

@@ -128 +128 @@
     </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>

x/lib/webkitgtk26.xml

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