Changeset c0f71f2

Timestamp:

01/03/2024 05:49:31 PM (5 months ago)

Author:

Douglas R. Reno <renodr@…>

Branches:

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

Children:

18fe946

Parents:

8a09beb

Message:

QtWebEngine: use Python 3.11 instead, and simplify the instructions.

To do this I've created build_fixes-2.patch. This contains:

• Fix for shipped ffmpeg build failure
• Fixes for Python 3.11 changes
• Changes for ICU-74, but modified to allow building on previous versions of BLFS and their versions of ICU
• The NINJAJOBS change
• Chunks from a patch from ArchLinux32 to prevent instantaneous crashes in Falkon. Still causes issues with text rendering, so I've created a note in the Falkon page. However, video playback and images display perfectly. I will revisit this in February once we have the new glibc. Unlike previous issues, it no longer crashes, so that's a good start!

This significantly brings down the count of instructions for this page
and should make it a lot easier to follow.

I've tested this on both x86_64 and i686. On i686 there's a major
improvement in that Falkon (and KDE System Monitor) actually start and
run, though in the case of Falkon there is still no text.

Files:

• introduction/welcome/changelog.xml (modified) (1 diff)
• x/lib/qtwebengine.xml (modified) (11 diffs)
• xsoft/graphweb/falkon.xml (modified) (1 diff)

introduction/welcome/changelog.xml

@@ -42 +42 @@
       <para>January 3rd, 2024</para>
       <itemizedlist>
+        <listitem>
+          <para>[renodr] - Move QtWebEngine to use the Python 3.11 version
+          installed in /opt. Fixes
+          <ulink url="&blfs-ticket-root;19016">#19016</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[bdubbs] - Update to numpy-1.26.3 (Python Module). Fixes

x/lib/qtwebengine.xml

@@ -243 +243 @@
         <para>
           Required patch:
-          <ulink url="&patch-root;/qtwebengine-&qtwebengine-version;-build_fixes-1.patch"/>
+          <ulink url="&patch-root;/qtwebengine-&qtwebengine-version;-build_fixes-2.patch"/>
         </para>
       </listitem>
@@ -269 +269 @@
       <xref linkend="nodejs"/>,
       <xref linkend="nss"/>,
-      <xref linkend="pciutils"/>, and
+      <xref linkend="pciutils"/>,
+      <xref linkend="python311"/>, and
       (<xref linkend='qt5'/> or
        <xref role="nodep" linkend='qt5-components'/> with qtlocation and qtwebchannel)
@@ -346 +347 @@
     </para>
 
-<screen><userinput remap="pre">patch -Np1 -i ../qtwebengine-&qtwebengine-version;-build_fixes-1.patch</userinput></screen>
+<screen><userinput remap="pre">patch -Np1 -i ../qtwebengine-&qtwebengine-version;-build_fixes-2.patch</userinput></screen>
 
     <para>
@@ -360 +361 @@
          Not marked nodump because it won't affect the build with system
          ffmpeg anyway.  -->
+
+    <!-- Now in build_fixes-2
     <para>
       Otherwise, fix an issue in shipped ffmpeg causing it fail to build
@@ -367 +370 @@
 <screen><userinput remap="pre">sed 's/(uint8_t)\(([^)]*)\|shift\)/\1 \&amp; 0x1F/' \
     -i src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h</userinput></screen>
+    -->
 
 <!-- start of commands for git versions only -->
@@ -405 +409 @@
     -i src/3rdparty/chromium/media/media_options.gni</userinput></screen>
 
+<!-- Now in build_fixes-2.patch (except Python 3.12 changes, those are commented
+     until we eventually move to Python 3.12 again for this package (though
+     hopefully by that point these issues will be resolved)
     <para>
       Next, fix the build tools so they can be run with Python-3.11+:
@@ -457 +464 @@
 <screen><userinput>sed -e 's/^#define BA_LB_COUNT.*$/#define BA_LB_COUNT 40/' \
     -i src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator.cc</userinput></screen>
-
-    <para>
-      If you are using the system copy of libxml2 (which requires that libxml2
-      has been built with the '--with-icu' option), adapt to an API change:
-    </para>
-
-<screen role="nodump"><userinput>sed -e 's/xmlError/const xmlError/' \
--i src/3rdparty/chromium/third_party/blink/renderer/core/xml/xslt_processor.h \
--i src/3rdparty/chromium/third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc</userinput></screen>
-
+-->
+
+<!-- In build_fixes-2.patch now
     <para>
       Finally, fix a change in the build system which allows its developers to
@@ -472 +472 @@
       build with LFS's use of the NINJAJOBS environment variable:
     </para>
-
+-->
 <!-- editors: See thread at
 http://lists.linuxfromscratch.org/pipermail/blfs-dev/2019-December/036996.html
 et.seq, particularly 037002.html which shows the commit near the end. -->
 
-<screen><userinput>sed -i 's/NINJAJOBS/NINJA_JOBS/' src/core/gn_run.pro</userinput></screen>
+<!--<screen><userinput>sed -i 's/NINJAJOBS/NINJA_JOBS/' src/core/gn_run.pro</userinput></screen>-->
 
 <!-- now that we always install this as 5.15.2, this seems to be redundant
@@ -499 +499 @@
     -i src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp</userinput></screen>-->
 
+<!-- PATH=[...] will cause /opt/python3.11/bin/python3.11 to be hardcoded into
+     the makefiles instead of whichever python is in /usr/bin -->
     <para>
       Install <application>qtwebengine</application> by running the following
@@ -506 +508 @@
 <screen><userinput>mkdir build &amp;&amp;
 cd    build &amp;&amp;
-qmake .. -- -system-ffmpeg -proprietary-codecs -webengine-icu &amp;&amp;
+PATH=/opt/python3.11/bin:$PATH qmake .. --                  \
+                                        -system-ffmpeg      \
+                                        -proprietary-codecs \
+                                        -webengine-icu      &amp;&amp;
 make</userinput></screen>
 
@@ -554 +559 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
+
+    <para>
+      <command>PATH=/opt/python3.11/bin:$PATH</command>: This switch forces
+      this package to use the version of Python 3.11 that is installed in /opt.
+      This is done to reduce the chances for problems that may occur during the
+      build, and to simplify the instructions since this package is incompatible
+      with Python 3.12 without additional modifications.
+      <!-- Ticket #19016 -->
+    </para>
 
     <para>

xsoft/graphweb/falkon.xml

@@ -165 +165 @@
       your home directory.
     </para>
+
+    <note>
+      <para>
+        If you are on a non-x86_64 architecture and run into problems with
+        missing text, you may wish to export
+        <envar>QTWEBENGINE_CHROMIUM_FLAGS="--no-sandbox"</envar> prior to
+        running Falkon.
+      </para>
+    </note>
 
   </sect2>