rpms/pyspi/F-7 build_with_Pyrex-0.9.5.1a.patch, NONE, 1.1 nullchild.patch, NONE, 1.1 pyspi.spec, 1.7, 1.8

[Zack Cerza (zmc)]

Author: zmc

Update of /cvs/extras/rpms/pyspi/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4768

Modified Files:
	pyspi.spec 
Added Files:
	build_with_Pyrex-0.9.5.1a.patch nullchild.patch 
Log Message:
- Add build_with_Pyrex-0.9.5.1a.patch to make pyspi build with Pyrex-0.9.5.1a.
- Add nullchild.patch to make pyspi deal with NULL children better.
- Both these patches are committed upstream.


build_with_Pyrex-0.9.5.1a.patch:

--- NEW FILE build_with_Pyrex-0.9.5.1a.patch ---
===================================================================
--- pyspi-0.6.1/cspi.pxd	(revision 77)
+++ pyspi-0.6.1/cspi.pxd	(working copy)
@@ -14,9 +14,7 @@
 
 	ctypedef struct AccessibleTextRange
 	ctypedef struct AccessibleKeySet
-	ctypedef enum SPIBoolean:
-		FALSE = 0,
-		TRUE
+	ctypedef unsigned int SPIBoolean
 
 	ctypedef struct AccessibleEvent:
 		char  *type
===================================================================
--- pyspi-0.6.1/pyspi.pyx	(revision 78)
+++ pyspi-0.6.1/pyspi.pyx	(working copy)
@@ -25,9 +25,15 @@
 cdef class Event (EventBase)
 cdef class DeviceEvent
 
-ctypedef enum bool:
+ctypedef unsigned int bool
+
+import __builtin__
+try:
+	False = __builtin__.False
+	True = __builtin__.True
+except AttributeError:
 	False = 0
-	True
+	True = 1
 
 # SPIExceptionCode values:
 (SPI_EXCEPTION_UNSPECIFIED, SPI_EXCEPTION_DISCONNECT, SPI_EXCEPTION_NO_IMPL, SPI_EXCEPTION_IO, SPI_EXCEPTION_BAD_DATA)=range(5) 
@@ -994,11 +1000,11 @@
 		Wraps cspi.AccessibleHyperlink_getObject
 		"""
 		self.__checkSelf ()
-		cdef Accessible object
-		object = Accessible ()
-		object.__setItem (cspi.AccessibleHyperlink_getObject (self.__item, i))
-		object.__checkSelf ()
-		return object
+		cdef Accessible obj
+		obj = Accessible ()
+		obj.__setItem (cspi.AccessibleHyperlink_getObject (self.__item, i))
+		obj.__checkSelf ()
+		return obj
 
 	def getURI (self, i):
 		"""
@@ -1554,7 +1560,7 @@
 	cdef cspi.AccessibleDeviceListener *__item
 	cdef public object modMasks
 
-	def __init__ (self, callback, eventMask = cspi.SPI_KEY_PRESSED | cspi.SPI_KEY_RELEASED):
+	def __init__ (self, callback, eventMask = <int> cspi.SPI_KEY_PRESSED | <int> cspi.SPI_KEY_RELEASED):
 		"""
 		Registers a python callback function to be called.
 

nullchild.patch:

--- NEW FILE nullchild.patch ---
--- pyspi-0.6.1/pyspi.pyx	2007-08-20 15:39:49.000000000 -0400
+++ pyspi-0.6.1/pyspi.pyx.new	2007-08-20 15:43:25.000000000 -0400
@@ -494,7 +494,10 @@ cdef class Accessible (Base):
 		# inside if blocks.
 		
 		cdef cspi.Accessible* spiChild
-		spiChild = cspi.Accessible_getChildAtIndex (self.__item, i)
+		try:
+			spiChild = cspi.Accessible_getChildAtIndex (self.__item, i)
+		except:
+			spiChild = NULL
 		# Workaround for GNOME bug #321273
 		# http://bugzilla.gnome.org/show_bug.cgi?id=321273
 		if spiChild == NULL: return None


Index: pyspi.spec
===================================================================
RCS file: /cvs/extras/rpms/pyspi/F-7/pyspi.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- pyspi.spec	18 Apr 2007 20:31:24 -0000	1.7
+++ pyspi.spec	3 Oct 2007 15:12:31 -0000	1.8
@@ -1,13 +1,15 @@
 Summary: Python bindings for AT-SPI
 Name: pyspi
 Version: 0.6.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: LGPL
 Group: Development/Languages
 URL: http://people.redhat.com/zcerza/dogtail/
 Source0: http://people.redhat.com/zcerza/dogtail/releases/pyspi-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: at-spi-devel, Pyrex, libX11-devel
+Patch0: build_with_Pyrex-0.9.5.1a.patch
+Patch1: nullchild.patch
 
 %description
 AT-SPI allows assistive technologies to access GTK-based applications.  It
@@ -19,6 +21,8 @@
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 %build
 python ./setup.py build
@@ -37,6 +41,11 @@
 %doc ChangeLog
 
 %changelog
+* Wed Oct 03 2007 Zack Cerza <zcerza at redhat.com> - 0.6.1-4
+- Add build_with_Pyrex-0.9.5.1a.patch to make pyspi build with Pyrex-0.9.5.1a.
+- Add nullchild.patch to make pyspi deal with NULL children better.
+- Both these patches are committed upstream.
+
 * Wed Apr 18 2007 Jeremy Katz <katzj at redhat.com> - 0.6.1-3
 - rebuild to get rid of static libpython linkage