Hello community, here is the log from the commit of package dia checked in at Fri Nov 3 18:59:44 CET 2006. -------- --- GNOME/dia/dia.changes 2006-10-13 04:56:04.000000000 +0200 +++ /mounts/work_src_done/STABLE/dia/dia.changes 2006-11-03 15:58:20.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Nov 3 15:57:11 CET 2006 - sbrabec@suse.cz + +- Fixed python 2.5 related crash (#217495, backport Andreas Hanke). + +------------------------------------------------------------------- New: ---- dia-python2.5.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dia.spec ++++++ --- /var/tmp/diff_new_pack.WadJEF/_old 2006-11-03 18:59:30.000000000 +0100 +++ /var/tmp/diff_new_pack.WadJEF/_new 2006-11-03 18:59:30.000000000 +0100 @@ -13,13 +13,13 @@ Name: dia BuildRequires: docbook-toys docbook-xsl-stylesheets gcc-c++ gnome-patch-translation intltool libgnomeui-devel libxslt-devel mDNSResponder-devel perl-XML-Parser python-devel python-gtk-devel sgml-skel update-desktop-files %define prefix /opt/gnome -License: GPL +License: GNU General Public License (GPL) - all versions Group: Productivity/Graphics/Other Requires: ghostscript-fonts-std python-gtk python-numeric Autoreqprov: on Summary: A Diagram Creation Program Version: 0.95 -Release: 4 +Release: 15 Source: ftp://ftp.gnome.org/pub/GNOME/stable/sources/dia/dia-%{version}.tar.bz2 Source1: font-test-japanese.dia Source2: font-test-czech.dia @@ -31,6 +31,7 @@ Patch11: dia-cve-2006-2480.patch Patch12: dia-cve-2006-2453.patch Patch13: dia-64bit-clean.patch +Patch14: dia-python2.5.patch URL: http://www.gnome.org/projects/dia/ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -64,6 +65,7 @@ %patch11 %patch12 %patch13 +%patch14 # Work around gettext bug #186174 LANG=en_US.UTF-8 msgconv po/ko.po -o po/ko.po.new mv po/ko.po.new po/ko.po @@ -109,6 +111,8 @@ %prefix/share/pixmaps/* %changelog -n dia +* Fri Nov 03 2006 - sbrabec@suse.cz +- Fixed python 2.5 related crash (#217495, backport Andreas Hanke). * Fri Oct 13 2006 - danw@suse.de - Remove dead patches * Sat Sep 30 2006 - aj@suse.de ++++++ dia-python2.5.patch ++++++ --- plug-ins/python/pydia-color.c +++ plug-ins/python/pydia-color.c @@ -43,7 +43,7 @@ static void PyDiaColor_Dealloc(PyObject *self) { - PyMem_DEL(self); + PyObject_DEL(self); } /* --- plug-ins/python/pydia-cpoint.c +++ plug-ins/python/pydia-cpoint.c @@ -38,7 +38,7 @@ static void PyDiaConnectionPoint_Dealloc(PyDiaConnectionPoint *self) { - PyMem_DEL(self); + PyObject_DEL(self); } static int --- plug-ins/python/pydia-diagram.c +++ plug-ins/python/pydia-diagram.c @@ -50,7 +50,7 @@ PyDiaDiagram_Dealloc(PyDiaDiagram *self) { g_object_unref(self->dia); - PyMem_DEL(self); + PyObject_DEL(self); } static int --- plug-ins/python/pydia-diagramdata.c +++ plug-ins/python/pydia-diagramdata.c @@ -46,7 +46,7 @@ PyDiaDiagramData_Dealloc(PyDiaDiagramData *self) { g_object_unref (self->data); - PyMem_DEL(self); + PyObject_DEL(self); } static int --- plug-ins/python/pydia-display.c +++ plug-ins/python/pydia-display.c @@ -38,7 +38,7 @@ static void PyDiaDisplay_Dealloc(PyDiaDisplay *self) { - PyMem_DEL(self); + PyObject_DEL(self); } static int --- plug-ins/python/pydia-error.c +++ plug-ins/python/pydia-error.c @@ -84,7 +84,7 @@ { if (self->str) g_string_free (self->str, TRUE); - PyMem_DEL(self); + PyObject_DEL(self); } /* --- plug-ins/python/pydia-export.c +++ plug-ins/python/pydia-export.c @@ -37,7 +37,7 @@ static void PyDiaExportFilter_Dealloc(PyDiaExportFilter *self) { - PyMem_DEL(self); + PyObject_DEL(self); } static int --- plug-ins/python/pydia-font.c +++ plug-ins/python/pydia-font.c @@ -48,7 +48,7 @@ { if (self->font) dia_font_unref (self->font); - PyMem_DEL(self); + PyObject_DEL(self); } /* --- plug-ins/python/pydia-geometry.c +++ plug-ins/python/pydia-geometry.c @@ -135,7 +135,7 @@ static void PyDiaGeometry_Dealloc(void *self) { - PyMem_DEL(self); + PyObject_DEL(self); } /* --- plug-ins/python/pydia-handle.c +++ plug-ins/python/pydia-handle.c @@ -40,7 +40,7 @@ static void PyDiaHandle_Dealloc(PyDiaHandle *self) { - PyMem_DEL(self); + PyObject_DEL(self); } static int --- plug-ins/python/pydia-image.c +++ plug-ins/python/pydia-image.c @@ -45,7 +45,7 @@ PyDiaImage_Dealloc(PyDiaImage *self) { dia_image_release (self->image); - PyMem_DEL(self); + PyObject_DEL(self); } /* --- plug-ins/python/pydia-layer.c +++ plug-ins/python/pydia-layer.c @@ -38,7 +38,7 @@ static void PyDiaLayer_Dealloc(PyDiaLayer *self) { - PyMem_DEL(self); + PyObject_DEL(self); } static int --- plug-ins/python/pydia-object.c +++ plug-ins/python/pydia-object.c @@ -40,7 +40,7 @@ static void PyDiaObject_Dealloc(PyDiaObject *self) { - PyMem_DEL(self); + PyObject_DEL(self); } static int @@ -250,7 +250,7 @@ static void PyDiaObjectType_Dealloc(PyDiaObjectType *self) { - PyMem_DEL(self); + PyObject_DEL(self); } static int --- plug-ins/python/pydia-properties.c +++ plug-ins/python/pydia-properties.c @@ -46,7 +46,7 @@ PyDiaProperties_Dealloc(PyDiaObject *self) { self->object = NULL; /* XXX: should dec ref */ - PyMem_DEL(self); + PyObject_DEL(self); } /* --- plug-ins/python/pydia-property.c +++ plug-ins/python/pydia-property.c @@ -60,7 +60,7 @@ PyDiaProperty_Dealloc(PyDiaProperty *self) { self->property->ops->free(self->property); - PyMem_DEL(self); + PyObject_DEL(self); } /* --- plug-ins/python/pydia-text.c +++ plug-ins/python/pydia-text.c @@ -49,7 +49,7 @@ PyDiaText_Dealloc(PyDiaText *self) { g_free (self->text_data); - PyMem_DEL(self); + PyObject_DEL(self); } /* ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org