Changeset bfcd313

Timestamp:

02/07/2024 05:08:55 PM (3 months ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

12.1, ken/TL2024, lazarus, rahul/power-profiles-daemon, trunk, xry111/llvm18

Children:

63480d7

Parents:

9f25cc40 (diff), 66765fe (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'trunk' of git.linuxfromscratch.org:blfs into trunk

Files:

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

introduction/welcome/changelog.xml

@@ -54 +54 @@
           <para>[bdubbs] - Update to xfsprogs-6.6.0. Fixes
           <ulink url="&blfs-ticket-root;19252">#19252</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Fix building WebKitGTK on 32-bit systems.</para>
         </listitem>
       </itemizedlist>

x/lib/webkitgtk.xml

@@ -167 +167 @@
     </important>
 
-<!--
-    <para>
-      First, fix a build failure caused by libxml2-2.12.x:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../webkitgtk-&webkitgtk-version;-upstream_fixes-1.patch</userinput></screen>
--->
+
+    <!-- https://github.com/WebKit/WebKit/commit/3d53735756 and
+         https://bugs.webkit.org/show_bug.cgi?id=268739 -->
+
+    <para>
+      First, if you are on a 32-bit machine, fix a build failure:
+    </para>
+
+<screen><userinput remap="pre">case $(uname -m) in
+   i?86) sed -e '/UNUSED_VARIABLE(t6)/d' \
+             -e '/UNUSED_VARIABLE(t7)/d' \
+             -i Source/JavaScriptCore/llint/LowLevelInterpreter.cpp ;;
+esac</userinput></screen>
 
     <para>