diff options
| author | Patrick J Volkerding <volkerdi@slackware.com> | 2019-12-05 04:26:32 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2019-12-05 08:59:48 +0100 |
| commit | cd6f7a8c2cc3858324e194828283bc5a265a97f6 (patch) | |
| tree | 092e5679767cc51db98ecead57b9e5208af4c0b7 /source/xap/mozilla-thunderbird | |
| parent | d29002b2b2bba13ec5d668a22febddf2e4001f62 (diff) | |
| download | current-cd6f7a8c2cc3858324e194828283bc5a265a97f6.tar.gz | |
Thu Dec 5 04:26:32 UTC 201920191205042632
a/kernel-generic-5.4.2-x86_64-1.txz: Upgraded.
a/kernel-huge-5.4.2-x86_64-1.txz: Upgraded.
a/kernel-modules-5.4.2-x86_64-1.txz: Upgraded.
d/kernel-headers-5.4.2-x86-1.txz: Upgraded.
k/kernel-source-5.4.2-noarch-1.txz: Upgraded.
l/netpbm-10.88.01-x86_64-1.txz: Upgraded.
x/mesa-19.2.7-x86_64-1.txz: Upgraded.
isolinux/initrd.img: Rebuilt.
kernels/*: Upgraded.
usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'source/xap/mozilla-thunderbird')
| -rw-r--r-- | source/xap/mozilla-thunderbird/firefox.node.py.patch | 46 | ||||
| -rwxr-xr-x | source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild | 3 |
2 files changed, 0 insertions, 49 deletions
diff --git a/source/xap/mozilla-thunderbird/firefox.node.py.patch b/source/xap/mozilla-thunderbird/firefox.node.py.patch deleted file mode 100644 index 11e2b843..00000000 --- a/source/xap/mozilla-thunderbird/firefox.node.py.patch +++ /dev/null @@ -1,46 +0,0 @@ - -diff --git a/python/mozbuild/mozbuild/action/node.py b/python/mozbuild/mozbuild/action/node.py ---- a/python/mozbuild/mozbuild/action/node.py -+++ b/python/mozbuild/mozbuild/action/node.py -@@ -47,24 +47,35 @@ def execute_node_cmd(node_cmd_list): - printed to stderr instead. - """ - - try: - printable_cmd = ' '.join(pipes.quote(arg) for arg in node_cmd_list) - print('Executing "{}"'.format(printable_cmd), file=sys.stderr) - sys.stderr.flush() - -- output = subprocess.check_output(node_cmd_list) -+ # We need to redirect stderr to a pipe because -+ # https://github.com/nodejs/node/issues/14752 causes issues with make. -+ proc = subprocess.Popen( -+ node_cmd_list, stdout=subprocess.PIPE, stderr=subprocess.PIPE) -+ -+ stdout, stderr = proc.communicate() -+ retcode = proc.wait() -+ -+ if retcode != 0: -+ print(stderr, file=sys.stderr) -+ sys.stderr.flush() -+ sys.exit(retcode) - - # Process the node script output - # - # XXX Starting with an empty list means that node scripts can - # (intentionally or inadvertently) remove deps. Do we want this? - deps = [] -- for line in output.splitlines(): -+ for line in stdout.splitlines(): - if 'dep:' in line: - deps.append(line.replace('dep:', '')) - else: - print(line, file=sys.stderr) - sys.stderr.flush() - - return set(deps) - - - - - diff --git a/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild b/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild index ef593e77..7c8bf81e 100755 --- a/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild +++ b/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild @@ -180,9 +180,6 @@ zcat $CWD/tb.ui.scrollToClick.diff.gz | patch -p1 --verbose || exit 1 zcat $CWD/unbreakdocs.diff.gz | patch -p1 --verbose || exit 1 zcat $CWD/thunderbird-rust-1.39.x.patch.gz | patch -p0 --verbose || exit 1 -# Fix a build failure caused by node.js: -zcat $CWD/firefox.node.py.patch.gz | patch -p1 --verbose || exit 1 - # Bypass a test that fails the build: zcat $CWD/gkrust.a.no.networking.check.diff.gz | patch -p1 --verbose || exit 1 |