Changeset 70e458ba


Ignore:
Timestamp:
06/24/2022 04:36:36 PM (7 weeks ago)
Author:
Ken Moffat <ken@…>
Branches:
trunk
Children:
bf2ef33
Parents:
a790ec35
Message:

Update to qtwebengine-5.15.10 using python3.

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

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • introduction/welcome/changelog.xml

    ra790ec35 r70e458ba  
    4646      <itemizedlist>
    4747        <listitem>
     48          <para>[ken] - Update to qtwebengine-5.15.10 (security fix)
     49          and patch it to use python3. Fixes
     50          <ulink url="&blfs-ticket-root;16687">#16687</ulink>.</para>
     51        </listitem>
     52        <listitem>
    4853          <para>[pierre] - Update to OpenJDK-18.0.1.1. Fixes
    4954          <ulink url="&blfs-ticket-root;16690">#16690</ulink>.</para>
  • packages.ent

    ra790ec35 r70e458ba  
    796796<!ENTITY pangomm-version              "2.46.2">
    797797<!ENTITY qt5-version                  "5.15.5">
    798 <!ENTITY qtwebengine-version          "5.15.9">
     798<!ENTITY qtwebengine-version          "5.15.10">
    799799<!ENTITY qtwebkit-version             "5.9.0">
    800800<!ENTITY qscintilla-version           "2.10.4">
  • x/lib/qtwebengine.xml

    ra790ec35 r70e458ba  
    1111  <!ENTITY qtwebengine-download-http "&sources-anduin-http;/qtwebengine/qtwebengine-&qtwebengine-version;.tar.xz">
    1212  <!ENTITY qtwebengine-download-ftp  " ">
    13   <!ENTITY qtwebengine-md5sum        "a3d64826a73996e5c1ba6ea8c5ef0490">
    14   <!ENTITY qtwebengine-size          "306 MB">
    15   <!ENTITY qtwebengine-buildsize     "5.1 GB (154 MB installed)">
    16   <!ENTITY qtwebengine-time          "94 SBU (typical, Using parallelism=4)">
     13  <!ENTITY qtwebengine-md5sum        "d963e40e47449d7a11f83d0249e7643a">
     14  <!ENTITY qtwebengine-size          "307 MB">
     15  <!ENTITY qtwebengine-buildsize     "5.1 GB (152 MB installed)">
     16  <!ENTITY qtwebengine-time          "93 SBU (typical, Using parallelism=4)">
    1717]>
    1818
     
    252252      <xref linkend="nodejs"/>,
    253253      <xref linkend="nss"/>,
    254       <xref linkend="pciutils"/>,
    255       <xref linkend="python2"/>, and
     254      <xref linkend="pciutils"/>, and
     255<!--  <xref linkend="python2"/>, and -->
    256256      <xref linkend='qt5'/>
    257257    </para>
     
    297297    <title>Installation of qtwebengine</title>
    298298
    299     <note>
     299<!-- following merely commented instead of deleted, in case we need to
     300      drop back when a future version of python3 is released -->
     301<!--<note>
    300302      <para>
    301303        Unlike version 5.15.2, the chromium-derived build system now needs
     
    315317    </para>
    316318
    317 <screen role="root"><userinput>ln -svf /usr/bin/python{2,}</userinput></screen>
     319<screen role="root"><userinput>ln -svf /usr/bin/python{2,}</userinput></screen>-->
    318320
    319321
     
    326328
    327329    <para>
    328       Apply a patch to fix several issues that can prevent the build from working:
     330      Apply a patch to fix several issues that can prevent the build from completing,
     331      and to force it to use python3:
    329332    </para>
    330333
     
    393396fi</userinput></screen>-->
    394397
    395     <para>
     398<!--<para>
    396399      The last fix is needed to build with gcc-12:
    397400    </para>
    398401
    399402<screen><userinput>sed -e '/#include/i#include &lt;vector&gt;' \
    400     -i src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp</userinput></screen>
     403    -i src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp</userinput></screen>-->
    401404
    402405    <para>
     
    445448   -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;</userinput></screen>
    446449
    447     <para>
     450<!--<para>
    448451      Finally, as the <systemitem class="username">root</systemitem>
    449452      user, remove the python symlink:
    450453    </para>
    451454
    452 <screen role="root"><userinput>rm -v /usr/bin/python</userinput></screen>
     455<screen role="root"><userinput>rm -v /usr/bin/python</userinput></screen>-->
    453456  </sect2>
    454457
     
    507510            with a lot of CPUs, trying to measure the build time for a 4-CPU
    508511            machine, <option>NINJAJOBS=4 make</option> will give a reasonable
    509             approximation (there is a short period where N+2 python2 and node
     512            approximation (there is a short period where N+2 python and node
    510513            jobs run).
    511514          </para>
Note: See TracChangeset for help on using the changeset viewer.