3
0
Fork 0
forked from mirrors/nixpkgs

kmymoney-4.6.2, fix build with qt-4.8

svn path=/nixpkgs/trunk/; revision=32230
This commit is contained in:
Yury G. Kudryashov 2012-02-11 21:15:16 +00:00
parent c2e5c08d72
commit af62434159
3 changed files with 37 additions and 5 deletions

View file

@ -2,11 +2,11 @@
, shared_mime_info, perl, boost, gpgme, gmpxx, libalkimia, libofx, libical }:
stdenv.mkDerivation rec {
name = "kmymoney-4.6.1";
name = "kmymoney-4.6.2";
src = fetchurl {
url = "mirror://sourceforge/kmymoney2/${name}.tar.bz2";
sha256 = "0ympq70z0a9zrs623jznj6hnjph2rdhpra0np2mqm1mmy72bkjjz";
sha256 = "0x9bl4h2mk8dv49nnn7drv528fnl5ynvvyy7q4m22k0d5yxarn5d";
};
buildInputs = [ kdepimlibs perl boost gpgme gmpxx libalkimia libofx libical ];
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
KDEDIRS = libalkimia;
patches = [ ./qgpgme.patch ];
patches = [ ./qgpgme.patch ./qt-4.8.patch ];
meta = {
homepage = http://kmymoney2.sourceforge.net/;

View file

@ -0,0 +1,32 @@
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;
}

View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl, kdelibs, gmpxx }:
stdenv.mkDerivation rec {
name = "libalkimia-4.3.1";
name = "libalkimia-4.3.2";
src = fetchurl {
url = "http://kde-apps.org/CONTENT/content-files/137323-${name}.tar.bz2";
sha256 = "1l5jgf0wc4s1sk4q5g2v78r9s7dg9k5ikm3pip6cbhjhfc0nv939";
sha256 = "1p7bzi6mz5ymsfsxikk8m1cvi35zirb4fps9axkqlm6mjbwrldv4";
};
patchPhase = "sed -e 's/KDE4_DATA_DIR/DATA_INSTALL_DIR/' -i CMakeLists.txt";