rpms/cyphesis/devel cyphesis-0.5.10-python2.5.patch,1.1,1.2

Michael Thomas (wart) fedora-extras-commits at redhat.com
Fri Jan 5 22:57:28 UTC 2007


Author: wart

Update of /cvs/extras/rpms/cyphesis/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4991

Modified Files:
	cyphesis-0.5.10-python2.5.patch 
Log Message:
Added fixes for python 2.5 support from upstream CVS



cyphesis-0.5.10-python2.5.patch:

Index: cyphesis-0.5.10-python2.5.patch
===================================================================
RCS file: /cvs/extras/rpms/cyphesis/devel/cyphesis-0.5.10-python2.5.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cyphesis-0.5.10-python2.5.patch	14 Dec 2006 20:42:39 -0000	1.1
+++ cyphesis-0.5.10-python2.5.patch	5 Jan 2007 22:56:58 -0000	1.2
@@ -203,3 +203,28 @@
  PYTHON_VERSION=${python_version}
  PYTHON_INCLUDES=${python_include_path}
  CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"
+--- rulesets/Py_Operation.cpp	26 Oct 2006 00:48:11 -0000	1.53
++++ rulesets/Py_Operation.cpp	4 Jan 2007 18:49:59 -0000	1.54
+@@ -469,15 +469,20 @@
+         0
+ };
+ 
++#if PY_MINOR_VERSION < 5
++#define lenfunc inquiry
++#define ssizeargfunc intargfunc
++#endif
++
+ /*
+  * Operation sequence methods structure.
+  */
+ 
+ static PySequenceMethods Operation_seq = {
+-    (inquiry)Operation_seq_length,      /* sq_length */
++    (lenfunc)Operation_seq_length,      /* sq_length */
+     NULL,                               /*  sq_concat */
+     NULL,                               /* sq_repeat */
+-    (intargfunc)Operation_seq_item,     /* sq_item */
++    (ssizeargfunc)Operation_seq_item,     /* sq_item */
+     NULL,                               /* sq_slice */
+     NULL,                               /* sq_ass_item */
+     NULL                                /* sq_ass_slice */




More information about the scm-commits mailing list