diff --git a/pkgs/by-name/or/orca/fix-paths.patch b/pkgs/by-name/or/orca/fix-paths.patch index 5f5feacb33a5..8f713de296d6 100644 --- a/pkgs/by-name/or/orca/fix-paths.patch +++ b/pkgs/by-name/or/orca/fix-paths.patch @@ -1,8 +1,8 @@ diff --git a/src/orca/debug.py b/src/orca/debug.py -index eb939a236..4e4db2e84 100644 +index e17e2333e..595c8489d 100644 --- a/src/orca/debug.py +++ b/src/orca/debug.py -@@ -522,7 +522,7 @@ def traceit(frame, event, arg): +@@ -529,7 +529,7 @@ def traceit(frame, event, arg): return traceit def getOpenFDCount(pid): @@ -11,7 +11,7 @@ index eb939a236..4e4db2e84 100644 procs = procs.decode('UTF-8').split('\n') files = list(filter(lambda s: s and s[0] == 'f' and s[1:].isdigit(), procs)) -@@ -540,7 +540,7 @@ def getCmdline(pid): +@@ -547,7 +547,7 @@ def getCmdline(pid): return cmdline def pidOf(procName): @@ -21,10 +21,10 @@ index eb939a236..4e4db2e84 100644 stdout=subprocess.PIPE).stdout pids = openFile.read() diff --git a/src/orca/orca_bin.py.in b/src/orca/orca_bin.py.in -index c6f99de14..2370204f3 100755 +index c3b23dec2..320597ae6 100755 --- a/src/orca/orca_bin.py.in +++ b/src/orca/orca_bin.py.in -@@ -62,7 +62,7 @@ class ListApps(argparse.Action): +@@ -63,7 +63,7 @@ class ListApps(argparse.Action): name = "[DEAD]" try: @@ -33,7 +33,7 @@ index c6f99de14..2370204f3 100755 except Exception: cmdline = '(exception encountered)' else: -@@ -195,7 +195,7 @@ def inGraphicalDesktop(): +@@ -199,7 +199,7 @@ def inGraphicalDesktop(): def otherOrcas(): """Returns the pid of any other instances of Orca owned by this user.""" @@ -43,19 +43,19 @@ index c6f99de14..2370204f3 100755 stdout=subprocess.PIPE).stdout pids = openFile.read() diff --git a/src/orca/orca_modifier_manager.py b/src/orca/orca_modifier_manager.py -index c45cd4a5b..3f2ec59f0 100644 +index 48c0dead5..8a4a04e74 100644 --- a/src/orca/orca_modifier_manager.py +++ b/src/orca/orca_modifier_manager.py -@@ -115,7 +115,7 @@ class OrcaModifierManager: +@@ -200,7 +200,7 @@ class OrcaModifierManager: debug.printMessage(debug.LEVEL_INFO, msg, True) self.unset_orca_modifiers(reason) -- self._original_xmodmap = subprocess.check_output(['xkbcomp', os.environ['DISPLAY'], '-']) -+ self._original_xmodmap = subprocess.check_output(['@xkbcomp@', os.environ['DISPLAY'], '-']) +- p = subprocess.Popen(['xkbcomp', os.environ['DISPLAY'], '-'], ++ p = subprocess.Popen(['@xkbcomp@', os.environ['DISPLAY'], '-'], + stdout=subprocess.PIPE, stderr=subprocess.DEVNULL) + self._original_xmodmap, _ = p.communicate() self._create_orca_xmodmap() - - def update_key_map(self, keyboard_event): -@@ -162,7 +162,7 @@ class OrcaModifierManager: +@@ -232,7 +232,7 @@ class OrcaModifierManager: return self._caps_lock_cleared = False @@ -64,7 +64,7 @@ index c45cd4a5b..3f2ec59f0 100644 stdin=subprocess.PIPE, stdout=None, stderr=None) p.communicate(self._original_xmodmap) -@@ -223,7 +223,7 @@ class OrcaModifierManager: +@@ -293,7 +293,7 @@ class OrcaModifierManager: if modified: msg = "ORCA MODIFIER MANAGER: Updating xmodmap" debug.printMessage(debug.LEVEL_INFO, msg, True) diff --git a/pkgs/by-name/or/orca/package.nix b/pkgs/by-name/or/orca/package.nix index 98eb95ed317f..797f0c546449 100644 --- a/pkgs/by-name/or/orca/package.nix +++ b/pkgs/by-name/or/orca/package.nix @@ -28,13 +28,13 @@ python3.pkgs.buildPythonApplication rec { pname = "orca"; - version = "47.alpha"; + version = "47.0"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-abZK6s8SihncVO/VpC5geBAC3cDNqTjmIB/C4W0SRos="; + hash = "sha256-/B8wRN/iqfQgoCZJPoAOTGNMrIFM/UfuF/vP+GqyT/Q="; }; patches = [