- Timestamp:
- 05/06/2021 08:15:00 PM (3 years ago)
- Branches:
- 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 12.2, gimp3, 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, upgradedb, xry111/for-12.3, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/spidermonkey128, xry111/test-20220226, xry111/xf86-video-removal
- Children:
- 0dbcba9
- Parents:
- 70896c42
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
x/lib/qtwebengine.xml
r70896c42 r685b8672 14 14 <!ENTITY qtwebengine-size "306 MB"> 15 15 <!ENTITY qtwebengine-buildsize "5.1 GB (154 MB installed)"> 16 <!ENTITY qtwebengine-time "10 1SBU (Using parallelism=4)">16 <!ENTITY qtwebengine-time "100 SBU (Using parallelism=4)"> 17 17 ]> 18 18 … … 80 80 The tarball linked to below was created from the 5.15 git branch 81 81 and the 87-branch of the chromium submodule (which is forked from 82 chromium). See the GIT-VERSIONS file in the tarball for details of83 the latest commits.82 chromium). See the GIT-VERSIONS file in the tarball (after applying 83 any patches) for details of the latest commits. 84 84 </para> 85 85 </warning> … … 120 120 is private to Qt until they choose to release it. 121 121 122 NOTE: the 3rdparty/chromium tree may contain more patches than have been 123 merged into the current 5.15.x branch. Any patches after what was in the 124 last 'update chromium' merge in qtwebengine may break the build. When Qt 125 is close to releasing a paid-for 5.15 version, items from 5.15.x get merged 126 into 5.15. 127 122 128 After merging the contents of the qtwebengine and src/3rdparty git extracts, 123 129 in the top level please create a GIT-VERSIONS file summarising the HEAD … … 130 136 tarball, go down to src/3rdparty and untar the submodule tarball. 131 137 Decide on what to call the result and create a full xz tarball using tar -cJf. 138 139 UPDATE: Since we have to host the tarball, and it is over 300MB, it makes 140 sense to create a patch for subsequent fixes (for the first version, 314KB 141 including the updates to the GIT-VERSIONS file). For future updates, view 142 the current updates patch to see the previous commits. When the new commits 143 have been applied, rename the updated version to 'b', but untar the 144 unpatched tarball as 'a' and then diff a to b in the usual manner to get 145 all updates since the tarball was created. 146 147 For our own releases, probably best to create a fresh tarball. 148 132 149 end of note for editors --> 133 150 … … 196 213 that the tarball names names differ 197 214 <ulink url="&patch-root;/qtwebengine-everywhere-src-&qtwebengine-version;-ICU68-2.patch"/> --> 198 <ulink url="&patch-root;/qtwebengine-&qtwebengine-version;-build_fixes-1.patch"/> 215 <ulink url="&patch-root;/qtwebengine-&qtwebengine-version;-build_fixes-2.patch"/> 216 </para> 217 </listitem> 218 <listitem> 219 <para> 220 Required patch: 221 <ulink url="&patch-root;/qtwebengine-&qtwebengine-version;-upstream_fixes-1.patch"/> 199 222 </para> 200 223 </listitem> … … 272 295 </para> 273 296 274 <screen><userinput remap="pre">patch -Np1 -i ../qtwebengine-&qtwebengine-version;-build_fixes-1.patch</userinput></screen> 297 <screen><userinput remap="pre">patch -Np1 -i ../qtwebengine-&qtwebengine-version;-build_fixes-2.patch</userinput></screen> 298 299 <para> 300 Next apply a patch for security and other fixes: 301 </para> 302 303 <screen><userinput remap="pre">patch -Np1 -i ../qtwebengine-&qtwebengine-version;-upstream_fixes-1.patch</userinput></screen> 275 304 276 305 <!-- start of commands for git versions only --> 277 306 <para> 278 Although the patch has ensured that git is not invoked during the build,307 Although the first patch has ensured that git is not invoked during the build, 279 308 the build system has labyrinthine rules of byzantine complexity, and in 280 309 particular trying to build without two <filename>.git</filename> directories
Note:
See TracChangeset
for help on using the changeset viewer.