pyrox.dev / nixpkgs
lol
fork atom

orca: 3.38.2 → 40.0

Co-Authored-By: Maxine Aubrey <maxeaubrey@gmail.com>

Jan Tojnar b841d1cd cb411dab

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