public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

orca: 3.38.2 → 40.0

Browse Source 
Co-Authored-By: Maxine Aubrey <maxeaubrey@gmail.com>
This commit is contained in:
Jan Tojnar 2021-03-21 06:15:42 +01:00
parent cb411dab33
commit b841d1cd50
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
2 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/misc/orca/default.nix
View File

@ -35,13 +35,13 @@
buildPythonApplication rec { buildPythonApplication rec {
pname = "orca"; pname = "orca";
version = "3.38.2"; version = "40.0";
format = "other"; format = "other";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "UAX/LhHdH3E/WswZA6JwEZvFjDD9uMn4K8rHFJfGwjw="; sha256 = "0hq0zdcn80ficpcffbk667907v6m7dih3dhyc7ss01mrj3iyw000";
}; };
patches = [ patches = [

26
pkgs/applications/misc/orca/fix-paths.patch
View File

@ -1,6 +1,8 @@
diff --git a/src/orca/debug.py b/src/orca/debug.py
index e79482ed4..cbf3a24ec 100644
--- a/src/orca/debug.py --- a/src/orca/debug.py
+++ b/src/orca/debug.py +++ b/src/orca/debug.py
@@ -474,7 +474,7 @@ @@ -502,7 +502,7 @@ def traceit(frame, event, arg):
return traceit return traceit
def getOpenFDCount(pid): def getOpenFDCount(pid):
@ -9,7 +11,7 @@
procs = procs.decode('UTF-8').split('\n') procs = procs.decode('UTF-8').split('\n')
files = list(filter(lambda s: s and s[0] == 'f' and s[1:].isdigit(), procs)) files = list(filter(lambda s: s and s[0] == 'f' and s[1:].isdigit(), procs))
@@ -482,7 +482,7 @@ @@ -510,7 +510,7 @@ def getOpenFDCount(pid):
def getCmdline(pid): def getCmdline(pid):
try: try:
@ -18,7 +20,7 @@
cmdline = openFile.read() cmdline = openFile.read()
openFile.close() openFile.close()
except: except:
@@ -492,7 +492,7 @@ @@ -520,7 +520,7 @@ def getCmdline(pid):
return cmdline return cmdline
def pidOf(procName): def pidOf(procName):
@ -27,9 +29,11 @@
shell=True, shell=True,
stdout=subprocess.PIPE).stdout stdout=subprocess.PIPE).stdout
pids = openFile.read() pids = openFile.read()
diff --git a/src/orca/orca.py b/src/orca/orca.py
index 2fe0a0bf2..087526556 100644
--- a/src/orca/orca.py --- a/src/orca/orca.py
+++ b/src/orca/orca.py +++ b/src/orca/orca.py
@@ -239,7 +239,7 @@ @@ -285,7 +285,7 @@ def updateKeyMap(keyboardEvent):
def _setXmodmap(xkbmap): def _setXmodmap(xkbmap):
"""Set the keyboard map using xkbcomp.""" """Set the keyboard map using xkbcomp."""
@ -38,7 +42,7 @@
stdin=subprocess.PIPE, stdout=None, stderr=None) stdin=subprocess.PIPE, stdout=None, stderr=None)
p.communicate(xkbmap) p.communicate(xkbmap)
@@ -297,7 +297,7 @@ @@ -363,7 +363,7 @@ def _storeXmodmap(keyList):
""" """
global _originalXmodmap global _originalXmodmap
@ -47,7 +51,7 @@
def _restoreXmodmap(keyList=[]): def _restoreXmodmap(keyList=[]):
"""Restore the original xmodmap values for the keys in keyList. """Restore the original xmodmap values for the keys in keyList.
@@ -309,7 +309,7 @@ @@ -375,7 +375,7 @@ def _restoreXmodmap(keyList=[]):
global _capsLockCleared global _capsLockCleared
_capsLockCleared = False _capsLockCleared = False
@ -56,9 +60,11 @@
stdin=subprocess.PIPE, stdout=None, stderr=None) stdin=subprocess.PIPE, stdout=None, stderr=None)
p.communicate(_originalXmodmap) p.communicate(_originalXmodmap)
diff --git a/src/orca/orca_bin.py.in b/src/orca/orca_bin.py.in
index 8c9d40153..eec0d5437 100644
--- a/src/orca/orca_bin.py.in --- a/src/orca/orca_bin.py.in
+++ b/src/orca/orca_bin.py.in +++ b/src/orca/orca_bin.py.in
@@ -59,7 +59,7 @@ @@ -62,7 +62,7 @@ class ListApps(argparse.Action):
name = "[DEAD]" name = "[DEAD]"
try: try:
@ -67,12 +73,12 @@
except: except:
cmdline = '(exception encountered)' cmdline = '(exception encountered)'
else: else:
@@ -192,7 +192,7 @@ @@ -197,7 +197,7 @@ def inGraphicalDesktop():
def otherOrcas(): def otherOrcas():
"""Returns the pid of any other instances of Orca owned by this user.""" """Returns the pid of any other instances of Orca owned by this user."""
- openFile = subprocess.Popen('pgrep -u %s orca' % os.getuid(), - openFile = subprocess.Popen('pgrep -u %s -x orca' % os.getuid(),
+ openFile = subprocess.Popen('@pgrep@ -u %s orca' % os.getuid(), + openFile = subprocess.Popen('@pgrep@ -u %s -x orca' % os.getuid(),
shell=True, shell=True,
stdout=subprocess.PIPE).stdout stdout=subprocess.PIPE).stdout
pids = openFile.read() pids = openFile.read()