diff --git a/general/genlib/genlib.xml b/general/genlib/genlib.xml index b86cde79c8..cc5ee510d7 100644 --- a/general/genlib/genlib.xml +++ b/general/genlib/genlib.xml @@ -75,11 +75,7 @@ - - - - - + diff --git a/general/genlib/js78.xml b/general/genlib/js91.xml similarity index 62% rename from general/genlib/js78.xml rename to general/genlib/js91.xml index 67115f2d81..3ef008f87c 100644 --- a/general/genlib/js78.xml +++ b/general/genlib/js91.xml @@ -4,32 +4,32 @@ %general-entities; - + --> - - - - - - - + + + + + + + ]> - - + + $Date$ - JS-&JS78-version; + JS-&JS91-version; - - js78 + + js91 @@ -37,7 +37,7 @@ JS is Mozilla's JavaScript engine - written in C. JS78 is taken from Firefox. + written in C. JS91 is taken from Firefox. &lfs111_checked; @@ -46,51 +46,50 @@ - Download (HTTP): + Download (HTTP): - Download (FTP): + Download (FTP): - Download MD5 sum: &js78-md5sum; + Download MD5 sum: &js91-md5sum; - Download size: &js78-size; + Download size: &js91-size; - Estimated disk space required: &js78-buildsize; + Estimated disk space required: &js91-buildsize; - Estimated build time: &js78-time; + Estimated build time: &js91-time; - + + JS91 Dependencies Required - , , , and @@ -104,7 +103,7 @@ - User Notes: + User Notes: @@ -114,8 +113,8 @@ Unlike most other packages in BLFS, the instructions below require you - to untar firefox-&JS78-version;esr.tar.xz and - change into the firefox-&JS78-version; folder. + to untar firefox-&JS91-version;esr.tar.xz and + change into the firefox-&JS91-version; folder. @@ -140,14 +139,14 @@ tar: Exiting with failure status due to previous errors - + Install JS by running the following commands: @@ -171,13 +170,13 @@ tar: Exiting with failure status due to previous errors cd obj && CC=gcc CXX=g++ \ -../js/src/configure --prefix=/usr \ - --with-intl-api \ - --with-system-zlib \ - --with-system-icu \ - --disable-jemalloc \ - --disable-debug-symbols \ - --enable-readline && +sh ../js/src/configure.in --prefix=/usr \ + --with-intl-api \ + --with-system-zlib \ + --with-system-icu \ + --disable-jemalloc \ + --disable-debug-symbols \ + --enable-readline && make @@ -186,34 +185,24 @@ make JSTESTS_EXTRA_ARGS="--timeout 300 --wpt=disabled". It's recommended to redirect the output into a log. - - - More than a hundred tests fail after upgrading to icu-70.1 or above, - out of a total of more than 40,000. + Because we are building with system ICU, more than one hundred tests + (out of a total of more than 40,000) are known to fail. To run the JIT test suite, issue: make -C js/src check-jit-test - JITTEST_EXTRA_ARGS="--timeout 300". One test may fail. + JITTEST_EXTRA_ARGS="--timeout 300". An issue in the installation process causes any running program which - links to JS78 shared library (for example, GNOME Shell) to crash if - JS78 is upgraded or reinstalled. To work around this issue, remove - the old version of the JS78 shared library before installation: + links to JS91 shared library (for example, GNOME Shell) to crash if + JS91 is upgraded or reinstalled. To work around this issue, remove + the old version of the JS91 shared library before installation: -rm -fv /usr/lib/libmozjs-78.so +rm -fv /usr/lib/libmozjs-91.so @@ -222,11 +211,11 @@ make make install && rm -v /usr/lib/libjs_static.ajs && -sed -i '/@NSPR_CFLAGS@/d' /usr/bin/js78-config +sed -i '/@NSPR_CFLAGS@/d' /usr/bin/js91-config - @@ -239,7 +228,20 @@ sed -i '/@NSPR_CFLAGS@/d' /usr/bin/js78-config - --with-*: These parameters allow the build system + sh ../js/src/configure.in: + configure.in is actually a shell script, but + the executable bit is not set in its permission mode so it's needed + to explicitly run it with sh. + + + + --with-intl-api: This enables the + internationalization functions required by + Gjs. + + + + --with-system-*: These parameters allow the build system to use system versions of the above libraries. These are required for stability. @@ -251,16 +253,16 @@ sed -i '/@NSPR_CFLAGS@/d' /usr/bin/js78-config --disable-jemalloc: This switch disables the - internal memory allocator used in JS78. jemalloc is only intended for - the Firefox browser environment. For other applications using JS78, - if JS78 uses jemalloc, the application may crash as items allocated + internal memory allocator used in JS91. jemalloc is only intended for + the Firefox browser environment. For other applications using JS91, + if JS91 uses jemalloc, the application may crash as items allocated in jemalloc allocator are freed on system (glibc) allocator. --disable-debug-symbols: Don't generate debug symbols since they are very large and most users won't need it. Remove - it if you want to debug JS78. + it if you want to debug JS91. @@ -269,8 +271,8 @@ sed -i '/@NSPR_CFLAGS@/d' /usr/bin/js78-config - sed -i '/@NSPR_CFLAGS@/d' /usr/bin/js78-config: - Prevent js78-config from using buggy CFLAGS. + sed -i '/@NSPR_CFLAGS@/d' /usr/bin/js91-config: + Prevent js91-config from using buggy CFLAGS. @@ -285,13 +287,13 @@ sed -i '/@NSPR_CFLAGS@/d' /usr/bin/js78-config - js78 and js78-config + js91 and js91-config - libmozjs-78.so + libmozjs-91.so - /usr/include/mozjs-78 + /usr/include/mozjs-91 @@ -301,39 +303,39 @@ sed -i '/@NSPR_CFLAGS@/d' /usr/bin/js78-config - - js78 + + js91 provides a command line interface to the JavaScript engine - - js78 + + js91 - - js78-config + + js91-config is used to find the JS compiler and linker flags - - js78-config + + js91-config - - libmozjs-78.so + + libmozjs-91.so contains the Mozilla JavaScript API functions - - libmozjs-78.so + + libmozjs-91.so diff --git a/gnome.ent b/gnome.ent index 4923bb3305..6715f6520d 100644 --- a/gnome.ent +++ b/gnome.ent @@ -27,7 +27,7 @@ - + diff --git a/gnome/platform/gjs.xml b/gnome/platform/gjs.xml index 2daffa903a..735a4795d7 100644 --- a/gnome/platform/gjs.xml +++ b/gnome/platform/gjs.xml @@ -4,10 +4,10 @@ %general-entities; - - - - + + + + ]> @@ -76,7 +76,7 @@ , , , and - + Recommended (required for GNOME) diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml index ce5215a5a4..a88f916b4b 100644 --- a/introduction/welcome/changelog.xml +++ b/introduction/welcome/changelog.xml @@ -41,6 +41,24 @@ --> + + March 6th, 2022 + + + [xry111] - Update to JS-91.6.0. Fixes + #15368. + + + [xry111] - Add polkit-0.120 patch for JS-91. Addresses + #15368. + + + [xry111] - Update to Gjs-1.71.90. Addresses + #15368. + + + + March 5th, 2022 diff --git a/packages.ent b/packages.ent index f7161929ea..2d9750bbf8 100644 --- a/packages.ent +++ b/packages.ent @@ -123,6 +123,8 @@ + + diff --git a/postlfs/security/polkit.xml b/postlfs/security/polkit.xml index 982256fc04..1e1999203e 100644 --- a/postlfs/security/polkit.xml +++ b/postlfs/security/polkit.xml @@ -78,6 +78,12 @@ + + + Required patch: + + + Polkit Dependencies @@ -85,7 +91,7 @@ Required and - + Recommended @@ -196,6 +202,12 @@ sed '/policy,/d' -i actions/meson.build \ patch -Np1 -i ../polkit-&polkit-version;-security_fixes-1.patch + + Port this package to use JS-91: + + +patch -Np1 -i ../polkit-&polkit-version;-js91-1.patch + Install Polkit by running the following commands: