pyrox.dev
orca: 3.38.2 → 40.0
Co-Authored-By: Maxine Aubrey <maxeaubrey@gmail.com>
+3
-3
pkgs/applications/misc/orca/default.nix
+3
-3
pkgs/applications/misc/orca/default.nix
···
35
35
36
36
buildPythonApplication rec {
37
37
pname = "orca";
38
-
version = "3.38.2";
38
+
version = "40.0";
39
39
40
40
format = "other";
41
41
42
42
src = fetchurl {
43
-
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
44
-
sha256 = "UAX/LhHdH3E/WswZA6JwEZvFjDD9uMn4K8rHFJfGwjw=";
43
+
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
44
+
sha256 = "0hq0zdcn80ficpcffbk667907v6m7dih3dhyc7ss01mrj3iyw000";
45
45
};
46
46
47
47
patches = [
+16
-10
pkgs/applications/misc/orca/fix-paths.patch
+16
-10
pkgs/applications/misc/orca/fix-paths.patch
···
1
+
diff --git a/src/orca/debug.py b/src/orca/debug.py
2
+
index e79482ed4..cbf3a24ec 100644
1
3
--- a/src/orca/debug.py
2
4
+++ b/src/orca/debug.py
3
-
@@ -474,7 +474,7 @@
5
+
@@ -502,7 +502,7 @@ def traceit(frame, event, arg):
4
6
return traceit
5
7
6
8
def getOpenFDCount(pid):
···
9
11
procs = procs.decode('UTF-8').split('\n')
10
12
files = list(filter(lambda s: s and s[0] == 'f' and s[1:].isdigit(), procs))
11
13
12
-
@@ -482,7 +482,7 @@
14
+
@@ -510,7 +510,7 @@ def getOpenFDCount(pid):
13
15
14
16
def getCmdline(pid):
15
17
try:
···
18
20
cmdline = openFile.read()
19
21
openFile.close()
20
22
except:
21
-
@@ -492,7 +492,7 @@
23
+
@@ -520,7 +520,7 @@ def getCmdline(pid):
22
24
return cmdline
23
25
24
26
def pidOf(procName):
···
27
29
shell=True,
28
30
stdout=subprocess.PIPE).stdout
29
31
pids = openFile.read()
32
+
diff --git a/src/orca/orca.py b/src/orca/orca.py
33
+
index 2fe0a0bf2..087526556 100644
30
34
--- a/src/orca/orca.py
31
35
+++ b/src/orca/orca.py
32
-
@@ -239,7 +239,7 @@
36
+
@@ -285,7 +285,7 @@ def updateKeyMap(keyboardEvent):
33
37
34
38
def _setXmodmap(xkbmap):
35
39
"""Set the keyboard map using xkbcomp."""
···
38
42
stdin=subprocess.PIPE, stdout=None, stderr=None)
39
43
p.communicate(xkbmap)
40
44
41
-
@@ -297,7 +297,7 @@
45
+
@@ -363,7 +363,7 @@ def _storeXmodmap(keyList):
42
46
"""
43
47
44
48
global _originalXmodmap
···
47
51
48
52
def _restoreXmodmap(keyList=[]):
49
53
"""Restore the original xmodmap values for the keys in keyList.
50
-
@@ -309,7 +309,7 @@
54
+
@@ -375,7 +375,7 @@ def _restoreXmodmap(keyList=[]):
51
55
52
56
global _capsLockCleared
53
57
_capsLockCleared = False
···
56
60
stdin=subprocess.PIPE, stdout=None, stderr=None)
57
61
p.communicate(_originalXmodmap)
58
62
63
+
diff --git a/src/orca/orca_bin.py.in b/src/orca/orca_bin.py.in
64
+
index 8c9d40153..eec0d5437 100644
59
65
--- a/src/orca/orca_bin.py.in
60
66
+++ b/src/orca/orca_bin.py.in
61
-
@@ -59,7 +59,7 @@
67
+
@@ -62,7 +62,7 @@ class ListApps(argparse.Action):
62
68
name = "[DEAD]"
63
69
64
70
try:
···
67
73
except:
68
74
cmdline = '(exception encountered)'
69
75
else:
70
-
@@ -192,7 +192,7 @@
76
+
@@ -197,7 +197,7 @@ def inGraphicalDesktop():
71
77
def otherOrcas():
72
78
"""Returns the pid of any other instances of Orca owned by this user."""
73
79
74
-
- openFile = subprocess.Popen('pgrep -u %s orca' % os.getuid(),
75
-
+ openFile = subprocess.Popen('@pgrep@ -u %s orca' % os.getuid(),
80
+
- openFile = subprocess.Popen('pgrep -u %s -x orca' % os.getuid(),
81
+
+ openFile = subprocess.Popen('@pgrep@ -u %s -x orca' % os.getuid(),
76
82
shell=True,
77
83
stdout=subprocess.PIPE).stdout
78
84
pids = openFile.read()