diff options
author | Martin Stransky <stransky@redhat.com> | 2019-07-25 08:05:53 +0200 |
---|---|---|
committer | Martin Stransky <stransky@redhat.com> | 2019-07-25 08:05:53 +0200 |
commit | b0154d22cc35bf902671aa8fe210c537162cec81 (patch) | |
tree | 1603ae664ab5a2fec23b954b4d7e38a8c48dbda5 | |
parent | Merge branch 'master' into f30 (diff) | |
parent | Added node js wrapper to fix koji freezes (diff) | |
download | librewolf-fedora-ff-b0154d22cc35bf902671aa8fe210c537162cec81.tar.gz librewolf-fedora-ff-b0154d22cc35bf902671aa8fe210c537162cec81.tar.bz2 librewolf-fedora-ff-b0154d22cc35bf902671aa8fe210c537162cec81.zip |
Merge branch 'master' into f30
-rw-r--r-- | firefox.spec | 8 | ||||
-rwxr-xr-x | node-stdout-nonblocking-wrapper | 2 |
2 files changed, 10 insertions, 0 deletions
diff --git a/firefox.spec b/firefox.spec index c2986f2..3ef4fbd 100644 --- a/firefox.spec +++ b/firefox.spec @@ -109,6 +109,7 @@ Source28: firefox-wayland.sh.in Source29: firefox-wayland.desktop Source30: firefox-x11.sh.in Source31: firefox-x11.desktop +Source32: node-stdout-nonblocking-wrapper # Build patches Patch3: mozilla-build-arm.patch @@ -435,6 +436,8 @@ echo "ac_add_options --without-system-libvpx" >> .mozconfig echo "ac_add_options --disable-ion" >> .mozconfig %endif +echo 'export NODEJS="%{_buildrootdir}/bin/node-stdout-nonblocking-wrapper"' >> .mozconfig + # Remove executable bit to make brp-mangle-shebangs happy. chmod -x third_party/rust/itertools/src/lib.rs @@ -467,6 +470,9 @@ echo "Generate big endian version of config/external/icu/data/icud58l.dat" rm -f config/external/icu/data/icudt*l.dat %endif +mkdir %{_buildrootdir}/bin || : +cp %{SOURCE32} %{_buildrootdir}/bin || : + # Update the various config.guess to upstream release for aarch64 support find ./ -name config.guess -exec cp /usr/lib/rpm/config.guess {} ';' @@ -921,6 +927,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog * Wed Jul 24 2019 Martin Stransky <stransky@redhat.com> - 68.0.1-2 - Added fix for rhbz#1709840 +- Added node js wrapper to fix koji freezes + (https://pagure.io/fedora-infrastructure/issue/8026) * Mon Jul 22 2019 Martin Stransky <stransky@redhat.com> - 68.0.1-1 - Updated to 68.0.1 diff --git a/node-stdout-nonblocking-wrapper b/node-stdout-nonblocking-wrapper new file mode 100755 index 0000000..b2814b8 --- /dev/null +++ b/node-stdout-nonblocking-wrapper @@ -0,0 +1,2 @@ +#!/bin/sh +exec /usr/bin/node "$@" 2>&1 | cat - |