mirror of
https://github.com/Zeckmathederg/glfs.git
synced 2025-01-26 08:42:12 +08:00
Update to qtwebengine-5.15.10 using python3.
For the avoidance of doubt, the patch md5sum is 5436b52ab02f93340702b413930bf0ed
This commit is contained in:
parent
a790ec35b3
commit
70e458ba83
@ -44,6 +44,11 @@
|
||||
<listitem>
|
||||
<para>June 24th, 2022</para>
|
||||
<itemizedlist>
|
||||
<listitem>
|
||||
<para>[ken] - Update to qtwebengine-5.15.10 (security fix)
|
||||
and patch it to use python3. Fixes
|
||||
<ulink url="&blfs-ticket-root;16687">#16687</ulink>.</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>[pierre] - Update to OpenJDK-18.0.1.1. Fixes
|
||||
<ulink url="&blfs-ticket-root;16690">#16690</ulink>.</para>
|
||||
|
@ -795,7 +795,7 @@ to avoid building libxml2 twice, which is slow with all deps -->
|
||||
<!ENTITY pango-version "&pango-minor;.7">
|
||||
<!ENTITY pangomm-version "2.46.2">
|
||||
<!ENTITY qt5-version "5.15.5">
|
||||
<!ENTITY qtwebengine-version "5.15.9">
|
||||
<!ENTITY qtwebengine-version "5.15.10">
|
||||
<!ENTITY qtwebkit-version "5.9.0">
|
||||
<!ENTITY qscintilla-version "2.10.4">
|
||||
<!ENTITY shared-mime-info-version "2.2">
|
||||
|
@ -10,10 +10,10 @@
|
||||
URL for a prepared git version -->
|
||||
<!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)">
|
||||
]>
|
||||
|
||||
<sect1 id="qtwebengine" xreflabel="qtwebengine-&qtwebengine-version;">
|
||||
@ -251,8 +251,8 @@
|
||||
<para role="required">
|
||||
<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>
|
||||
|
||||
@ -296,7 +296,9 @@
|
||||
<sect2 role="installation">
|
||||
<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
|
||||
<command>python</command> to be available and to be python2. In
|
||||
@ -314,7 +316,7 @@
|
||||
user, create the python symlink:
|
||||
</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>-->
|
||||
|
||||
|
||||
<!--<para>
|
||||
@ -325,7 +327,8 @@
|
||||
<screen><userinput remap="pre">patch -Np1 -i ../qtwebengine-&qtwebengine-version;-5.15.7-1.patch</userinput></screen>-->
|
||||
|
||||
<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>
|
||||
|
||||
<screen><userinput remap="pre">patch -Np1 -i ../qtwebengine-&qtwebengine-version;-build_fixes-1.patch</userinput></screen>
|
||||
@ -392,12 +395,12 @@ et.seq, particularly 037002.html which shows the commit near the end. -->
|
||||
mv -v ${QT5DIR}/lib/libQt5WebEngineCore.so{,.old}
|
||||
fi</userinput></screen>-->
|
||||
|
||||
<para>
|
||||
<!--<para>
|
||||
The last fix is needed to build with gcc-12:
|
||||
</para>
|
||||
|
||||
<screen><userinput>sed -e '/#include/i#include <vector>' \
|
||||
-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>
|
||||
Install <application>qtwebengine</application> by running the following
|
||||
@ -444,12 +447,12 @@ make</userinput></screen>
|
||||
<screen role="root"><userinput>find $QT5DIR/ -name \*.prl \
|
||||
-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>
|
||||
|
||||
<sect2 role="commands">
|
||||
@ -506,7 +509,7 @@ make</userinput></screen>
|
||||
CPU-intensive tasks at the same time. For an editor on a machine
|
||||
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>
|
||||
</listitem>
|
||||
|
Loading…
Reference in New Issue
Block a user