Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed

  • x/lib/qtwebengine.xml

    r86e62cc r3f2db3a6  
    1111  <!ENTITY qtwebengine-download-http "&sources-anduin-http;/qtwebengine/qtwebengine-&qtwebengine-version;.tar.xz">
    1212  <!ENTITY qtwebengine-download-ftp  " ">
    13   <!ENTITY qtwebengine-md5sum        "af799617842cca0b765102c312fbdd46">
     13  <!ENTITY qtwebengine-md5sum        "1302667c7e8a045fb0cc776f7e3627ad">
    1414  <!ENTITY qtwebengine-size          "306 MB">
    15   <!ENTITY qtwebengine-buildsize     "5.0 GB (154 MB installed)">
    16   <!ENTITY qtwebengine-time          "107 SBU (typical, Using parallelism=4)">
     15  <!ENTITY qtwebengine-buildsize     "5.1 GB (152 MB installed)">
     16  <!ENTITY qtwebengine-time          "103 SBU (typical, Using parallelism=4)">
    1717]>
    1818
    … …  
    2020  <?dbhtml filename="qtwebengine.html"?>
    2121
    22   <sect1info>
    23     <date>$Date$</date>
    24   </sect1info>
    2522
    2623  <title>QtWebEngine-&qtwebengine-version;</title>
    … …  
    7875
    7976      <para> <!-- for git versions -->
    80         The tarball linked to below was created from the 5.15.6 git branch
     77        The tarball linked to below was created from the 5.15 git branch
    8178        and the 87-branch of the chromium submodule (which is forked from
    82         chromium). See the GIT-VERSIONS file in the tarball (after applying
    83         any patches) for details of the latest commits.
     79        chromium). See the GIT-VERSIONS file in the tarball for details of the
     80        latest commits.
    8481      </para>
    8582    </warning>
    … …  
    106103      git checkout origin/87-branch (or whatever)
    107104       Use git log or git tk to look at its HEAD and check it seems appropriate.
     105       If this doesn't work, use 'git submodule update'
    108106
    109107      To decide when it might be worth creating a new tarball, periodically keep
    … …  
    139137      Decide on what to call the result and create a full xz tarball using tar -cJf.
    140138
     139      NOTE: To use git archive, use something like this:
     140      git archive - -format tar.gz - -output qtwebengine.tar.gz HEAD
     141      git archive - -format tar.gz - -output chromium.tar.gz HEAD
     142
    141143      UPDATE: Since we have to host the tarball, and it is over 300MB, it makes
    142144      sense to create a patch for subsequent fixes (for the first version, 314KB
    … …  
    151153         end of note for editors -->
    152154
    153     &lfs110a_checked;
     155    &lfs112_checked;
    154156
    155157    <warning>
    … …  
    170172
    171173    <note>
     174      <para>
     175        If you  are upgrading and have installed a newer version of <xref
     176        linkend='icu'/> since you last installed <xref linkend='qt5'/>, you
     177        will need to reinstall Qt5 before upgrading, otherwise the final link
     178        of this package will fail with a warning that the version of icu
     179        libraries needed by libQt5Core.so may conflict with the version
     180        used for this package.
     181      </para>
     182
    172183      <para>
    173184        Unusually, the shipped GN build system (used to create the Ninja files)
    … …  
    218229    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
    219230    <itemizedlist spacing="compact">
     231  <!--<listitem>
     232        <para>
     233          Required patch:
     234          <!\-\- keep links for releases and git versions as a reminder
     235               that the tarball names names differ
     236          <ulink url="&patch-root;/qtwebengine-everywhere-src-&qtwebengine-version;-ICU68-2.patch"/> \-\->
     237
     238          <ulink url="&patch-root;/qtwebengine-&qtwebengine-version;-5.15.7-1.patch"/>
     239        </para>
     240      </listitem>-->
    220241      <listitem>
    221242        <para>
    222243          Required patch:
    223           <!-- keep links for releases and git versions as a reminder
    224                that the tarball names names differ
    225           <ulink url="&patch-root;/qtwebengine-everywhere-src-&qtwebengine-version;-ICU68-2.patch"/> -->
    226            
    227           <ulink url="&patch-root;/qtwebengine-&qtwebengine-version;-5.15.7-1.patch"/>
     244          <ulink url="&patch-root;/qtwebengine-&qtwebengine-version;-build_fixes-1.patch"/>
    228245        </para>
    229246      </listitem>
    230247      <listitem>
    231248        <para>
    232           Required patch:-->
    233      <!--     <ulink url="&patch-root;/qtwebengine-&qtwebengine-version;-build_fixes-1.patch"/> -->
    234           <ulink url="&patch-root;/qtwebengine-5.15.7-build_fixes-1.patch"/>
     249          Required patch:
     250          <ulink url="&patch-root;/qtwebengine-&qtwebengine-version;-ffmpeg5_fixes-1.patch"/>
    235251        </para>
    236252      </listitem>
    … …  
    244260      <xref linkend="nodejs"/>,
    245261      <xref linkend="nss"/>,
    246       <xref linkend="python2"/>, and
     262      <xref linkend="pciutils"/>, and
     263<!--  <xref linkend="python2"/>, and -->
    247264      <xref linkend='qt5'/>
    248265    </para>
    … …  
    272289    <para role="optional">
    273290      <xref linkend="libevent"/>,
     291      <xref linkend="mitkrb"/>,
    274292      <xref linkend="pipewire"/>,
    275293      <xref linkend="poppler"/>,
    276294      <ulink url="https://github.com/open-source-parsers/jsoncpp/releases">jsoncpp</ulink>,
    277295      <ulink url="https://github.com/cisco/libsrtp/releases">libsrtp</ulink>,
    278       <ulink url="http://google.github.io/snappy/">snappy</ulink>
     296      <ulink url="https://google.github.io/snappy/">snappy</ulink>
    279297    </para>
    280298
    … …  
    287305    <title>Installation of qtwebengine</title>
    288306
    289     <note>
     307<!-- following merely commented instead of deleted, in case we need to
     308      drop back when a future version of python3 is released -->
     309<!--<note>
    290310      <para>
    291311        Unlike version 5.15.2, the chromium-derived build system now needs
    … …  
    305325    </para>
    306326
    307 <screen role="root"><userinput>ln -svf /usr/bin/python{2,}</userinput></screen>
    308 
    309 
    310     <para>
     327<screen role="root"><userinput>ln -svf /usr/bin/python{2,}</userinput></screen>-->
     328
     329
     330<!--<para>
    311331      Now apply a patch to update from 5.15.6 to the security and other fixes
    312332      contained in the 5.15.7 source:
    313333    </para>
    314334
    315 <screen><userinput remap="pre">patch -Np1 -i ../qtwebengine-&qtwebengine-version;-5.15.7-1.patch</userinput></screen>
    316 
    317     <para>
    318       Apply apply a patch to fix several issues that can prevent the build working:
    319     </para>
    320 
    321 <screen><userinput remap="pre">patch -Np1 -i ../qtwebengine-5.15.7-build_fixes-1.patch</userinput></screen>
     335<screen><userinput remap="pre">patch -Np1 -i ../qtwebengine-&qtwebengine-version;-5.15.7-1.patch</userinput></screen>-->
     336
     337    <para>
     338      Apply a patch to fix several issues that can prevent the build from completing,
     339      and to force it to use python3:
     340    </para>
     341
     342<screen><userinput remap="pre">patch -Np1 -i ../qtwebengine-&qtwebengine-version;-build_fixes-1.patch</userinput></screen>
     343
     344    <para>
     345      Apply a patch that resolves problems when building with ffmpeg-5:
     346    </para>
     347
     348<screen><userinput remap="pre">patch -Np1 -i ../qtwebengine-&qtwebengine-version;-ffmpeg5_fixes-1.patch</userinput></screen>
    322349
    323350<!-- start of commands for git versions only -->
    … …  
    359386
    360387    <para>
     388      Next, fix the build tools so they can be run with Python-3.11+:
     389    </para>
     390
     391<screen><userinput>sed -e 's/\^(?i)/(?i)^/' \
     392    -i src/3rdparty/chromium/tools/metrics/ukm/ukm_model.py &amp;&amp;
     393sed -e "s/'rU'/'r'/" \
     394    -i src/3rdparty/chromium/tools/grit/grit/util.py</userinput></screen>
     395
     396    <para>
    361397      Finally, fix a change in the build system which allows its developers to
    362398      pass e.g. -j20 to make (for quick tests of some areas) but breaks the
    … …  
    383419fi</userinput></screen>-->
    384420
     421<!--<para>
     422      The last fix is needed to build with gcc-12:
     423    </para>
     424
     425<screen><userinput>sed -e '/#include/i#include &lt;vector&gt;' \
     426    -i src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp</userinput></screen>-->
     427
    385428    <para>
    386429      Install <application>qtwebengine</application> by running the following
    … …  
    428471   -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;</userinput></screen>
    429472
    430     <para>
     473<!--<para>
    431474      Finally, as the <systemitem class="username">root</systemitem>
    432475      user, remove the python symlink:
    433476    </para>
    434477
    435 <screen role="root"><userinput>rm -v /usr/bin/python</userinput></screen>
     478<screen role="root"><userinput>rm -v /usr/bin/python</userinput></screen>-->
    436479  </sect2>
    437480
    … …  
    464507    </para>
    465508
     509    <para>
     510      <option>-webengine-kerberos</option>: Add this if you have installed <xref
     511      linkend="mitkrb"/> and wish to connect from a browser using QtWebEngine
     512      to a webserver which requires you to connect via kerberos.
     513    </para>
     514
    466515    <!--
    467516    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    484533            with a lot of CPUs, trying to measure the build time for a 4-CPU
    485534            machine, <option>NINJAJOBS=4 make</option> will give a reasonable
    486             approximation (there is a short period where N+2 python2 and node
     535            approximation (there is a short period where N+2 python and node
    487536            jobs run).
    488537          </para>
Note: See TracChangeset for help on using the changeset viewer.