[orca/introspection] Updating README, configure.ac, and orca.in

[Joanmarie Diggs <joanied src gnome org>]

commit bf5bc5b6e27f9ec4c1bb60f88e44b5ed0222a68b
Author: Joanmarie Diggs <joanmarie diggs gmail com>
Date:   Mon Aug 29 01:11:02 2011 -0400

    Updating README, configure.ac, and orca.in
    
    * README and configure.ac to reflect dependencies for pygi and gtk+ 3
    * orca.in because there's no gnome-mag processes to kill in GNOME 3.x

 README           |    4 ++--
 configure.ac     |   27 ++++++++-------------------
 src/orca/orca.in |    2 +-
 3 files changed, 11 insertions(+), 22 deletions(-)
---
diff --git a/README b/README
index a92a907..fa601cb 100644
--- a/README
+++ b/README
@@ -31,8 +31,8 @@ Building Orca also requires the development modules for the following
 to be installed:
 
 * Python           - Python platform
-* pygtk            - GTK+ Python bindings
-* pygobject        - Python bindings for the GObject library
+* pygobject-3.0    - Python bindings for the GObject library
+* gtk+-3.0         - Gtk+ toolkit
 * json-py          - a JSON (http://json.org) reader and writer in Python
 * pyxdg            - Python library to access freedesktop.org standards
 * python-speechd   - Python bindings for Speech Dispatcher (optional)
diff --git a/configure.ac b/configure.ac
index 810b8fb..ced3169 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,9 @@ m4_define([orca_micro_version], [90pre])
 m4_define([orca_version],
           [orca_major_version.orca_minor_version.orca_micro_version])
 
-m4_define(pygobject_required_version, 2.90.1)
+m4_define(gtk_required_version, 3.1.13)
+m4_define(pygobject_required_version, 2.90.3)
+m4_define(atspi_required_version, 2.1.5)
 
 AC_INIT([orca],
         [orca_version],
@@ -28,35 +30,22 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [gettext package])
 
 GNOME_DOC_INIT([0.17.3])
 
-PKG_CHECK_MODULES(PYGOBJECT, pygobject-2.0 >= pygobject_required_version)
+PKG_CHECK_MODULES([GTK], [gtk+-3.0 >= gtk_required_version])
+PKG_CHECK_MODULES([PYGOBJECT], [pygobject-3.0 >= pygobject_required_version])
+PKG_CHECK_MODULES([ATSPI2], [atspi-2 >= atspi_required_version])
 
 dnl Needed programs
 AC_PROG_INSTALL
 
-# WDW - I give up. No matter what I do, I seem to find a package that
-# is specified somewhere, but the packaging is not honored by various
-# distributions.
-#
-#dnl Check for various modules. NOTE: On OpenSolaris, you may
-#dnl need to set PKG_CONFIG_PATH=/usr/lib/pkgconfig in order
-#dnl for these to be found.
-#PKG_CHECK_MODULES(orca, \
-#	dbus-python >= 0.83.0 \
-#	gnome-python-desktop-2.0 >= 2.24.0 \
-#	libspi-1.0 >= 1.24.0 \
-#)
-
 dnl Check for python and python modules needed by Orca
 dnl TODO: check for incompatibilities between Orca and liblouis
 dnl per http://live.gnome.org/Orca/Braille
 AM_PATH_PYTHON(2.4)
-AM_CHECK_PYGTK(2.0,,[AC_MSG_ERROR(Could not find pygtk 2.0)])
-AM_CHECK_PYMOD(gobject,,,[AC_MSG_ERROR(Could not find python module: gobject)])
+#AM_CHECK_PYMOD(gobject,,,[AC_MSG_ERROR(Could not find python module: gobject)])
 # Don't require the DISPLAY to be set - the gtk checking will fail 
 # if DISPLAY is not set, and we don't like that.
-#AM_CHECK_PYMOD(gtk,gdk,,[AC_MSG_ERROR(Could not find python module: gtk.gdk)])
+
 AM_CHECK_PYMOD(dbus,,,[AC_MSG_ERROR(Could not find python module: dbus)])
-AM_CHECK_PYMOD(pyatspi,,,[AC_MSG_ERROR(Could not find python module: pyatspi)])
 AM_CHECK_PYMOD(cairo,,,[AC_MSG_ERROR(Could not find python module: cairo)])
 AM_CHECK_PYMOD(pango,,,[AC_MSG_ERROR(Could not find python module: pango)])
 AM_CHECK_PYMOD(json,,,[AC_MSG_ERROR(Could not find python module: json)])
diff --git a/src/orca/orca.in b/src/orca/orca.in
index 96cf6d7..cd5020e 100644
--- a/src/orca/orca.in
+++ b/src/orca/orca.in
@@ -93,7 +93,7 @@ cleanup()
         KILLARG="-TERM"
     fi
     USERID=$(id -u)
-    PATTERN="orca[.]orca|OAFIID[:]GNOME_Magnifier|festival [-][-]server"
+    PATTERN="orca[.]orca|festival [-][-]server"
 
     pkill $KILLARG -U $USERID -f "$PATTERN"
 }