diff --git a/dia-0.95-diagram_ungroup_selected_v2.patch b/dia-0.95-diagram_ungroup_selected_v2.patch new file mode 100644 index 0000000..378d99f --- /dev/null +++ b/dia-0.95-diagram_ungroup_selected_v2.patch @@ -0,0 +1,29 @@ +--- app/diagram.c.orig 2006-04-27 16:44:03.000000000 +0200 ++++ app/diagram.c 2006-05-02 10:39:54.000000000 +0200 +@@ -1139,7 +1139,7 @@ + DiaObject *group; + GList *group_list; + /* GList *list; */ +- GList *selected; ++ GList *selected, *selection_copy; + int group_index; + int any_groups = 0; + +@@ -1148,7 +1148,8 @@ + return; + } + +- selected = dia->data->selected; ++ selection_copy = g_list_copy(dia->data->selected); ++ selected = selection_copy; + while (selected != NULL) { + group = (DiaObject *)selected->data; + +@@ -1188,6 +1189,7 @@ + } + selected = g_list_next(selected); + } ++ g_list_free(selection_copy); + + if (any_groups) { + diagram_modified(dia); diff --git a/dia.spec b/dia.spec index b9e61b5..53e064e 100644 --- a/dia.spec +++ b/dia.spec @@ -1,6 +1,6 @@ Name: dia Version: 0.95 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 1 Summary: Diagram drawing program Group: Applications/Multimedia @@ -11,6 +11,7 @@ Patch1: dia-0.92.2-dtd.patch Patch2: dia-0.95-pre6-help.patch Patch3: dia-0.94-fallbacktoxpmicons.patch Patch4: dia-0.95-formatstring.patch +Patch5: dia-0.95-diagram_ungroup_selected_v2.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: libgnomeui-devel python-devel pygtk2-devel desktop-file-utils BuildRequires: intltool docbook-utils docbook-style-dsssl docbook-style-xsl @@ -30,6 +31,7 @@ and can export to PostScript(TM). %patch2 -p1 -b .help %patch3 -p1 -b .fallbacktoxpmicons %patch4 -p1 -b .formatstring +%patch5 -p0 -b .ungroup %build @@ -99,6 +101,11 @@ rm -fr $RPM_BUILD_ROOT %changelog +* Tue Jun 6 2006 Hans de Goede 1:0.95-4 +- Add a patch from upstream which fixes a crash when ungrouping + multiple selected groups at once (bz 194149): + http://bugzilla.gnome.org/show_bug.cgi?id=334771 + * Tue May 23 2006 Hans de Goede 1:0.95-3 - Fix CVE-2006-2453.