Update to 4.6.2

PR:		ports/165262
Submitted by:	Jason E. Hale (maintainer)
This commit is contained in:
Max Brazhnikov 2012-02-22 11:06:30 +00:00
parent 9a69d13012
commit 9274f0655d
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=292045
4 changed files with 16 additions and 41 deletions

View File

@ -6,8 +6,7 @@
#
PORTNAME= kmymoney
PORTVERSION= 4.6.1
PORTREVISION= 2
PORTVERSION= 4.6.2
CATEGORIES= finance kde
MASTER_SITES= SF/${PORTNAME}2/KMyMoney-KDE4/${PORTVERSION}

View File

@ -1,2 +1,2 @@
SHA256 (kmymoney-4.6.1.tar.bz2) = 5fcab9c4f1b5868aabb816a87c61cb025e69a191f6cb218cce3f29f0c1c1b77a
SIZE (kmymoney-4.6.1.tar.bz2) = 22758086
SHA256 (kmymoney-4.6.2.tar.bz2) = add8acba2f0d4c212ac1c7fbbdad2fd43a24caceed586b13d90dcd2a20a12b75
SIZE (kmymoney-4.6.2.tar.bz2) = 22762330

View File

@ -1,32 +0,0 @@
--- ./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

View File

@ -415,8 +415,12 @@ share/apps/kmymoney/kmymoneyui.rc
share/apps/kmymoney/misc/financequote.pl
share/apps/kmymoney/pics/l10n/de/startlogo.png
share/apps/kmymoney/pics/l10n/es/startlogo.png
share/apps/kmymoney/pics/l10n/hu/startlogo.png
share/apps/kmymoney/pics/l10n/it/startlogo.png
share/apps/kmymoney/pics/l10n/pt_BR/startlogo.png
share/apps/kmymoney/pics/l10n/ro/startlogo.png
share/apps/kmymoney/pics/l10n/ru/startlogo.png
share/apps/kmymoney/pics/l10n/sv/startlogo.png
share/apps/kmymoney/pics/l10n/uk/startlogo.png
share/apps/kmymoney/pics/startlogo.png
share/apps/kmymoney/pics/titlelabel_background.png
@ -811,11 +815,11 @@ share/doc/HTML/en/kmymoney/accwiz10.png
share/doc/HTML/en/kmymoney/accwiz2.png
share/doc/HTML/en/kmymoney/accwiz6.png
share/doc/HTML/en/kmymoney/accwiz7.png
share/doc/HTML/en/kmymoney/accwiz8.1.png
share/doc/HTML/en/kmymoney/accwiz8.2.png
share/doc/HTML/en/kmymoney/accwiz8.3.png
share/doc/HTML/en/kmymoney/accwiz8.4.png
share/doc/HTML/en/kmymoney/accwiz8.5.png
share/doc/HTML/en/kmymoney/accwiz8_1.png
share/doc/HTML/en/kmymoney/accwiz8_2.png
share/doc/HTML/en/kmymoney/accwiz8_3.png
share/doc/HTML/en/kmymoney/accwiz8_4.png
share/doc/HTML/en/kmymoney/accwiz8_5.png
share/doc/HTML/en/kmymoney/accwiz9.png
share/doc/HTML/en/kmymoney/budgets_view.png
share/doc/HTML/en/kmymoney/calendarview.png
@ -1341,8 +1345,12 @@ share/mime/packages/x-kmymoney.xml
@dirrm share/apps/kmymoney/templates/C
@dirrm share/apps/kmymoney/templates
@dirrm share/apps/kmymoney/pics/l10n/uk
@dirrm share/apps/kmymoney/pics/l10n/sv
@dirrm share/apps/kmymoney/pics/l10n/ru
@dirrm share/apps/kmymoney/pics/l10n/ro
@dirrm share/apps/kmymoney/pics/l10n/pt_BR
@dirrm share/apps/kmymoney/pics/l10n/it
@dirrm share/apps/kmymoney/pics/l10n/hu
@dirrm share/apps/kmymoney/pics/l10n/es
@dirrm share/apps/kmymoney/pics/l10n/de
@dirrm share/apps/kmymoney/pics/l10n