ports/164234: [MAINTAINER] finance/kmymoney-kde4: Fix crash upon Gnucash import

[Jason E. Hale]

>Number:         164234
>Category:       ports
>Synopsis:       [MAINTAINER] finance/kmymoney-kde4: Fix crash upon Gnucash import
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jan 17 10:00:20 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Jason E. Hale
>Release:        FreeBSD 8.2-RELEASE i386
>Organization:
none 
>Environment:
System: FreeBSD mocha.verizon.net 8.2-RELEASE FreeBSD 8.2-RELEASE #0: Tue Feb 22 19:19:42 EST 2011 root at mocha.verizon.net:/usr/obj/usr/src/sys/MOCHA8 i386


	
>Description:
- Add a patch from kmymoney git to fix a crash when importing Gnucash files
- Bug reference: https://bugs.kde.org/show_bug.cgi?id=283848

	
>How-To-Repeat:
- Use attached diff
- Added files: files/patch-kmymoney__converter__mymoneygncreader.cpp
	
>Fix:

	

--- 2012-01-17-kmymoney-kde4.diff begins here ---
diff -ruN kmymoney-kde4.orig/Makefile kmymoney-kde4/Makefile
--- kmymoney-kde4.orig/Makefile	2012-01-17 04:23:55.000000000 -0500
+++ kmymoney-kde4/Makefile	2012-01-17 04:24:53.000000000 -0500
@@ -7,6 +7,7 @@
 
 PORTNAME=	kmymoney
 PORTVERSION=	4.6.1
+PORTREVISION=	1
 CATEGORIES=	finance kde
 MASTER_SITES=	SF/${PORTNAME}2/KMyMoney-KDE4/${PORTVERSION}
 
diff -ruN kmymoney-kde4.orig/files/patch-kmymoney__converter__mymoneygncreader.cpp kmymoney-kde4/files/patch-kmymoney__converter__mymoneygncreader.cpp
--- kmymoney-kde4.orig/files/patch-kmymoney__converter__mymoneygncreader.cpp	1969-12-31 19:00:00.000000000 -0500
+++ kmymoney-kde4/files/patch-kmymoney__converter__mymoneygncreader.cpp	2012-01-17 04:22:02.000000000 -0500
@@ -0,0 +1,32 @@
+--- ./kmymoney/converter/mymoneygncreader.cpp.orig	2011-11-05 05:20:14.000000000 -0400
++++ ./kmymoney/converter/mymoneygncreader.cpp	2012-01-17 04:21:49.000000000 -0500
+@@ -1256,7 +1256,6 @@
+ #ifndef _GNCFILEANON
+ void MyMoneyGncReader::readFile(QIODevice* pDevice, IMyMoneySerialize* storage)
+ {
+-
+   Q_CHECK_PTR(pDevice);
+   Q_CHECK_PTR(storage);
+ 
+@@ -1270,6 +1269,8 @@
+   MyMoneyFile::instance()->attachStorage(m_storage);
+   MyMoneyFileTransaction ft;
+   m_xr = new XmlReader(this);
++  bool blocked = MyMoneyFile::instance()->signalsBlocked();
++  MyMoneyFile::instance()->blockSignals(true);
+   try {
+     m_xr->processFile(pDevice);
+     terminate();  // do all the wind-up things
+@@ -1278,11 +1279,11 @@
+     KMessageBox::error(0, i18n("Import failed:\n\n%1", e->what()), PACKAGE);
+     qWarning("%s", qPrintable(e->what()));
+   } // end catch
++  MyMoneyFile::instance()->blockSignals(blocked);
+   MyMoneyFile::instance()->detachStorage(m_storage);
+   signalProgress(0, 1, i18n("Import complete"));  // switch off progress bar
+   delete m_xr;
+   qDebug("Exiting gnucash importer");
+-  return;
+ }
+ #else
+ // Control code for the file anonymizer
--- 2012-01-17-kmymoney-kde4.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: