public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kde4.kmymoney: update from 4.6.2 to 4.6.4, add documentation

This commit is contained in:
Evgeny Egorochkin 2014-02-13 12:11:51 +02:00
parent 08004bc93e
commit 279e4e0a06
2 changed files with 8 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/applications/office/kmymoney/default.nix
View File

@ -1,20 +1,22 @@
{ stdenv, fetchurl, cmake, kdelibs, automoc4, kdepimlibs, gettext, pkgconfig { stdenv, fetchurl, cmake, kdelibs, automoc4, kdepimlibs, gettext, pkgconfig
, shared_mime_info, perl, boost, gpgme, gmpxx, libalkimia, libofx, libical }: , shared_mime_info, perl, boost, gpgme, gmpxx, libalkimia, libofx, libical
, doxygen }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "kmymoney-4.6.2"; name = "kmymoney-4.6.4";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/kmymoney2/${name}.tar.bz2"; url = "mirror://sourceforge/kmymoney2/${name}.tar.xz";
sha256 = "0x9bl4h2mk8dv49nnn7drv528fnl5ynvvyy7q4m22k0d5yxarn5d"; sha256 = "04n0lgi2yrx67bgjzbdbcm10pxs7l53srmp240znzw59njnjyll9";
}; };
buildInputs = [ kdepimlibs perl boost gpgme gmpxx libalkimia libofx libical ]; buildInputs = [ kdepimlibs perl boost gpgme gmpxx libalkimia libofx libical
doxygen ];
nativeBuildInputs = [ cmake automoc4 gettext shared_mime_info pkgconfig ]; nativeBuildInputs = [ cmake automoc4 gettext shared_mime_info pkgconfig ];
KDEDIRS = libalkimia; KDEDIRS = libalkimia;
patches = [ ./qgpgme.patch ./qt-4.8.patch ]; patches = [ ./qgpgme.patch ];
meta = { meta = {
homepage = http://kmymoney2.sourceforge.net/; homepage = http://kmymoney2.sourceforge.net/;

32
pkgs/applications/office/kmymoney/qt-4.8.patch
View File

@ -1,32 +0,0 @@
From: Christoph Feck <christoph@maxiom.de>
Date: Thu, 10 Nov 2011 11:34:20 +0000
Subject: Fix compile with Qt 4.8
X-Git-Url: http://quickgit.kde.org/?p=kmymoney.git&amp;a=commitdiff&amp;h=8324cfb9657d8c03f83691402386e8c5bfb29981
---
Fix compile with Qt 4.8
Sideported commits f42a0a3d878afebb298609c9886851858c56cc15 and
fe74b25bf3b78c42e95569fe467a397876bc9c04 from massif-visualizer
---
--- a/libkdchart/src/KDChartBackgroundAttributes.cpp
+++ b/libkdchart/src/KDChartBackgroundAttributes.cpp
@@ -22,6 +22,7 @@
#include "KDChartBackgroundAttributes.h"
#include <QPixmap>
+#include <QVariant>
#include <KDABLibFakes>
@@ -150,7 +151,7 @@ QDebug operator<<(QDebug dbg, const KDCh
<< "visible="<<ba.isVisible()
<< "brush="<<ba.brush()
<< "pixmapmode="<<ba.pixmapMode()
- << "pixmap="<<ba.pixmap()
+ << "pixmap="<<QVariant(ba.pixmap())
<< ")";
return dbg;
}