Index: x/lib/qtwebengine.xml
===================================================================
--- x/lib/qtwebengine.xml	(revision 1859ee68721892d1570991eb914f43aa4e3f46b7)
+++ x/lib/qtwebengine.xml	(revision 18fe946e1b92b0fafefe5098cbd0ef3ca58696fa)
@@ -243,5 +243,5 @@
         <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,5 +269,6 @@
       <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,5 +347,5 @@
     </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,4 +361,6 @@
          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,4 +370,5 @@
 <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,4 +409,7 @@
     -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,14 +464,7 @@
 <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,10 +472,10 @@
       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,4 +499,6 @@
     -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,5 +508,8 @@
 <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,4 +559,13 @@
   <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>
