Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e9cd23189d45c912736af1ae668d8bb52f9c671d
commit e9cd23189d45c912736af1ae668d8bb52f9c671d Author: crazy <[email protected]> Date: Wed May 18 13:45:07 2016 +0200 skrooge-2.4.0-1-x86_64 * Version bump diff --git a/source/kde5-extra/skrooge/FrugalBuild b/source/kde5-extra/skrooge/FrugalBuild index f45fcd9..c614c93 100644 --- a/source/kde5-extra/skrooge/FrugalBuild +++ b/source/kde5-extra/skrooge/FrugalBuild @@ -4,19 +4,18 @@ # Contributor: Devil505 <[email protected]> pkgname=skrooge -pkgver=2.3.0 -pkgrel=2 +pkgver=2.4.0 +pkgrel=1 pkgdesc="Personal finances manager for KDE5, allowing you to keep track of your incomes and expenses" url="http://skrooge.org"; Finclude kf5 depends=("knotifyconfig>=$_F_kf5_full" "qt5-webkit>=$_F_kdever_qt5" "qt5-svg>=$_F_kdever_qt5" "kdelibs4support>=$_F_kf5_full" \ 'qca>=2.1.1-5' 'grantlee>=5.0.0' 'sqlcipher>=3.3.1' "krunner5>=$_F_kf5_full" "knewstuff>=$_F_kf5_full") -makedepends+=('shared-mime-info' 'libofx' "qt5-tools>=$_F_kdever_qt5") +makedepends+=('shared-mime-info' 'libofx' "qt5-tools>=$_F_kdever_qt5" "kdoctools") up2date="Flasttar $_F_kde_mirror/stable/skrooge/" -source=($_F_kde_mirror/stable/$pkgname/${pkgname}-${pkgver}.tar.xz bug-359679.patch) +source=($_F_kde_mirror/stable/$pkgname/${pkgname}-${pkgver}.tar.xz) groups=('kde5-extra') archs=('i686' 'x86_64') -sha1sums=('8249c964b2aa8e78d7a0f8fd687d29507e20d588' \ - 'd12a1c6c246c459df9cba334a5d79ed43b890b84') +sha1sums=('d1e64235fac31c4aae0e2412269a11ca1b25b26a') CXXFLAGS+=' -std=c++11' # optimization OK diff --git a/source/kde5-extra/skrooge/bug-359679.patch b/source/kde5-extra/skrooge/bug-359679.patch deleted file mode 100644 index 1606c69..0000000 --- a/source/kde5-extra/skrooge/bug-359679.patch +++ /dev/null @@ -1,73 +0,0 @@ -From: Stephane Mankowski <[email protected]> -Date: Wed, 24 Feb 2016 14:07:00 +0000 -Subject: Building the v2.3.0 package on Arch Linux dies with an error 'isnan' was not declared in this scope -X-Git-Url: http://quickgit.kde.org/?p=skrooge.git&a=commitdiff&h=dacb104d4c803679be744c198c70a871c2078dd0 ---- -Building the v2.3.0 package on Arch Linux dies with an error 'isnan' was not declared in this scope -BUG:359679 ---- - ---- 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); - ---- 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=\"" % - _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
