Commit 0bf52d79 authored by Bobby Rong's avatar Bobby Rong Committed by Jan Tojnar
Browse files

orca: 44.1 → 45.alpha 

https://github.com/GNOME/orca/compare/ORCA_44_1..ORCA_45_ALPHA



Grepped all "subprocess" usage, I was suprised when I saw even
`cat` was also handled.

Changelog-reviewed-by: default avatarBobby Rong <rjl931189261@126.com>
Changelog-reviewed-by: default avatarJan Tojnar <jtojnar@gmail.com>
parent 541c27ef

pkgs/applications/misc/orca/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -34,13 +34,13 @@ 


buildPythonApplication rec {

  pname = "orca";

  version = "44.1";

  version = "45.alpha";



  format = "other";



  src = fetchurl {

    url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";

    sha256 = "9e1lUdcviXshJI1DMIWnuBesy7ApaoTD6FHZH7Lu5N4=";

    sha256 = "tlosCFKyb8DtqwJVbBIfXI7KFE13WmhoDC3vQWvJFEQ=";

  };



  patches = [

pkgs/applications/misc/orca/fix-paths.patch

+24 −20
Original line number Diff line number Diff line 
diff --git a/src/orca/debug.py b/src/orca/debug.py

index e79482ed4..cbf3a24ec 100644

index 458838b8a..c51d5c18c 100644

--- a/src/orca/debug.py

+++ b/src/orca/debug.py

@@ -502,7 +502,7 @@ def traceit(frame, event, arg):

@@ -440,7 +440,7 @@ def traceit(frame, event, arg):

     return traceit

 

 def getOpenFDCount(pid):
@@ -11,16 +11,7 @@ index e79482ed4..cbf3a24ec 100644 
     procs = procs.decode('UTF-8').split('\n')

     files = list(filter(lambda s: s and s[0] == 'f' and s[1:].isdigit(), procs))

 

@@ -510,7 +510,7 @@ def getOpenFDCount(pid):

 

 def getCmdline(pid):

     try:

-        openFile = os.popen('cat /proc/%s/cmdline' % pid)

+        openFile = os.popen('@cat@ /proc/%s/cmdline' % pid)

         cmdline = openFile.read()

         openFile.close()

     except:

@@ -520,7 +520,7 @@ def getCmdline(pid):

@@ -458,7 +458,7 @@ def getCmdline(pid):

     return cmdline

 

 def pidOf(procName):
@@ -30,10 +21,10 @@ index e79482ed4..cbf3a24ec 100644 
                                 stdout=subprocess.PIPE).stdout

     pids = openFile.read()

diff --git a/src/orca/orca.py b/src/orca/orca.py

index 2fe0a0bf2..087526556 100644

index 0ac486949..42387453c 100644

--- a/src/orca/orca.py

+++ b/src/orca/orca.py

@@ -285,7 +285,7 @@ def updateKeyMap(keyboardEvent):

@@ -304,7 +304,7 @@ def updateKeyMap(keyboardEvent):

 

 def _setXmodmap(xkbmap):

     """Set the keyboard map using xkbcomp."""
@@ -42,7 +33,7 @@ index 2fe0a0bf2..087526556 100644 
         stdin=subprocess.PIPE, stdout=None, stderr=None)

     p.communicate(xkbmap)

 

@@ -363,7 +363,7 @@ def _storeXmodmap(keyList):

@@ -381,7 +381,7 @@ def _storeXmodmap(keyList):

     """

 

     global _originalXmodmap
@@ -51,7 +42,7 @@ index 2fe0a0bf2..087526556 100644 
 

 def _restoreXmodmap(keyList=[]):

     """Restore the original xmodmap values for the keys in keyList.

@@ -375,7 +375,7 @@ def _restoreXmodmap(keyList=[]):

@@ -396,7 +396,7 @@ def _restoreXmodmap(keyList=[]):

 

     global _capsLockCleared

     _capsLockCleared = False
@@ -61,19 +52,19 @@ index 2fe0a0bf2..087526556 100644 
     p.communicate(_originalXmodmap)

 

diff --git a/src/orca/orca_bin.py.in b/src/orca/orca_bin.py.in

index 8c9d40153..eec0d5437 100644

index 9d64af948..ca9c9e083 100644

--- a/src/orca/orca_bin.py.in

+++ b/src/orca/orca_bin.py.in

@@ -62,7 +62,7 @@ class ListApps(argparse.Action):

@@ -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:

             except Exception:

                 cmdline = '(exception encountered)'

             else:

@@ -197,7 +197,7 @@ def inGraphicalDesktop():

@@ -198,7 +198,7 @@ def inGraphicalDesktop():

 def otherOrcas():

     """Returns the pid of any other instances of Orca owned by this user."""
@@ -82,3 +73,16 @@ index 8c9d40153..eec0d5437 100644 
                                 shell=True,

                                 stdout=subprocess.PIPE).stdout

     pids = openFile.read()

diff --git a/src/orca/script_utilities.py b/src/orca/script_utilities.py

index 87ee7de52..8d5072df8 100644

--- a/src/orca/script_utilities.py

+++ b/src/orca/script_utilities.py

@@ -144,7 +144,7 @@ class Utilities:

             return ""

 

         try:

-            cmdline = subprocess.getoutput("cat /proc/%s/cmdline" % pid)

+            cmdline = subprocess.getoutput("@cat@ /proc/%s/cmdline" % pid)

         except Exception:

             return ""