rpms/blender/devel blender-2.36-gcc4.patch, NONE, 1.1 blender.spec, 1.9, 1.10

Toshio Ernie Kuratomi (toshio) fedora-extras-commits at redhat.com
Sun May 15 22:16:42 UTC 2005


Author: toshio

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

Modified Files:
	blender.spec 
Added Files:
	blender-2.36-gcc4.patch 
Log Message:
New patch blender-2.36-gcc4.patch to fix a gcc4 error.


blender-2.36-gcc4.patch:

--- NEW FILE blender-2.36-gcc4.patch ---
--- blender/source/blender/python/api2_2x/CurNurb.c.gcc4	2005-05-14 16:14:26.000000000 -0400
+++ blender/source/blender/python/api2_2x/CurNurb.c	2005-05-14 16:14:42.000000000 -0400
@@ -51,7 +51,7 @@
  */
 
 
-extern PyMethodDef BPy_CurNurb_methods[];
+static PyMethodDef BPy_CurNurb_methods[];
 PyObject *CurNurb_CreatePyObject( Nurb * blen_nurb );
 static PyObject *CurNurb_setMatIndex( BPy_CurNurb * self, PyObject * args );
 static PyObject *CurNurb_getMatIndex( BPy_CurNurb * self );


Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/blender.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- blender.spec	13 May 2005 21:29:19 -0000	1.9
+++ blender.spec	15 May 2005 22:16:34 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           blender
 Version:        2.36
-Release:        1
+Release:        2
 
 Summary:        3D modeling, animation, rendering and post-production
 
@@ -13,6 +13,7 @@
 Source3:        blender.png
 Source4:        blender.desktop
 Source5:        blender.xml
+Patch0:		blender-2.36-gcc4.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -45,7 +46,7 @@
 
 %prep
 %setup -q -n %{name}
-
+%patch0 -p1 -b .gcc4
 
 %build
 sed -i "s/use_openal =.*/use_openal = 'true'/g;" SConstruct
@@ -92,6 +93,9 @@
 
 
 %changelog
+* Sat May 14 2005 Toshio Kuratomi <toshio-tiki-lounge.com> 2.36-2
+- Fix a gcc4 error.
+  
 * Fri May 13 2005 Toshio Kuratomi <toshio-tiki-lounge.com> 2.36-1
 - Update to 2.36.
 - Rebuild with new gcc4.




More information about the fedora-extras-commits mailing list