[bluefish] Add workaround for crash on close (#683497)
Paul Howarth
pghmcfc at fedoraproject.org
Thu Mar 10 18:58:57 UTC 2011
commit fc45c6e01b822918d7568b0cf703469d2c1b2ee2
Author: Paul Howarth <paul at city-fan.org>
Date: Thu Mar 10 18:57:37 2011 +0000
Add workaround for crash on close (#683497)
bluefish.spec | 11 ++++++++++-
fedora_bug_683497.patch | 18 ++++++++++++++++++
2 files changed, 28 insertions(+), 1 deletions(-)
---
diff --git a/bluefish.spec b/bluefish.spec
index 1e1b30b..49ef7b5 100644
--- a/bluefish.spec
+++ b/bluefish.spec
@@ -1,6 +1,6 @@
%global pkgver 2.0.3
#global prerel rc2
-%global rpmrel 2
+%global rpmrel 3
Name: bluefish
Version: %{pkgver}
@@ -11,6 +11,7 @@ License: GPLv3+
URL: http://bluefish.openoffice.nl/
Source0: http://www.bennewitz.com/bluefish/stable/source/bluefish-%{version}%{?prerel:-%{prerel}}.tar.bz2
Patch0: bluefish_bug_643150_643153.patch
+Patch1: fedora_bug_683497.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
BuildRequires: enchant-devel >= 1.4.2
@@ -72,6 +73,11 @@ Files common to every architecture version of %{name}.
# https://bugzilla.redhat.com/show_bug.cgi?id=680626
%patch0 -p0
+# Workaround for a crash-on-close bug
+# https://bugzilla.gnome.org/show_bug.cgi?id=637990
+# https://bugzilla.redhat.com/show_bug.cgi?id=683497
+%patch1 -p0
+
%build
%configure --disable-dependency-tracking \
--disable-static \
@@ -148,6 +154,9 @@ fi
%{_mandir}/man1/%{name}.1*
%changelog
+* Thu Mar 10 2011 Paul Howarth <paul at city-fan.org> - 2.0.3-3
+- Add workaround for crash on close (Gnome bug 637990, #683497)
+
* Sun Feb 27 2011 Paul Howarth <paul at city-fan.org> - 2.0.3-2
- Fix highlighting of block delimiters (Gnome bugs 643150 and 643153, #680626)
diff --git a/fedora_bug_683497.patch b/fedora_bug_683497.patch
new file mode 100644
index 0000000..fdc6cbb
--- /dev/null
+++ b/fedora_bug_683497.patch
@@ -0,0 +1,18 @@
+Index: src/file_autosave.c
+===================================================================
+--- src/file_autosave.c (revision 6439)
++++ src/file_autosave.c (working copy)
+@@ -178,9 +178,10 @@
+
+ /* cancel running autosave */
+ if (doc->autosave_progress) {
+- file_checkNsave_cancel(doc->autosave_action);
+- main_v->autosave_progress = g_list_delete_link(main_v->autosave_progress, doc->autosave_progress);
+- doc->autosave_progress = NULL;
++ if (doc->autosave_action)
++ file_checkNsave_cancel(doc->autosave_action);
++ main_v->autosave_progress = g_list_delete_link(main_v->autosave_progress, doc->autosave_progress);
++ doc->autosave_progress = NULL;
+ }
+
+ if (doc->autosave_uri) {
More information about the scm-commits
mailing list