[gentoo-commits] proj/kde:master commit in: app-office/skrooge/files/, app-office/skrooge/

[Michael Palimaka]

commit:     dfe1eb2f6b02d2c665ef564dbfab9b4757b70ace
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Wed Feb 24 19:13:27 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Feb 24 19:13:27 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=dfe1eb2f

app-office/skrooge: Fix build with glibc-2.23

Package-Manager: portage-2.2.27

 .../skrooge/files/skrooge-2.3.0-glibc-2.23.patch   | 74 ++++++++++++++++++++++
 app-office/skrooge/skrooge-2.3.0.ebuild            |  2 +
 2 files changed, 76 insertions(+)

diff --git a/app-office/skrooge/files/skrooge-2.3.0-glibc-2.23.patch b/app-office/skrooge/files/skrooge-2.3.0-glibc-2.23.patch
new file mode 100644
index 0000000..3df4428
--- /dev/null
+++ b/app-office/skrooge/files/skrooge-2.3.0-glibc-2.23.patch
@@ -0,0 +1,74 @@
+From: Stephane Mankowski <stephane@×××××××××.fr>
+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=\"" %
+

diff --git a/app-office/skrooge/skrooge-2.3.0.ebuild b/app-office/skrooge/skrooge-2.3.0.ebuild
index c623b30..a8f6c71 100644
--- a/app-office/skrooge/skrooge-2.3.0.ebuild
+++ b/app-office/skrooge/skrooge-2.3.0.ebuild
@@ -77,6 +77,8 @@ RESTRICT="test"
 
 DOCS=( AUTHORS CHANGELOG README TODO )
 
+PATCHES=( "${FILESDIR}/${P}-glibc-2.23.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		-DSKG_BUILD_TEST=$(usex test)