diff --git a/general.ent b/general.ent index f45d23b2ef..e7770726df 100644 --- a/general.ent +++ b/general.ent @@ -1,6 +1,6 @@ - + diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml index af73edd976..1393fc5363 100644 --- a/introduction/welcome/changelog.xml +++ b/introduction/welcome/changelog.xml @@ -41,6 +41,15 @@ --> + + December 11th, 2019 + + + [ken] - Work around upstream qtwebengine's use of a + NINJAJOBS environment variable, reported by Alain Dumont. + + + December 10th, 2019 diff --git a/x/lib/qtwebengine.xml b/x/lib/qtwebengine.xml index 7381fe0103..bb620ac350 100644 --- a/x/lib/qtwebengine.xml +++ b/x/lib/qtwebengine.xml @@ -198,6 +198,18 @@ followed by a comment, the second lacks the ';' --> sed -i '5713s/.*/&;/' \ src/3rdparty/chromium/third_party/blink/renderer/core/dom/document.cc + + Finally, fix a change in the build system which allows its developers to + pass e.g. -j20 to make (for quick tests of some areas) but breaks the + build with LFS's use of the NINJAJOBS environment variable: + + + + +sed -i 's/NINJAJOBS/NINJA_JOBS/' src/core/gn_run.pro + If an older version of the package's main library has been installed, when the package is built separately it will link to that in preference