From 735d81fe3641122e4ab8cdc9394b124d41d74958 Mon Sep 17 00:00:00 2001 From: Denis Leroy Date: Dec 29 2006 08:39:47 +0000 Subject: - 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 --- diff --git a/.cvsignore b/.cvsignore index 448ecdf..79810d2 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -k3d-0.6.4.0-src.tar.bz2 +k3d-0.6.5.0-src.tar.bz2 diff --git a/k3d-0.6.5.0-py25.patch b/k3d-0.6.5.0-py25.patch new file mode 100644 index 0000000..bf8d6ed --- /dev/null +++ b/k3d-0.6.5.0-py25.patch @@ -0,0 +1,163 @@ +--- 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(Object)->container; \ + } \ +- int name##_length(PyObject* Object) \ ++ Py_ssize_t name##_length(PyObject* Object) \ + { \ + container_type* const container = python_cast(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(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(Object); \ + return_val_if_fail(container, -1); \ +@@ -402,20 +402,20 @@ + return_val_if_fail(PyObject_TypeCheck(Object, &name##_type), 0); \ + return reinterpret_cast(Object)->container; \ + } \ +- int name##_length(PyObject* Object) \ ++ Py_ssize_t name##_length(PyObject* Object) \ + { \ + container_type* const container = python_cast(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(Object); \ + return_val_if_fail(container, 0); \ + return_val_if_fail(0 <= Index && static_cast(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(Object); \ +@@ -3535,7 +3535,7 @@ + return reinterpret_cast(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(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(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(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; + } diff --git a/k3d-0.6.5.0-viewport.patch b/k3d-0.6.5.0-viewport.patch new file mode 100644 index 0000000..bbbcaf0 --- /dev/null +++ b/k3d-0.6.5.0-viewport.patch @@ -0,0 +1,12 @@ +--- 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& 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() diff --git a/k3d.spec b/k3d.spec index 28d2e16..260007b 100644 --- a/k3d.spec +++ b/k3d.spec @@ -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 @@ License: GPL 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 @@ This package contains examples of K-3D documents. %prep %setup -q %patch0 -p0 -b .gl64 +%patch1 -p1 -b .py25 +%patch2 -p1 -b .viewport %build @@ -152,6 +156,11 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %changelog +* Fri Dec 29 2006 Denis Leroy - 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 - 0.6.4.0-2 - Rebuild with python 2.5 diff --git a/sources b/sources index 577f770..6ffc912 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3c360b0e6e861a001462f8f6dece30d3 k3d-0.6.4.0-src.tar.bz2 +61ef7955c2a6e77e96e2e0161873be7f k3d-0.6.5.0-src.tar.bz2