linux-from-scratch/glfs
1
0
Fork 0
mirror of https://github.com/Zeckmathederg/glfs.git synced 2025-01-24 23:32:12 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

qtwebengine: Update patches:

Browse Source 
Update the security fixes to match paid-for 5.15.5.
Remove one item from the build fixes patch which is now upstream,
and apply that after the security fixes.
Remeasure for gcc-11.1.0 which takes a few less SBU.
This commit is contained in:
Ken Moffat 2021-06-21 19:25:55 +01:00
parent 4d0615f14d
commit e7cae3cb1d
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
introduction/welcome/changelog.xml
View File

@ -45,6 +45,11 @@
<listitem>
<para>June 21st, 2021</para>
<itemizedlist>
<listitem>
<para>[ken] - Update QtWebengine with newer patch to match the
5.15.5 commercial release (Security Fixes). Fixes
<ulink url="&blfs-ticket-root;15195">#15195</ulink>.</para>
</listitem>
<listitem>
<para>[ken] - Patch Qt-5.15.2 (security fix re qtsvg). Fixes
<ulink url="&blfs-ticket-root;15197">#15197</ulink>.</para>

14
x/lib/qtwebengine.xml
View File

@ -13,7 +13,7 @@
<!ENTITY qtwebengine-md5sum "97ee413dccf03d2fc09a7718f39367f7">
<!ENTITY qtwebengine-size "306 MB">
<!ENTITY qtwebengine-buildsize "5.1 GB (154 MB installed)">
<!ENTITY qtwebengine-time "100 SBU (Using parallelism=4)">
<!ENTITY qtwebengine-time "95 SBU (Using 6 jobs on a 4-core processor)">
]>
<sect1 id="qtwebengine" xreflabel="qtwebengine-&qtwebengine-version;">
@ -212,13 +212,13 @@
<!-- keep links for releases and git versions as a reminder
that the tarball names names differ
<ulink url="&patch-root;/qtwebengine-everywhere-src-&qtwebengine-version;-ICU68-2.patch"/> -->
<ulink url="&patch-root;/qtwebengine-&qtwebengine-version;-build_fixes-2.patch"/>
<ulink url="&patch-root;/qtwebengine-&qtwebengine-version;-upstream_fixes-2.patch"/>
</para>
</listitem>
<listitem>
<para>
Required patch:
<ulink url="&patch-root;/qtwebengine-&qtwebengine-version;-upstream_fixes-1.patch"/>
<ulink url="&patch-root;/qtwebengine-&qtwebengine-version;-build_fixes-3.patch"/>
</para>
</listitem>
</itemizedlist>
@ -291,16 +291,16 @@
<screen role="root"><userinput>ln -svf /usr/bin/python{2,}</userinput></screen>
<para>
Now apply a patch to fix several issues that can prevent the build working:
Now apply a patch for security and other fixes:
</para>
<screen><userinput remap="pre">patch -Np1 -i ../qtwebengine-&qtwebengine-version;-build_fixes-2.patch</userinput></screen>
<screen><userinput remap="pre">patch -Np1 -i ../qtwebengine-&qtwebengine-version;-upstream_fixes-2.patch</userinput></screen>
<para>
Next apply a patch for security and other fixes:
Next apply a patch to fix several issues that can prevent the build working:
</para>
<screen><userinput remap="pre">patch -Np1 -i ../qtwebengine-&qtwebengine-version;-upstream_fixes-1.patch</userinput></screen>
<screen><userinput remap="pre">patch -Np1 -i ../qtwebengine-&qtwebengine-version;-build_fixes-3.patch</userinput></screen>
<!-- start of commands for git versions only -->
<para>