rpms/abiword/FC-4 abiword-2.4.4-fontcrash.patch, NONE, 1.1 abiword.spec, 1.24, 1.25

[Marc Maurer (uwog)]

Author: uwog

Update of /cvs/extras/rpms/abiword/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18765

Modified Files:
	abiword.spec 
Added Files:
	abiword-2.4.4-fontcrash.patch 
Log Message:
Fix crash on exit



abiword-2.4.4-fontcrash.patch:

--- NEW FILE abiword-2.4.4-fontcrash.patch ---
diff -r -u abiword-2.4.4.orig/abi/src/af/xap/unix/xap_UnixApp.cpp abiword-2.4.4/abi/src/af/xap/unix/xap_UnixApp.cpp
--- abiword-2.4.4.orig/abi/src/af/xap/unix/xap_UnixApp.cpp	2005-07-05 16:08:20.000000000 +0200
+++ abiword-2.4.4/abi/src/af/xap/unix/xap_UnixApp.cpp	2006-05-12 21:44:57.000000000 +0200
@@ -133,11 +133,11 @@
 {
 	DELETEP(m_pUnixToolbarIcons);
 	
+	delete m_fontManager;
+
 #if FC_MINOR > 2
 	FcFini();
 #endif
-	
-	delete m_fontManager;
 }
 
 bool XAP_UnixApp::initialize(const char * szKeyBindingsKey, const char * szKeyBindingsDefaultValue)


Index: abiword.spec
===================================================================
RCS file: /cvs/extras/rpms/abiword/FC-4/abiword.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- abiword.spec	8 May 2006 11:15:20 -0000	1.24
+++ abiword.spec	13 May 2006 10:49:19 -0000	1.25
@@ -3,7 +3,7 @@
 Summary: The AbiWord word processor
 Name: abiword
 Version: 2.4.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPL
@@ -44,6 +44,7 @@
 Patch1: abiword-2.4.4-desktop.patch
 Patch2: abiword-2.4.4-docbuild.patch
 Patch3: abiword-2.4.4-x86_64.patch
+Patch4: abiword-2.4.4-fontcrash.patch
 
 %description
 AbiWord is a cross-platform Open Source word processor. The goal is to make
@@ -55,6 +56,7 @@
 %patch1 -p1 -b .desktop
 %patch2 -p1 -b .docbuild
 %patch3 -p1 -b .x86_64
+%patch4 -p1 -b .fontcrash
 
 %build
 cd abi
@@ -138,6 +140,9 @@
 %{_datadir}/icons/*png
 
 %changelog
+* Sat May 13 2006 Marc Maurer <uwog at abisource.com> - 1:2.4.4-4.fc4
+- Fix bug 182399 - Abiword crashes on exit 
+
 * Mon May 08 2006 Marc Maurer <uwog at abisource.com> - 1:2.4.4-3.fc4
 - Fix bug 190591 - crash on x86_64 machines when saving a document