Attachment 122140 Details for Bug 165262 – 2012-02-18-kmymoney-kde4.diff

[patch] 2012-02-18-kmymoney-kde4.diff

2012-02-18-kmymoney-kde4.diff (text/plain), 4.35 KB, created by Jason E. Hale on 2012-02-18 13:00:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jason E. Hale

Created: 2012-02-18 13:00:21 UTC

Size: 4.35 KB

patch

obsolete

>diff -ruN kmymoney-kde4.orig/Makefile kmymoney-kde4/Makefile
>--- kmymoney-kde4.orig/Makefile	2012-02-16 14:20:59.000000000 -0500
>+++ kmymoney-kde4/Makefile	2012-02-16 14:21:22.000000000 -0500
>@@ -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}
> 
>diff -ruN kmymoney-kde4.orig/distinfo kmymoney-kde4/distinfo
>--- kmymoney-kde4.orig/distinfo	2012-02-16 14:20:59.000000000 -0500
>+++ kmymoney-kde4/distinfo	2012-02-16 14:22:43.000000000 -0500
>@@ -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
>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	2012-02-16 14:20:59.000000000 -0500
>+++ kmymoney-kde4/files/patch-kmymoney__converter__mymoneygncreader.cpp	1969-12-31 19:00:00.000000000 -0500
>@@ -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
>\ No newline at end of file
>diff -ruN kmymoney-kde4.orig/pkg-plist kmymoney-kde4/pkg-plist
>--- kmymoney-kde4.orig/pkg-plist	2012-02-16 14:20:59.000000000 -0500
>+++ kmymoney-kde4/pkg-plist	2012-02-16 16:17:06.000000000 -0500
>@@ -415,8 +415,12 @@
> 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/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 @@
> @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

Actions: View | Diff

Attachments on bug 165262: 122140