diff options
| author | Patrick J Volkerding <volkerdi@slackware.com> | 2019-12-02 23:59:46 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2019-12-03 08:59:49 +0100 |
| commit | 4355ff4c77d0aea75488f167a7cb890c80d1164b (patch) | |
| tree | 7c43b04747a7eb94df58b9c0e52677ef099be9d1 /source/xap | |
| parent | 79ca536e7f4b3fad2036c77c36f32d09d9c27894 (diff) | |
| download | current-4355ff4c77d0aea75488f167a7cb890c80d1164b.tar.gz | |
Mon Dec 2 23:59:46 UTC 201920191202235946
a/hwdata-0.330-noarch-1.txz: Upgraded.
a/lvm2-2.03.07-x86_64-1.txz: Upgraded.
a/tcsh-6.22.01-x86_64-1.txz: Upgraded.
d/python-setuptools-42.0.2-x86_64-1.txz: Upgraded.
n/gnutls-3.6.11.1-x86_64-1.txz: Upgraded.
xap/gnuplot-5.2.8-x86_64-1.txz: Upgraded.
xap/mozilla-firefox-68.3.0esr-x86_64-1.txz: Upgraded.
This is a bugfix release.
For more information, see:
https://www.mozilla.org/en-US/firefox/68.3.0/releasenotes/
Diffstat (limited to 'source/xap')
| -rw-r--r-- | source/xap/mozilla-firefox/firefox.node.py.patch | 46 | ||||
| -rwxr-xr-x | source/xap/mozilla-firefox/mozilla-firefox.SlackBuild | 3 |
2 files changed, 0 insertions, 49 deletions
diff --git a/source/xap/mozilla-firefox/firefox.node.py.patch b/source/xap/mozilla-firefox/firefox.node.py.patch deleted file mode 100644 index 11e2b843..00000000 --- a/source/xap/mozilla-firefox/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-firefox/mozilla-firefox.SlackBuild b/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild index c255012e..363f8786 100755 --- a/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild +++ b/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild @@ -203,9 +203,6 @@ zcat $CWD/ff.ui.scrollToClick.diff.gz | patch -p1 --verbose || exit 1 zcat $CWD/unbreakdocs.diff.gz | patch -p1 --verbose || exit 1 zcat $CWD/firefox-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 - # Fetch localization, if requested # https://bugzilla.mozilla.org/show_bug.cgi?id=1256955 if [ ! -z $MOZLOCALIZE ]; then |