rpms/blender/devel blender-2.42a-x64.patch, 1.3, 1.4 blender.spec, 1.45, 1.46

[Jochen Schmitt (s4504kr)]

Author: s4504kr

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

Modified Files:
	blender-2.42a-x64.patch blender.spec 
Log Message:
Replace x86-patch with one from the blender project

blender-2.42a-x64.patch:

Index: blender-2.42a-x64.patch
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/blender-2.42a-x64.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- blender-2.42a-x64.patch	14 Dec 2006 19:41:11 -0000	1.3
+++ blender-2.42a-x64.patch	14 Dec 2006 20:22:35 -0000	1.4
@@ -1,5 +1,5 @@
---- blender-2.42a/source/gameengine/Expressions/ListValue.cpp.org	2004-06-07 13:03:11.000000000 +0200
-+++ blender-2.42a/source/gameengine/Expressions/ListValue.cpp	2006-12-14 20:45:37.000000000 +0100
+--- blender-2.42a/source/gameengine/Expressions/ListValue.cpp.orig	2004-06-07 12:03:11.000000000 +0100
++++ blender-2.42a/source/gameengine/Expressions/ListValue.cpp	2006-09-29 15:10:27.000000000 +0100
 @@ -23,12 +23,12 @@
  #include <config.h>
  #endif
@@ -24,27 +24,34 @@
  {
  	int i, j;
  	PyListObject *newlist;
-@@ -163,11 +163,11 @@
+@@ -163,22 +163,22 @@
  
  
  static PySequenceMethods listvalue_as_sequence = {
 -	(inquiry)listvalue_bufferlen,//(inquiry)buffer_length, /*sq_length*/
 +	(lenfunc)listvalue_bufferlen,//(inquiry)buffer_length, /*sq_length*/
  	(binaryfunc)listvalue_buffer_concat, /*sq_concat*/
- 	0,//(intargfunc)buffer_repeat, /*sq_repeat*/
+-	0,//(intargfunc)buffer_repeat, /*sq_repeat*/
 -	(intargfunc)listvalue_buffer_item, /*sq_item*/
 -	(intintargfunc)listvalue_buffer_slice, /*sq_slice*/
+-	0,//(intobjargproc)buffer_ass_item, /*sq_ass_item*/
+-	0,//(intintobjargproc)buffer_ass_slice, /*sq_ass_slice*/
++	(ssizeargfunc)0,//(intargfunc)buffer_repeat, /*sq_repeat*/
 +	(ssizeargfunc)listvalue_buffer_item, /*sq_item*/
 +	(ssizessizeargfunc)listvalue_buffer_slice, /*sq_slice*/
- 	0,//(intobjargproc)buffer_ass_item, /*sq_ass_item*/
- 	0,//(intintobjargproc)buffer_ass_slice, /*sq_ass_slice*/
++	(ssizeobjargproc)0,//(intobjargproc)buffer_ass_item, /*sq_ass_item*/
++	(ssizessizeobjargproc)0,//(intintobjargproc)buffer_ass_slice, /*sq_ass_slice*/
  };
-@@ -176,7 +176,7 @@
+ 
+ 
  
  /* Is this one used ? */
  static PyMappingMethods instance_as_mapping = {
 -	(inquiry)listvalue_bufferlen, /*mp_length*/
 +	(lenfunc)listvalue_bufferlen, /*mp_length*/
  	(binaryfunc)listvalue_mapping_subscript, /*mp_subscript*/
- 	0,//(objobjargproc)instance_ass_subscript, /*mp_ass_subscript*/
+-	0,//(objobjargproc)instance_ass_subscript, /*mp_ass_subscript*/
++	(objobjargproc)0,//(objobjargproc)instance_ass_subscript, /*mp_ass_subscript*/
  };
+ 
+ 


Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/blender.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- blender.spec	14 Dec 2006 19:41:11 -0000	1.45
+++ blender.spec	14 Dec 2006 20:22:35 -0000	1.46
@@ -3,7 +3,7 @@
 
 Name:           blender
 Version:        2.42a
-Release: 	16%{?dist}
+Release: 	17%{?dist}
 
 Summary:        3D modeling, animation, rendering and post-production
 
@@ -162,6 +162,9 @@
 %{_datadir}/mime/packages/blender.xml
 
 %changelog
+* Thu Dec 14 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.42a-17
+- Replace x86-patch with one from the blender project
+
 * Thu Dec 14 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.42a-16
 - Rebuild