diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2019-11-29 12:45:12 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2019-11-29 12:45:12 +0000 |
| commit | c74866bbb809be5b6e45f651cba80be029a6be0f (patch) | |
| tree | c5253f0733b6aa5ddda13d721c1944b5e97d3377 | |
| parent | 6f8b4678742af0be6209a6b9816e21fcf627fa32 (diff) | |
Notes
| -rw-r--r-- | mail/thunderbird/files/patch-bug1507655 | 29 | ||||
| -rw-r--r-- | www/cliqz/files/patch-bug1507655 | 28 | ||||
| -rw-r--r-- | www/firefox-esr/files/patch-bug1507655 | 29 | ||||
| -rw-r--r-- | www/firefox/files/patch-bug1507655 | 28 |
4 files changed, 0 insertions, 114 deletions
diff --git a/mail/thunderbird/files/patch-bug1507655 b/mail/thunderbird/files/patch-bug1507655 deleted file mode 100644 index e923ec0c08e1..000000000000 --- a/mail/thunderbird/files/patch-bug1507655 +++ /dev/null @@ -1,29 +0,0 @@ -Revert bug 1497976 as close_fds on Python 2 is too slow - -diff --git build/moz.configure/util.configure build/moz.configure/util.configure -index 25862fee7c32..3fc725a5124e 100644 ---- build/moz.configure/util.configure -+++ build/moz.configure/util.configure -@@ -22,7 +22,6 @@ - - # A wrapper to obtain a process' output and return code. - # Returns a tuple (retcode, stdout, stderr). --@imports('os') - @imports(_from='__builtin__', _import='unicode') - @imports('subprocess') - @imports(_from='mozbuild.shellutil', _import='quote') -@@ -45,13 +44,7 @@ - - log.debug('Executing: `%s`', quote(*args)) - proc = subprocess.Popen(args, stdout=subprocess.PIPE, -- stderr=subprocess.PIPE, -- # On Python 2 on Windows, close_fds prevents the -- # process from inheriting stdout/stderr. -- # Elsewhere, it simply prevents it from inheriting -- # extra file descriptors, which is what we want. -- close_fds=os.name != 'nt', -- **kwargs) -+ stderr=subprocess.PIPE, **kwargs) - stdout, stderr = proc.communicate() - return proc.wait(), stdout, stderr - diff --git a/www/cliqz/files/patch-bug1507655 b/www/cliqz/files/patch-bug1507655 deleted file mode 100644 index 037bef281962..000000000000 --- a/www/cliqz/files/patch-bug1507655 +++ /dev/null @@ -1,28 +0,0 @@ -Revert bug 1497976 as close_fds on Python 2 is too slow - -diff --git build/moz.configure/util.configure build/moz.configure/util.configure -index 25862fee7c32..3fc725a5124e 100644 ---- mozilla-release/build/moz.configure/util.configure 2019-11-13 13:22:25 UTC -+++ mozilla-release/build/moz.configure/util.configure -@@ -22,20 +22,13 @@ def configure_error(message): - - # A wrapper to obtain a process' output and return code. - # Returns a tuple (retcode, stdout, stderr). --@imports('os') - @imports('subprocess') - @imports(_from='mozbuild.shellutil', _import='quote') - @imports(_from='mozbuild.util', _import='system_encoding') - def get_cmd_output(*args, **kwargs): - log.debug('Executing: `%s`', quote(*args)) - proc = subprocess.Popen(args, stdout=subprocess.PIPE, -- stderr=subprocess.PIPE, -- # On Python 2 on Windows, close_fds prevents the -- # process from inheriting stdout/stderr. -- # Elsewhere, it simply prevents it from inheriting -- # extra file descriptors, which is what we want. -- close_fds=os.name != 'nt', -- **kwargs) -+ stderr=subprocess.PIPE, **kwargs) - stdout, stderr = proc.communicate() - stdout = stdout.decode(system_encoding, 'replace') - stderr = stderr.decode(system_encoding, 'replace') diff --git a/www/firefox-esr/files/patch-bug1507655 b/www/firefox-esr/files/patch-bug1507655 deleted file mode 100644 index e923ec0c08e1..000000000000 --- a/www/firefox-esr/files/patch-bug1507655 +++ /dev/null @@ -1,29 +0,0 @@ -Revert bug 1497976 as close_fds on Python 2 is too slow - -diff --git build/moz.configure/util.configure build/moz.configure/util.configure -index 25862fee7c32..3fc725a5124e 100644 ---- build/moz.configure/util.configure -+++ build/moz.configure/util.configure -@@ -22,7 +22,6 @@ - - # A wrapper to obtain a process' output and return code. - # Returns a tuple (retcode, stdout, stderr). --@imports('os') - @imports(_from='__builtin__', _import='unicode') - @imports('subprocess') - @imports(_from='mozbuild.shellutil', _import='quote') -@@ -45,13 +44,7 @@ - - log.debug('Executing: `%s`', quote(*args)) - proc = subprocess.Popen(args, stdout=subprocess.PIPE, -- stderr=subprocess.PIPE, -- # On Python 2 on Windows, close_fds prevents the -- # process from inheriting stdout/stderr. -- # Elsewhere, it simply prevents it from inheriting -- # extra file descriptors, which is what we want. -- close_fds=os.name != 'nt', -- **kwargs) -+ stderr=subprocess.PIPE, **kwargs) - stdout, stderr = proc.communicate() - return proc.wait(), stdout, stderr - diff --git a/www/firefox/files/patch-bug1507655 b/www/firefox/files/patch-bug1507655 deleted file mode 100644 index d0095700907b..000000000000 --- a/www/firefox/files/patch-bug1507655 +++ /dev/null @@ -1,28 +0,0 @@ -Revert bug 1497976 as close_fds on Python 2 is too slow - -diff --git build/moz.configure/util.configure build/moz.configure/util.configure -index 25862fee7c32..3fc725a5124e 100644 ---- build/moz.configure/util.configure -+++ build/moz.configure/util.configure -@@ -22,20 +22,13 @@ def configure_error(message): - - # A wrapper to obtain a process' output and return code. - # Returns a tuple (retcode, stdout, stderr). --@imports('os') - @imports('subprocess') - @imports(_from='mozbuild.shellutil', _import='quote') - @imports(_from='mozbuild.util', _import='system_encoding') - def get_cmd_output(*args, **kwargs): - log.debug('Executing: `%s`', quote(*args)) - proc = subprocess.Popen(args, stdout=subprocess.PIPE, -- stderr=subprocess.PIPE, -- # On Python 2 on Windows, close_fds prevents the -- # process from inheriting stdout/stderr. -- # Elsewhere, it simply prevents it from inheriting -- # extra file descriptors, which is what we want. -- close_fds=os.name != 'nt', -- **kwargs) -+ stderr=subprocess.PIPE, **kwargs) - stdout, stderr = proc.communicate() - stdout = stdout.decode(system_encoding, 'replace') - stderr = stderr.decode(system_encoding, 'replace') |