diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2020-09-15 18:51:00 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2020-09-16 08:59:54 +0200 |
commit | b474b008f215dc3bcd1ed3fc164e47f606d783d5 (patch) | |
tree | 5849f269f652248ce4e65823d39f27f1f8c89e9d /source/l/mozjs68/patches/jstests_python-3.patch | |
parent | 4667441615bc9dd8d3aa4b11e0da0a1081eb3386 (diff) | |
download | current-b474b008f215dc3bcd1ed3fc164e47f606d783d5.tar.gz current-b474b008f215dc3bcd1ed3fc164e47f606d783d5.tar.xz |
Tue Sep 15 18:51:00 UTC 202020200915185100
a/libgudev-234-x86_64-1.txz: Upgraded.
ap/htop-3.0.2-x86_64-1.txz: Upgraded.
l/glib2-2.66.0-x86_64-2.txz: Rebuilt.
Build against system gtk-doc and don't bundle a newer version. You'll need
to reinstall the linuxdoc-tools package to restore the correct version of
gtk-doc. Thanks to chrisVV.
l/mozjs68-68.11.0esr-x86_64-2.txz: Removed.
l/mozjs78-78.2.0esr-x86_64-1.txz: Added.
This is needed by the new version of polkit.
l/polkit-0.118-x86_64-1.txz: Upgraded.
This requires the new mozjs78 package.
x/libva-2.9.0-x86_64-1.txz: Upgraded.
x/libva-utils-2.9.0-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/l/mozjs68/patches/jstests_python-3.patch')
-rw-r--r-- | source/l/mozjs68/patches/jstests_python-3.patch | 57 |
1 files changed, 0 insertions, 57 deletions
diff --git a/source/l/mozjs68/patches/jstests_python-3.patch b/source/l/mozjs68/patches/jstests_python-3.patch deleted file mode 100644 index 484a02c68..000000000 --- a/source/l/mozjs68/patches/jstests_python-3.patch +++ /dev/null @@ -1,57 +0,0 @@ -From e75a1c531767f3efd158fd8309084cf5157307be Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk@redhat.com> -Date: Tue, 5 Nov 2019 19:14:38 +0100 -Subject: [PATCH] Python 3 - ---- - js/src/jit-test/jit_test.py | 2 +- - js/src/tests/lib/manifest.py | 5 ++++- - js/src/tests/lib/tasks_unix.py | 3 +++ - 3 files changed, 8 insertions(+), 2 deletions(-) - -diff --git a/js/src/jit-test/jit_test.py b/js/src/jit-test/jit_test.py -index 8fcd0c5..f51c544 100755 ---- a/js/src/jit-test/jit_test.py -+++ b/js/src/jit-test/jit_test.py -@@ -138,7 +138,7 @@ def main(argv): - help='With --write-failures=FILE, additionally write the' - ' output of failed tests to [FILE]') - op.add_option('--jitflags', dest='jitflags', default='none', -- choices=valid_jitflags(), -+ choices=list(valid_jitflags()), - help='IonMonkey option combinations. One of %s.' % ', '.join(valid_jitflags())) - op.add_option('--ion', dest='jitflags', action='store_const', const='ion', - help='Run tests once with --ion-eager and once with' -diff --git a/js/src/tests/lib/manifest.py b/js/src/tests/lib/manifest.py -index 617f0f1..f54cc1e 100644 ---- a/js/src/tests/lib/manifest.py -+++ b/js/src/tests/lib/manifest.py -@@ -105,7 +105,10 @@ class XULInfoTester: - '-e', self.js_prologue, - '-e', 'print(!!({}))'.format(cond) - ] -- p = Popen(cmd, stdin=PIPE, stdout=PIPE, stderr=PIPE) -+ try: -+ p = Popen(cmd, stdin=PIPE, stdout=PIPE, stderr=PIPE, encoding="utf-8") -+ except TypeError: -+ p = Popen(cmd, stdin=PIPE, stdout=PIPE, stderr=PIPE) - out, err = p.communicate() - if out in ('true\n', 'true\r\n'): - ans = True -diff --git a/js/src/tests/lib/tasks_unix.py b/js/src/tests/lib/tasks_unix.py -index 40528b8..5edfe92 100644 ---- a/js/src/tests/lib/tasks_unix.py -+++ b/js/src/tests/lib/tasks_unix.py -@@ -182,6 +182,9 @@ def reap_zombies(tasks, timeout): - if os.WIFSIGNALED(status): - returncode = -os.WTERMSIG(status) - -+ ended.out=[x.decode('utf-8') for x in ended.out] -+ ended.err=[x.decode('utf-8') for x in ended.err] -+ - finished.append( - TestOutput( - ended.test, --- -2.23.0 - |