[packages/kmymoney2] - types patch (fixes build when size_t is not unsigned long)

qboosh qboosh at pld-linux.org
Fri Feb 10 22:31:59 CET 2017


commit 8aacd4dbb3d576cef55c8e49789f875dc374f402
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Fri Feb 10 22:33:24 2017 +0100

    - types patch (fixes build when size_t is not unsigned long)

 kmymoney2-types.patch | 35 +++++++++++++++++++++++++++++++++++
 kmymoney2.spec        |  2 ++
 2 files changed, 37 insertions(+)
---
diff --git a/kmymoney2.spec b/kmymoney2.spec
index 7d8f0dc..c1d52a8 100644
--- a/kmymoney2.spec
+++ b/kmymoney2.spec
@@ -19,6 +19,7 @@ Source0:	http://downloads.sourceforge.net/kmymoney2/%{real_name}-%{version}.tar.
 URL:		http://kmymoney2.sourceforge.net/
 Patch0:		%{name}-desktop.patch
 Patch1:		%{name}-man.patch
+Patch2:		%{name}-types.patch
 %{?with_kbanking:BuildRequires:	aqbanking-devel >= 5.5.1}
 BuildRequires:	automoc4
 BuildRequires:	boost-devel >= 1.33.1
@@ -108,6 +109,7 @@ Wtyczka KBanking dla KMyMoney2.
 %setup -q -n kmymoney-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 install -d build
diff --git a/kmymoney2-types.patch b/kmymoney2-types.patch
new file mode 100644
index 0000000..e951f61
--- /dev/null
+++ b/kmymoney2-types.patch
@@ -0,0 +1,35 @@
+--- kmymoney-4.8.0/kmymoney/mymoney/storage/mymoneyseqaccessmgrtest.cpp.orig	2016-06-14 21:16:15.585035116 +0200
++++ kmymoney-4.8.0/kmymoney/mymoney/storage/mymoneyseqaccessmgrtest.cpp	2017-02-10 22:14:40.088737421 +0100
+@@ -41,6 +41,11 @@
+   delete m;
+ }
+ 
++inline size_t sz(unsigned val)
++{
++  return static_cast<size_t>(val);
++}
++
+ void MyMoneySeqAccessMgrTest::testEmptyConstructor()
+ {
+   MyMoneyPayee user = m->user();
+@@ -58,13 +63,13 @@
+   QCOMPARE(m->m_nextPayeeID, 0ul);
+   QCOMPARE(m->m_nextScheduleID, 0ul);
+   QCOMPARE(m->m_nextReportID, 0ul);
+-  QCOMPARE(m->m_institutionList.count(), 0ul);
+-  QCOMPARE(m->m_accountList.count(), 5ul);
+-  QCOMPARE(m->m_transactionList.count(), 0ul);
+-  QCOMPARE(m->m_transactionKeys.count(), 0ul);
+-  QCOMPARE(m->m_payeeList.count(), 0ul);
+-  QCOMPARE(m->m_tagList.count(), 0ul);
+-  QCOMPARE(m->m_scheduleList.count(), 0ul);
++  QCOMPARE(m->m_institutionList.count(), sz(0u));
++  QCOMPARE(m->m_accountList.count(), sz(5u));
++  QCOMPARE(m->m_transactionList.count(), sz(0u));
++  QCOMPARE(m->m_transactionKeys.count(), sz(0u));
++  QCOMPARE(m->m_payeeList.count(), sz(0u));
++  QCOMPARE(m->m_tagList.count(), sz(0u));
++  QCOMPARE(m->m_scheduleList.count(), sz(0u));
+ 
+   QCOMPARE(m->m_dirty, false);
+   QCOMPARE(m->m_creationDate, QDate::currentDate());
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kmymoney2.git/commitdiff/8aacd4dbb3d576cef55c8e49789f875dc374f402



More information about the pld-cvs-commit mailing list