Accepting request 62413 from GNOME:Factory

Accepted submit request 62413 from user vuntz

OBS-URL: https://build.opensuse.org/request/show/62413
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/orca?expand=0&rev=63

orca-2.32.1-console-setup.patch

@@ -0,0 +1,39 @@
+Index: src/orca/orca_console_prefs.py
+===================================================================
+--- src/orca/orca_console_prefs.py.orig
++++ src/orca/orca_console_prefs.py
+@@ -460,7 +460,7 @@ def setupSpeech(prefsDict):
+     # layouts for how they might control Orca.
+     #
+     sayAndPrint(_("Select desired keyboard layout."),
+-                False,
++                True,
+                 False,
+                 speechServerChoice,
+                 speechVoiceChoice)
+@@ -576,7 +576,7 @@ def showPreferencesUI(commandLineSetting
+                              speechServerChoice,
+                              speechVoiceChoice)
+         try:
+-            settings.setOrcaAutostart(checkYes(answer))
++            autostart = checkYes(answer)
+             break
+         except:
+             stop = False
+@@ -613,6 +613,7 @@ def showPreferencesUI(commandLineSetting
+                                     speechServerChoice,
+                                     speechVoiceChoice)
+                         time.sleep(2)
++                        settings.setOrcaAutostart(autostart)
+ 
+                         import gobject
+                         gobject.threads_init()
+@@ -633,6 +634,8 @@ def showPreferencesUI(commandLineSetting
+                          speechServerChoice,
+                          speechVoiceChoice)
+ 
++    settings.setOrcaAutostart(autostart)
++
+     for [factory, servers] in workingFactories:
+         factory.SpeechServer.shutdownActiveServers()
+ 

orca.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Feb 18 23:33:35 UTC 2011 - mgorse@novell.com
+
+- Add orca-2.32.1-console-setup.patch: fix setting of autostart and
+  keyboard prompt in console setup (bgo#642212).
+
 -------------------------------------------------------------------
 Mon Feb 14 19:49:23 CET 2011 - sbrabec@suse.cz
 

orca.spec

@@ -25,6 +25,8 @@ Summary:        Screen reader for GNOME
 Url:            http://www.gnome.org/
 Group:          System/GUI/GNOME
 Source:         %{name}-%{version}.tar.bz2
+# PATCH-FIX-UPSTREAM orca-2.32.1-console-setup.patch bgo#642212 mgorse@novell.com -- Fix setting of autostart and keyboard prompt in console setup; accepted upstream already
+Patch0:         orca-2.32.1-console-setup.patch
 BuildRequires:  at-spi-devel
 BuildRequires:  dbus-1-python-devel
 BuildRequires:  fdupes
@@ -73,6 +75,7 @@ combinations of speech, braille, and/or magnification.
 %lang_package
 %prep
 %setup -q
+%patch0
 translation-update-upstream
 
 %build