Changeset 70e458ba for x/lib/qtwebengine.xml

Timestamp:

06/24/2022 04:36:36 PM (22 months ago)

Author:

Ken Moffat <ken@…>

Branches:

11.2, 11.3, 12.0, 12.1, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, xry111/llvm18, xry111/soup3, xry111/xf86-video-removal

Children:

bf2ef33

Parents:

a790ec35

Message:

Update to qtwebengine-5.15.10 using python3.

For the avoidance of doubt, the patch md5sum is
5436b52ab02f93340702b413930bf0ed

File:

• x/lib/qtwebengine.xml (modified) (8 diffs)

x/lib/qtwebengine.xml

@@ -11 +11 @@
   <!ENTITY qtwebengine-download-http "&sources-anduin-http;/qtwebengine/qtwebengine-&qtwebengine-version;.tar.xz">
   <!ENTITY qtwebengine-download-ftp  " ">
-  <!ENTITY qtwebengine-md5sum        "a3d64826a73996e5c1ba6ea8c5ef0490">
-  <!ENTITY qtwebengine-size          "306 MB">
-  <!ENTITY qtwebengine-buildsize     "5.1 GB (154 MB installed)">
-  <!ENTITY qtwebengine-time          "94 SBU (typical, Using parallelism=4)">
+  <!ENTITY qtwebengine-md5sum        "d963e40e47449d7a11f83d0249e7643a">
+  <!ENTITY qtwebengine-size          "307 MB">
+  <!ENTITY qtwebengine-buildsize     "5.1 GB (152 MB installed)">
+  <!ENTITY qtwebengine-time          "93 SBU (typical, Using parallelism=4)">
 ]>
 
@@ -252 +252 @@
       <xref linkend="nodejs"/>,
       <xref linkend="nss"/>,
-      <xref linkend="pciutils"/>,
-      <xref linkend="python2"/>, and
+      <xref linkend="pciutils"/>, and
+<!--  <xref linkend="python2"/>, and -->
       <xref linkend='qt5'/>
     </para>
@@ -297 +297 @@
     <title>Installation of qtwebengine</title>
 
-    <note>
+<!-- following merely commented instead of deleted, in case we need to
+      drop back when a future version of python3 is released -->
+<!--<note>
       <para>
         Unlike version 5.15.2, the chromium-derived build system now needs
@@ -315 +317 @@
     </para>
 
-<screen role="root"><userinput>ln -svf /usr/bin/python{2,}</userinput></screen>
+<screen role="root"><userinput>ln -svf /usr/bin/python{2,}</userinput></screen>-->
 
 
@@ -326 +328 @@
 
     <para>
-      Apply a patch to fix several issues that can prevent the build from working:
+      Apply a patch to fix several issues that can prevent the build from completing,
+      and to force it to use python3:
     </para>
 
@@ -393 +396 @@
 fi</userinput></screen>-->
 
-    <para>
+<!--<para>
       The last fix is needed to build with gcc-12:
     </para>
 
 <screen><userinput>sed -e '/#include/i#include &lt;vector&gt;' \
-    -i src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp</userinput></screen>
+    -i src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp</userinput></screen>-->
 
     <para>
@@ -445 +448 @@
    -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;</userinput></screen>
 
-    <para>
+<!--<para>
       Finally, as the <systemitem class="username">root</systemitem>
       user, remove the python symlink:
     </para>
 
-<screen role="root"><userinput>rm -v /usr/bin/python</userinput></screen>
+<screen role="root"><userinput>rm -v /usr/bin/python</userinput></screen>-->
   </sect2>
 
@@ -507 +510 @@
             with a lot of CPUs, trying to measure the build time for a 4-CPU
             machine, <option>NINJAJOBS=4 make</option> will give a reasonable
-            approximation (there is a short period where N+2 python2 and node
+            approximation (there is a short period where N+2 python and node
             jobs run).
           </para>