rpms/k3d/devel k3d-0.6.5.0-py25.patch, NONE, 1.1 k3d-0.6.5.0-viewport.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 k3d.spec, 1.12, 1.13 sources, 1.8, 1.9

[Denis Leroy (denis)]

Author: denis

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

Modified Files:
	.cvsignore k3d.spec sources 
Added Files:
	k3d-0.6.5.0-py25.patch k3d-0.6.5.0-viewport.patch 
Log Message:
- Update to 0.6.5.0
- Added patch to fix x86_64 startup crash in viewport widget
- Added patch to fix python 2.5 API changes


k3d-0.6.5.0-py25.patch:

--- NEW FILE k3d-0.6.5.0-py25.patch ---
--- k3d-0.6.5.0/modules/python/object_model.cpp.orig	2006-12-28 07:18:06.000000000 -0800
+++ k3d-0.6.5.0/modules/python/object_model.cpp	2006-12-28 07:25:14.000000000 -0800
@@ -240,13 +240,13 @@
 		return_val_if_fail(PyObject_TypeCheck(Object, &name##_type), 0); \
 		return reinterpret_cast<name*>(Object)->container; \
 	} \
-	int name##_length(PyObject* Object) \
+	Py_ssize_t name##_length(PyObject* Object) \
 	{ \
 		container_type* const container = python_cast<container_type*>(Object); \
 		return_val_if_fail(container, -1); \
 		return container->size(); \
 	} \
-	PyObject* name##_item(PyObject* Object, int Index) \
+	PyObject* name##_item(PyObject* Object, Py_ssize_t Index) \
 	{ \
 		container_type* const container = python_cast<container_type*>(Object); \
 		return_val_if_fail(container, 0); \
@@ -255,7 +255,7 @@
 			container->resize(Index + 1); \
 		return python_wrap(container->at(Index)); \
 	} \
-	int name##_assign_item(PyObject* Object, int Index, PyObject* Value) \
+	int name##_assign_item(PyObject* Object, Py_ssize_t Index, PyObject* Value) \
 	{ \
 		container_type* const container = python_cast<container_type*>(Object); \
 		return_val_if_fail(container, -1); \
@@ -402,20 +402,20 @@
 		return_val_if_fail(PyObject_TypeCheck(Object, &name##_type), 0); \
 		return reinterpret_cast<name*>(Object)->container; \
 	} \
-	int name##_length(PyObject* Object) \
+	Py_ssize_t name##_length(PyObject* Object)		\
 	{ \
 		container_type* const container = python_cast<container_type*>(Object); \
 		return_val_if_fail(container, -1); \
 		return container->size(); \
 	} \
-	PyObject* name##_item(PyObject* Object, int Index) \
+	PyObject* name##_item(PyObject* Object, Py_ssize_t Index) \
 	{ \
 		container_type* const container = python_cast<container_type*>(Object); \
 		return_val_if_fail(container, 0); \
 		return_val_if_fail(0 <= Index && static_cast<unsigned int>(Index) < container->size(), 0); \
 		return python_wrap(container->at(Index)); \
 	} \
-	int name##_assign_item(PyObject* Object, int Index, PyObject* Value) \
+	int name##_assign_item(PyObject* Object, Py_ssize_t Index, PyObject* Value) \
 	{ \
 		return_val_if_fail(Value, -1); \
 		container_type* const container = python_cast<container_type*>(Object); \
@@ -3535,7 +3535,7 @@
 	return reinterpret_cast<k3d_bitmap*>(Object)->object;
 }
 
-PyObject* k3d_bitmap_item(PyObject* Object, int Index)
+PyObject* k3d_bitmap_item(PyObject* Object, Py_ssize_t Index)
 {
 	k3d::bitmap* const value = python_cast<k3d::bitmap*>(Object);
 	return_val_if_fail(value, 0);
@@ -3546,7 +3546,7 @@
 	return python_wrap(*(value->begin() + Index));
 }
 
-int k3d_bitmap_assign_item(PyObject* Object, int Index, PyObject* Value)
+int k3d_bitmap_assign_item(PyObject* Object, Py_ssize_t Index, PyObject* Value)
 {
 	k3d::bitmap* const lhs = python_cast<k3d::bitmap*>(Object);
 	return_val_if_fail(lhs, -1);
@@ -3890,7 +3890,7 @@
 	return -1;
 }
 
-PyObject* k3d_point3_item(PyObject* Object, int Index)
+PyObject* k3d_point3_item(PyObject* Object, Py_ssize_t Index)
 {
 	return_val_if_fail(0 <= Index, 0);
 	return_val_if_fail(Index <= 2, 0);
@@ -3901,7 +3901,7 @@
 	return python_wrap((*value)[Index]);
 }
 
-int k3d_point3_assign_item(PyObject* Object, int Index, PyObject* Value)
+int k3d_point3_assign_item(PyObject* Object, Py_ssize_t Index, PyObject* Value)
 {
 	return_val_if_fail(0 <= Index, -1);
 	return_val_if_fail(Index <= 2, -1);
@@ -4137,7 +4137,7 @@
 	return -1;
 }
 
-PyObject* k3d_vector3_item(PyObject* Object, int Index)
+PyObject* k3d_vector3_item(PyObject* Object, Py_ssize_t Index)
 {
 	return_val_if_fail(0 <= Index, 0);
 	return_val_if_fail(Index <= 2, 0);
@@ -4148,7 +4148,7 @@
 	return python_wrap((*value)[Index]);
 }
 
-int k3d_vector3_assign_item(PyObject* Object, int Index, PyObject* Value)
+int k3d_vector3_assign_item(PyObject* Object, Py_ssize_t Index, PyObject* Value)
 {
 	return_val_if_fail(0 <= Index, -1);
 	return_val_if_fail(Index <= 2, -1);
@@ -4582,7 +4582,7 @@
 	return -1;
 }
 
-PyObject* k3d_euler_angles_item(PyObject* Object, int Index)
+PyObject* k3d_euler_angles_item(PyObject* Object, Py_ssize_t Index)
 {
 	return_val_if_fail(0 <= Index, 0);
 	return_val_if_fail(Index <= 2, 0);
@@ -4593,7 +4593,7 @@
 	return python_wrap((*value)[Index]);
 }
 
-int k3d_euler_angles_assign_item(PyObject* Object, int Index, PyObject* Value)
+int k3d_euler_angles_assign_item(PyObject* Object, Py_ssize_t Index, PyObject* Value)
 {
 	return_val_if_fail(0 <= Index, -1);
 	return_val_if_fail(Index <= 2, -1);
@@ -4805,7 +4805,7 @@
 	return -1;
 }
 
-PyObject* k3d_point4_item(PyObject* Object, int Index)
+PyObject* k3d_point4_item(PyObject* Object, Py_ssize_t Index)
 {
 	return_val_if_fail(0 <= Index, 0);
 	return_val_if_fail(Index <= 3, 0);
@@ -4816,7 +4816,7 @@
 	return python_wrap((*value)[Index]);
 }
 
-int k3d_point4_assign_item(PyObject* Object, int Index, PyObject* Value)
+int k3d_point4_assign_item(PyObject* Object, Py_ssize_t Index, PyObject* Value)
 {
 	return_val_if_fail(0 <= Index, -1);
 	return_val_if_fail(Index <= 3, -1);
@@ -4960,7 +4960,7 @@
 	return -1;
 }
 
-PyObject* k3d_matrix4_item(PyObject* Object, int Index)
+PyObject* k3d_matrix4_item(PyObject* Object, Py_ssize_t Index)
 {
 	return_val_if_fail(0 <= Index, 0);
 	return_val_if_fail(Index <= 3, 0);
@@ -4968,10 +4968,10 @@
 	k3d::matrix4* const value = python_cast<k3d::matrix4*>(Object);
 	return_val_if_fail(value, 0);
 
-	return python_wrap((*value)[Index]);
+	return python_wrap((*value)[(int)Index]);
 }
 
-int k3d_matrix4_assign_item(PyObject* Object, int Index, PyObject* Value)
+int k3d_matrix4_assign_item(PyObject* Object, Py_ssize_t Index, PyObject* Value)
 {
 	return -1;
 }

k3d-0.6.5.0-viewport.patch:

--- NEW FILE k3d-0.6.5.0-viewport.patch ---
--- k3d-0.6.5.0/ngui/viewport.cpp.orig	2006-12-29 09:39:45.000000000 +0100
+++ k3d-0.6.5.0/ngui/viewport.cpp	2006-12-29 09:40:22.000000000 +0100
@@ -682,7 +682,8 @@
 void control::on_style_changed(const Glib::RefPtr<Gtk::Style>& previous_style)
 {
 	base::on_style_changed(previous_style);
-	glDeleteLists(m_implementation->m_font_begin, m_implementation->m_font_end - m_implementation->m_font_begin);
+	if (m_implementation->m_font_begin != m_implementation->m_font_end)
+		glDeleteLists(m_implementation->m_font_begin, m_implementation->m_font_end - m_implementation->m_font_begin);
 }
 
 void control::create_font()


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/k3d/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	23 Nov 2006 09:39:00 -0000	1.8
+++ .cvsignore	29 Dec 2006 08:39:47 -0000	1.9
@@ -1 +1 @@
-k3d-0.6.4.0-src.tar.bz2
+k3d-0.6.5.0-src.tar.bz2


Index: k3d.spec
===================================================================
RCS file: /cvs/extras/rpms/k3d/devel/k3d.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- k3d.spec	11 Dec 2006 11:46:53 -0000	1.12
+++ k3d.spec	29 Dec 2006 08:39:47 -0000	1.13
@@ -1,7 +1,7 @@
 
 Name:           k3d
-Version:        0.6.4.0
-Release:        2%{?dist}
+Version:        0.6.5.0
+Release:        1%{?dist}
 Summary:        A 3D Modeling, Animation and Rendering System
 
 Group:          Applications/Multimedia
@@ -9,6 +9,8 @@
 URL:            http://www.k-3d.org/
 Source0:        http://dl.sourceforge.net/k3d/k3d-%{version}-src.tar.bz2
 Patch0:         k3d-0.5.15.0-gl64.patch
+Patch1:         k3d-0.6.5.0-py25.patch
+Patch2:         k3d-0.6.5.0-viewport.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -68,6 +70,8 @@
 %prep
 %setup -q
 %patch0 -p0 -b .gl64
+%patch1 -p1 -b .py25
+%patch2 -p1 -b .viewport
 
 
 %build
@@ -152,6 +156,11 @@
 
 
 %changelog
+* Fri Dec 29 2006 Denis Leroy <denis at poolshark.org> - 0.6.5.0-1
+- Update to 0.6.5.0
+- Added patch to fix x86_64 startup crash in viewport widget
+- Added patch to fix python 2.5 API changes
+
 * Mon Dec 11 2006 Denis Leroy <denis at poolshark.org> - 0.6.4.0-2
 - Rebuild with python 2.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/k3d/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	23 Nov 2006 09:39:00 -0000	1.8
+++ sources	29 Dec 2006 08:39:47 -0000	1.9
@@ -1 +1 @@
-3c360b0e6e861a001462f8f6dece30d3  k3d-0.6.4.0-src.tar.bz2
+61ef7955c2a6e77e96e2e0161873be7f  k3d-0.6.5.0-src.tar.bz2