d052d2659a
https://gitlab.gnome.org/GNOME/orca/-/compare/ORCA_45_ALPHA...ORCA_45_BETA2 There is a PSA in the news, but we should be using cpython 0.29 to build *brltty* and I don't aware of crash here. https://discourse.gnome.org/t/psa-for-distros-brltty-should-be-built-using-cython-0-29-x-not-cython-3 Rebased our patch another time due to the f-string migration. Changelog-reviewed-by: Bobby Rong <rjl931189261@126.com> Changelog-reviewed-by: Jan Tojnar <jtojnar@gmail.com>
89 lines
3.4 KiB
Diff
89 lines
3.4 KiB
Diff
diff --git a/src/orca/debug.py b/src/orca/debug.py
|
|
index b7e11ea60..9ab996765 100644
|
|
--- a/src/orca/debug.py
|
|
+++ b/src/orca/debug.py
|
|
@@ -447,7 +447,7 @@ def traceit(frame, event, arg):
|
|
return traceit
|
|
|
|
def getOpenFDCount(pid):
|
|
- procs = subprocess.check_output([ 'lsof', '-w', '-Ff', '-p', str(pid)])
|
|
+ procs = subprocess.check_output([ '@lsof@', '-w', '-Ff', '-p', str(pid)])
|
|
procs = procs.decode('UTF-8').split('\n')
|
|
files = list(filter(lambda s: s and s[0] == 'f' and s[1:].isdigit(), procs))
|
|
|
|
@@ -465,7 +465,7 @@ def getCmdline(pid):
|
|
return cmdline
|
|
|
|
def pidOf(procName):
|
|
- openFile = subprocess.Popen(f'pgrep {procName}',
|
|
+ openFile = subprocess.Popen(f'@pgrep@ {procName}',
|
|
shell=True,
|
|
stdout=subprocess.PIPE).stdout
|
|
pids = openFile.read()
|
|
diff --git a/src/orca/orca.py b/src/orca/orca.py
|
|
index d4e89f918..bb3e6cc1d 100644
|
|
--- a/src/orca/orca.py
|
|
+++ b/src/orca/orca.py
|
|
@@ -312,7 +312,7 @@ def updateKeyMap(keyboardEvent):
|
|
|
|
def _setXmodmap(xkbmap):
|
|
"""Set the keyboard map using xkbcomp."""
|
|
- p = subprocess.Popen(['xkbcomp', '-w0', '-', os.environ['DISPLAY']],
|
|
+ p = subprocess.Popen(['@xkbcomp@', '-w0', '-', os.environ['DISPLAY']],
|
|
stdin=subprocess.PIPE, stdout=None, stderr=None)
|
|
p.communicate(xkbmap)
|
|
|
|
@@ -389,7 +389,7 @@ def _storeXmodmap(keyList):
|
|
"""
|
|
|
|
global _originalXmodmap
|
|
- _originalXmodmap = subprocess.check_output(['xkbcomp', os.environ['DISPLAY'], '-'])
|
|
+ _originalXmodmap = subprocess.check_output(['@xkbcomp@', os.environ['DISPLAY'], '-'])
|
|
|
|
def _restoreXmodmap(keyList=[]):
|
|
"""Restore the original xmodmap values for the keys in keyList.
|
|
@@ -404,7 +404,7 @@ def _restoreXmodmap(keyList=[]):
|
|
|
|
global _capsLockCleared
|
|
_capsLockCleared = False
|
|
- p = subprocess.Popen(['xkbcomp', '-w0', '-', os.environ['DISPLAY']],
|
|
+ p = subprocess.Popen(['@xkbcomp@', '-w0', '-', os.environ['DISPLAY']],
|
|
stdin=subprocess.PIPE, stdout=None, stderr=None)
|
|
p.communicate(_originalXmodmap)
|
|
|
|
diff --git a/src/orca/orca_bin.py.in b/src/orca/orca_bin.py.in
|
|
index 9d64af948..ca9c9e083 100644
|
|
--- a/src/orca/orca_bin.py.in
|
|
+++ b/src/orca/orca_bin.py.in
|
|
@@ -65,7 +65,7 @@ class ListApps(argparse.Action):
|
|
name = "[DEAD]"
|
|
|
|
try:
|
|
- cmdline = subprocess.getoutput('cat /proc/%s/cmdline' % pid)
|
|
+ cmdline = subprocess.getoutput('@cat@ /proc/%s/cmdline' % pid)
|
|
except Exception:
|
|
cmdline = '(exception encountered)'
|
|
else:
|
|
@@ -198,7 +198,7 @@ def inGraphicalDesktop():
|
|
def otherOrcas():
|
|
"""Returns the pid of any other instances of Orca owned by this user."""
|
|
|
|
- openFile = subprocess.Popen('pgrep -u %s -x orca' % os.getuid(),
|
|
+ openFile = subprocess.Popen('@pgrep@ -u %s -x orca' % os.getuid(),
|
|
shell=True,
|
|
stdout=subprocess.PIPE).stdout
|
|
pids = openFile.read()
|
|
diff --git a/src/orca/script_utilities.py b/src/orca/script_utilities.py
|
|
index ed8b155e4..0436cca42 100644
|
|
--- a/src/orca/script_utilities.py
|
|
+++ b/src/orca/script_utilities.py
|
|
@@ -144,7 +144,7 @@ class Utilities:
|
|
return ""
|
|
|
|
try:
|
|
- cmdline = subprocess.getoutput(f"cat /proc/{pid}/cmdline")
|
|
+ cmdline = subprocess.getoutput(f"@cat@ /proc/{pid}/cmdline")
|
|
except Exception:
|
|
return ""
|
|
|