r52375 - /desktop/unstable/gnome-orca/debian/patches/
elbrus at users.alioth.debian.org
elbrus at users.alioth.debian.org
Wed May 3 18:29:19 UTC 2017
Author: elbrus
Date: Wed May 3 18:29:19 2017
New Revision: 52375
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=52375
Log:
Add upstream patches to prevent Synaptic to from blocking Orca
Closes: #859262
Added:
desktop/unstable/gnome-orca/debian/patches/0001-Add-check-for-dead-accessibles-before-attempting-to-.patch
desktop/unstable/gnome-orca/debian/patches/0001-Handle-another-Atspi-The-process-appears-to-be-hung-.patch
desktop/unstable/gnome-orca/debian/patches/0001-Handle-yet-another-Atspi-The-process-appears-to-be-h.patch
desktop/unstable/gnome-orca/debian/patches/0001-Return-immediately-in-isLayoutOnly-if-obj-is-dead.patch
Modified:
desktop/unstable/gnome-orca/debian/patches/series
Added: desktop/unstable/gnome-orca/debian/patches/0001-Add-check-for-dead-accessibles-before-attempting-to-.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-orca/debian/patches/0001-Add-check-for-dead-accessibles-before-attempting-to-.patch?rev=52375&op=file
==============================================================================
--- desktop/unstable/gnome-orca/debian/patches/0001-Add-check-for-dead-accessibles-before-attempting-to-.patch (added)
+++ desktop/unstable/gnome-orca/debian/patches/0001-Add-check-for-dead-accessibles-before-attempting-to-.patch [utf-8] Wed May 3 18:29:19 2017
@@ -0,0 +1,27 @@
+From 382c5408afc7dd25f9b477a5e30c50ba917155c0 Mon Sep 17 00:00:00 2001
+From: Joanmarie Diggs <jdiggs at igalia.com>
+Date: Sat, 29 Apr 2017 11:28:17 -0400
+Subject: [PATCH] Add check for dead accessibles before attempting to generate
+ presentation
+
+---
+ src/orca/generator.py | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+Index: gnome-orca/src/orca/generator.py
+===================================================================
+--- gnome-orca.orig/src/orca/generator.py
++++ gnome-orca/src/orca/generator.py
+@@ -178,6 +178,12 @@ class Generator:
+ - forceTutorial: boolean (default=False) which says if we
+ should force a tutorial to be spoken or not
+ """
++
++ if self._script.utilities.isDead(obj):
++ msg = 'ERROR: Cannot generate presentation dead obj'
++ debug.println(debug.LEVEL_INFO, msg, True)
++ return []
++
+ startTime = time.time()
+ result = []
+ globalsDict = {}
Added: desktop/unstable/gnome-orca/debian/patches/0001-Handle-another-Atspi-The-process-appears-to-be-hung-.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-orca/debian/patches/0001-Handle-another-Atspi-The-process-appears-to-be-hung-.patch?rev=52375&op=file
==============================================================================
--- desktop/unstable/gnome-orca/debian/patches/0001-Handle-another-Atspi-The-process-appears-to-be-hung-.patch (added)
+++ desktop/unstable/gnome-orca/debian/patches/0001-Handle-another-Atspi-The-process-appears-to-be-hung-.patch [utf-8] Wed May 3 18:29:19 2017
@@ -0,0 +1,47 @@
+From d51f87a7f000d099da98247dc7ca337b2b5483be Mon Sep 17 00:00:00 2001
+From: Joanmarie Diggs <jdiggs at igalia.com>
+Date: Fri, 28 Apr 2017 15:35:39 -0400
+Subject: [PATCH] Handle another Atspi "The process appears to be hung"
+ exception
+
+---
+ src/orca/scripts/default.py | 18 +++++++++++++++---
+ 1 file changed, 15 insertions(+), 3 deletions(-)
+
+Index: gnome-orca/src/orca/scripts/default.py
+===================================================================
+--- gnome-orca.orig/src/orca/scripts/default.py
++++ gnome-orca/src/orca/scripts/default.py
+@@ -2652,9 +2652,21 @@ class Script(script.Script):
+
+ obj = event.source
+ role = obj.getRole()
+- value = obj.queryValue()
++
++ try:
++ value = obj.queryValue()
++ currentValue = value.currentValue
++ except NotImplementedError:
++ msg = "ERROR: %s doesn't implement AtspiValue" % obj
++ debug.println(debug.LEVEL_INFO, msg, True)
++ return
++ except:
++ msg = "ERROR: Exception getting current value for %s" % obj
++ debug.println(debug.LEVEL_INFO, msg, True)
++ return
++
+ if "oldValue" in self.pointOfReference \
+- and (value.currentValue == self.pointOfReference["oldValue"]):
++ and (currentValue == self.pointOfReference["oldValue"]):
+ return
+
+ isProgressBarUpdate, msg = self.utilities.isProgressBarUpdate(obj, event)
+@@ -2666,7 +2678,7 @@ class Script(script.Script):
+ debug.println(debug.LEVEL_INFO, msg, True)
+ return
+
+- self.pointOfReference["oldValue"] = value.currentValue
++ self.pointOfReference["oldValue"] = currentValue
+ self.updateBraille(obj, isProgressBarUpdate=isProgressBarUpdate)
+ speech.speak(self.speechGenerator.generateSpeech(
+ obj, alreadyFocused=True, isProgressBarUpdate=isProgressBarUpdate))
Added: desktop/unstable/gnome-orca/debian/patches/0001-Handle-yet-another-Atspi-The-process-appears-to-be-h.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-orca/debian/patches/0001-Handle-yet-another-Atspi-The-process-appears-to-be-h.patch?rev=52375&op=file
==============================================================================
--- desktop/unstable/gnome-orca/debian/patches/0001-Handle-yet-another-Atspi-The-process-appears-to-be-h.patch (added)
+++ desktop/unstable/gnome-orca/debian/patches/0001-Handle-yet-another-Atspi-The-process-appears-to-be-h.patch [utf-8] Wed May 3 18:29:19 2017
@@ -0,0 +1,23 @@
+From ea02cc2d268348c22ffe8c23099f6b023d4c90a7 Mon Sep 17 00:00:00 2001
+From: Joanmarie Diggs <jdiggs at igalia.com>
+Date: Sat, 29 Apr 2017 11:38:17 -0400
+Subject: [PATCH] Handle yet another Atspi "The process appears to be hung"
+ exception
+
+---
+ src/orca/script_utilities.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: gnome-orca/src/orca/script_utilities.py
+===================================================================
+--- gnome-orca.orig/src/orca/script_utilities.py
++++ gnome-orca/src/orca/script_utilities.py
+@@ -3503,7 +3503,7 @@ class Utilities:
+ return obj.getRole() not in roles
+
+ def _treatAsLeafNode(self, obj):
+- if not obj:
++ if not obj or self.isDead(obj):
+ return False
+
+ if not obj.childCount:
Added: desktop/unstable/gnome-orca/debian/patches/0001-Return-immediately-in-isLayoutOnly-if-obj-is-dead.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-orca/debian/patches/0001-Return-immediately-in-isLayoutOnly-if-obj-is-dead.patch?rev=52375&op=file
==============================================================================
--- desktop/unstable/gnome-orca/debian/patches/0001-Return-immediately-in-isLayoutOnly-if-obj-is-dead.patch (added)
+++ desktop/unstable/gnome-orca/debian/patches/0001-Return-immediately-in-isLayoutOnly-if-obj-is-dead.patch [utf-8] Wed May 3 18:29:19 2017
@@ -0,0 +1,22 @@
+From edbfafbd89409bfb1e4a4e3a9339c0b2de7435d6 Mon Sep 17 00:00:00 2001
+From: Joanmarie Diggs <jdiggs at igalia.com>
+Date: Thu, 27 Apr 2017 06:35:11 -0400
+Subject: [PATCH] Return immediately in isLayoutOnly() if obj is dead
+
+---
+ src/orca/script_utilities.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: gnome-orca/src/orca/script_utilities.py
+===================================================================
+--- gnome-orca.orig/src/orca/script_utilities.py
++++ gnome-orca/src/orca/script_utilities.py
+@@ -1124,7 +1124,7 @@ class Utilities:
+
+ layoutOnly = False
+
+- if obj and self.isZombie(obj):
++ if self.isDead(obj) or self.isZombie(obj):
+ return True
+
+ try:
Modified: desktop/unstable/gnome-orca/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-orca/debian/patches/series?rev=52375&op=diff
==============================================================================
--- desktop/unstable/gnome-orca/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gnome-orca/debian/patches/series [utf-8] Wed May 3 18:29:19 2017
@@ -1 +1,5 @@
git-0da4c2ed3d4dedb2229e542ff47257f1d2ab1a50
+0001-Return-immediately-in-isLayoutOnly-if-obj-is-dead.patch
+0001-Handle-another-Atspi-The-process-appears-to-be-hung-.patch
+0001-Add-check-for-dead-accessibles-before-attempting-to-.patch
+0001-Handle-yet-another-Atspi-The-process-appears-to-be-h.patch
More information about the pkg-gnome-commits
mailing list