[arch-commits] Commit in skrooge/trunk (3 files)

[Jaroslav Lichtblau]

    Date: Wednesday, May 11, 2016 @ 19:46:20
  Author: jlichtblau
Revision: 174813

upgpkg: skrooge 2.4.0-1 - new upstream releae

Modified:
  skrooge/trunk/PKGBUILD
  skrooge/trunk/skrooge.changelog
Deleted:
  skrooge/trunk/skrooge-gcc-fix.patch

-----------------------+
 PKGBUILD              |   16 +++---------
 skrooge-gcc-fix.patch |   63 ------------------------------------------------
 skrooge.changelog     |    3 ++
 3 files changed, 7 insertions(+), 75 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-11 17:44:48 UTC (rev 174812)
+++ PKGBUILD	2016-05-11 17:46:20 UTC (rev 174813)
@@ -5,8 +5,8 @@
 # Contributor: neuromante <lorenzo.nizzi.grifi at gmail.com>
 
 pkgname=skrooge
-pkgver=2.3.0
-pkgrel=3
+pkgver=2.4.0
+pkgrel=1
 pkgdesc="A personal finances manager for KDE"
 arch=('i686' 'x86_64')
 url="http://skrooge.org/"
@@ -17,17 +17,9 @@
 options=('!emptydirs')
 install=$pkgname.install
 changelog=$pkgname.changelog
-source=(http://download.kde.org/stable/$pkgname/$pkgname-$pkgver.tar.xz
-        $pkgname-gcc-fix.patch)
-sha256sums=('76f57e2cede320848f1f1bef41b3be128aec9d59a8e643701b30bcae61f8a11a'
-            '9fce467043903e4e82b75cc95c96fa57facef99867bb08243adb910bbca990b8')
+source=(http://download.kde.org/stable/$pkgname/$pkgname-$pkgver.tar.xz)
+sha256sums=('132d022337140f841f51420536c31dfe07c90fa3a38878279026825f5d2526fe')
 
-prepare() {
-  cd "${srcdir}"/$pkgname-$pkgver
-#https://bugs.kde.org/show_bug.cgi?id=359679
-  patch -Np1 -i "${srcdir}"/$pkgname-gcc-fix.patch
-}
-
 build() {
   cd "${srcdir}"/$pkgname-$pkgver
 

Deleted: skrooge-gcc-fix.patch
===================================================================
--- skrooge-gcc-fix.patch	2016-05-11 17:44:48 UTC (rev 174812)
+++ skrooge-gcc-fix.patch	2016-05-11 17:46:20 UTC (rev 174813)
@@ -1,63 +0,0 @@
---- a/skgbasemodeler/skgdocument.cpp
-+++ b/skgbasemodeler/skgdocument.cpp
-@@ -42,7 +42,6 @@
- #include <qurl.h>
- 
- #include <sqlite3.h>
--#include <math.h>
- #include <cmath>
- 
- #include "skgtraces.h"
-@@ -51,11 +50,6 @@
- #include "skgpropertyobject.h"
- #include "skgtransactionmng.h"
- #include "skgreport.h"
--
--#ifdef Q_OS_WIN
--#define isnan(a) _isnan(a)
--#define isinf(a) !_finite(a)
--#endif
- 
- #ifdef SKGCIPHER
- #define SQLDRIVERNAME QStringLiteral("SKGSQLCIPHER")
-@@ -2693,7 +2687,7 @@
-     if (iValue > 0) {
-         p = '+' % p;
-     }
--    if (p.count() > 10 || isnan(iValue) || isinf(iValue)) {
-+    if (p.count() > 10 || std::isnan(iValue) || std::isinf(iValue)) {
-         p = QChar(8734);
-     }
-     return "<font color=\"" %
-
---- a/plugins/import/skrooge_import_gnc/skgimportplugingnc.cpp
-+++ b/plugins/import/skrooge_import_gnc/skgimportplugingnc.cpp
-@@ -27,7 +27,6 @@
- 
- #include <qdom.h>
- #include <qfileinfo.h>
--#include <math.h>
- #include <cmath>
- 
- #include "skgtraces.h"
-@@ -36,11 +35,6 @@
- #include "skgobjectbase.h"
- #include "skgpayeeobject.h"
- #include "skgimportexportmanager.h"
--
--#ifdef Q_OS_WIN
--#define isnan(a) _isnan(a)
--#define isinf(a) !_finite(a)
--#endif
- 
- /**
-  * This plugin factory.
-@@ -386,7 +380,7 @@
-                                         }
-                                     }
- 
--                                    if (!isnan(info.value)) {
-+                                    if (!std::isnan(info.value)) {
-                                         QChar accountType = mapIdType[info.account.text()];
-                                         if (accountType == 'C') {
-                                             suboperationsList.push_front(info);

Modified: skrooge.changelog
===================================================================
--- skrooge.changelog	2016-05-11 17:44:48 UTC (rev 174812)
+++ skrooge.changelog	2016-05-11 17:46:20 UTC (rev 174813)
@@ -1,3 +1,6 @@
+2016-05-11 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+	* skrooge 2.4.0-1
+
 2016-05-01 Jaroslav Lichtblau <svetlemodry at archlinux.org>
 	* skrooge 2.3.0-3 pacman hooks rebuild