[bluefish] Fix crash in _gtk_text_btree_get_chars_changed_stamp (#720990)

[Paul Howarth]

commit 7183b15ae845df8aebb566617b14100571c5df1a
Author: Paul Howarth <paul at city-fan.org>
Date:   Fri Jul 22 21:21:34 2011 +0100

    Fix crash in _gtk_text_btree_get_chars_changed_stamp (#720990)
    
    - Fix crash in _gtk_text_btree_get_chars_changed_stamp
      (Gnome bug 654838, #720990)
    - Nobody else likes macros for commands

 bluefish.spec           |   33 ++++++++++++++++++++++-----------
 fedora_bug_720990.patch |   15 +++++++++++++++
 2 files changed, 37 insertions(+), 11 deletions(-)
---
diff --git a/bluefish.spec b/bluefish.spec
index 49ef7b5..74c20e3 100644
--- a/bluefish.spec
+++ b/bluefish.spec
@@ -1,6 +1,6 @@
 %global pkgver 2.0.3
 #global prerel rc2
-%global rpmrel 3
+%global rpmrel 4
 
 Name:		bluefish
 Version:	%{pkgver}
@@ -12,7 +12,8 @@ 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)
+Patch2:		fedora_bug_720990.patch
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
 BuildRequires:	desktop-file-utils
 BuildRequires:	enchant-devel >= 1.4.2
 BuildRequires:	gettext
@@ -78,18 +79,23 @@ Files common to every architecture version of %{name}.
 # https://bugzilla.redhat.com/show_bug.cgi?id=683497
 %patch1 -p0
 
+# Fix crash in _gtk_text_btree_get_chars_changed_stamp
+# https://bugzilla.gnome.org/show_bug.cgi?id=654838
+# https://bugzilla.redhat.com/show_bug.cgi?id=720990
+%patch2 -p0
+
 %build
 %configure	--disable-dependency-tracking \
 		--disable-static \
 		--disable-update-databases \
 		--disable-xml-catalog-update \
 		--docdir=%{_defaultdocdir}/%{name}-%{version}
-%{__make} %{?_smp_mflags}
+make %{?_smp_mflags}
 
 %install
-%{__rm} -rf %{buildroot}
-%{__mkdir_p} %{buildroot}%{_datadir}/applications
-%{__make} install DESTDIR=%{buildroot} INSTALL="%{__install} -p"
+rm -rf %{buildroot}
+mkdir -p %{buildroot}%{_datadir}/applications
+make install DESTDIR=%{buildroot} INSTALL="install -p"
 
 %find_lang %{name}
 %find_lang %{name}_plugin_about
@@ -98,23 +104,23 @@ Files common to every architecture version of %{name}.
 %find_lang %{name}_plugin_htmlbar
 %find_lang %{name}_plugin_infbrowser
 %find_lang %{name}_plugin_snippets
-%{__cat} %{name}_plugin_{about,charmap,entities,htmlbar,infbrowser,snippets}.lang >> \
+cat %{name}_plugin_{about,charmap,entities,htmlbar,infbrowser,snippets}.lang >> \
 	%{name}.lang
 
-/usr/bin/desktop-file-validate \
+desktop-file-validate \
 	%{buildroot}%{_datadir}/applications/%{name}.desktop
 
 # Manually install docs so that they go into
 # %%{_defaultdocdir}/%%{name}-%%{version} even after we put them in the
 # shared-data subpackage
-%{__install} -m 644 -p -t %{buildroot}%{_defaultdocdir}/%{name}-%{version}/ \
+install -m 644 -p -t %{buildroot}%{_defaultdocdir}/%{name}-%{version}/ \
 	AUTHORS ChangeLog COPYING NEWS README TODO
 
 # Unpackaged files
-%{__rm} -f %{buildroot}%{_libdir}/%{name}/*.la
+rm -f %{buildroot}%{_libdir}/%{name}/*.la
 
 %clean
-%{__rm} -rf %{buildroot}
+rm -rf %{buildroot}
 
 %post
 /usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
@@ -154,6 +160,11 @@ fi
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Fri Jul 22 2011 Paul Howarth <paul at city-fan.org> - 2.0.3-4
+- Fix crash in _gtk_text_btree_get_chars_changed_stamp
+  (Gnome bug 654838, #720990)
+- Nobody else likes macros for commands
+
 * 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)
 
diff --git a/fedora_bug_720990.patch b/fedora_bug_720990.patch
new file mode 100644
index 0000000..7a30a8b
--- /dev/null
+++ b/fedora_bug_720990.patch
@@ -0,0 +1,15 @@
+Index: src/bftextview2.c
+===================================================================
+--- src/bftextview2.c	(revision 6759)
++++ src/bftextview2.c	(working copy)
+@@ -2088,6 +2088,10 @@
+ 		g_source_remove(btv->user_idle);
+ 		btv->user_idle = 0;
+ 	}
++	if (btv->mark_set_idle) {
++		g_source_remove(btv->mark_set_idle);
++		btv->mark_set_idle = 0;
++	}
+ 	if (btv->autocomp) {
+ 		autocomp_stop(btv);
+ 	}