pyrox.dev
kde4.kmymoney: update from 4.6.2 to 4.6.4, add documentation
+8
-6
pkgs/applications/office/kmymoney/default.nix
+8
-6
pkgs/applications/office/kmymoney/default.nix
···
1
1
{ stdenv, fetchurl, cmake, kdelibs, automoc4, kdepimlibs, gettext, pkgconfig
2
-
, shared_mime_info, perl, boost, gpgme, gmpxx, libalkimia, libofx, libical }:
2
+
, shared_mime_info, perl, boost, gpgme, gmpxx, libalkimia, libofx, libical
3
+
, doxygen }:
3
4
4
5
stdenv.mkDerivation rec {
5
-
name = "kmymoney-4.6.2";
6
+
name = "kmymoney-4.6.4";
6
7
7
8
src = fetchurl {
8
-
url = "mirror://sourceforge/kmymoney2/${name}.tar.bz2";
9
-
sha256 = "0x9bl4h2mk8dv49nnn7drv528fnl5ynvvyy7q4m22k0d5yxarn5d";
9
+
url = "mirror://sourceforge/kmymoney2/${name}.tar.xz";
10
+
sha256 = "04n0lgi2yrx67bgjzbdbcm10pxs7l53srmp240znzw59njnjyll9";
10
11
};
11
12
12
-
buildInputs = [ kdepimlibs perl boost gpgme gmpxx libalkimia libofx libical ];
13
+
buildInputs = [ kdepimlibs perl boost gpgme gmpxx libalkimia libofx libical
14
+
doxygen ];
13
15
nativeBuildInputs = [ cmake automoc4 gettext shared_mime_info pkgconfig ];
14
16
15
17
KDEDIRS = libalkimia;
16
18
17
-
patches = [ ./qgpgme.patch ./qt-4.8.patch ];
19
+
patches = [ ./qgpgme.patch ];
18
20
19
21
meta = {
20
22
homepage = http://kmymoney2.sourceforge.net/;
-32
pkgs/applications/office/kmymoney/qt-4.8.patch
-32
pkgs/applications/office/kmymoney/qt-4.8.patch
···
1
-
From: Christoph Feck <christoph@maxiom.de>
2
-
Date: Thu, 10 Nov 2011 11:34:20 +0000
3
-
Subject: Fix compile with Qt 4.8
4
-
X-Git-Url: http://quickgit.kde.org/?p=kmymoney.git&a=commitdiff&h=8324cfb9657d8c03f83691402386e8c5bfb29981
5
-
---
6
-
Fix compile with Qt 4.8
7
-
8
-
Sideported commits f42a0a3d878afebb298609c9886851858c56cc15 and
9
-
fe74b25bf3b78c42e95569fe467a397876bc9c04 from massif-visualizer
10
-
---
11
-
12
-
13
-
--- a/libkdchart/src/KDChartBackgroundAttributes.cpp
14
-
+++ b/libkdchart/src/KDChartBackgroundAttributes.cpp
15
-
@@ -22,6 +22,7 @@
16
-
17
-
#include "KDChartBackgroundAttributes.h"
18
-
#include <QPixmap>
19
-
+#include <QVariant>
20
-
21
-
#include <KDABLibFakes>
22
-
23
-
@@ -150,7 +151,7 @@ QDebug operator<<(QDebug dbg, const KDCh
24
-
<< "visible="<<ba.isVisible()
25
-
<< "brush="<<ba.brush()
26
-
<< "pixmapmode="<<ba.pixmapMode()
27
-
- << "pixmap="<<ba.pixmap()
28
-
+ << "pixmap="<<QVariant(ba.pixmap())
29
-
<< ")";
30
-
return dbg;
31
-
}
32
-