diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-02-11 21:15:16 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-02-11 21:15:16 +0000 |
| commit | af62434159aea3b910a59e1a734f8f20415d0570 (patch) | |
| tree | 40358ccdb1479f2a004c2ab716e9590db79366ac /pkgs/applications/office/kmymoney | |
| parent | c2e5c08d7208513414719e52121176f379354131 (diff) | |
| download | nixpkgs-af62434159aea3b910a59e1a734f8f20415d0570.tar nixpkgs-af62434159aea3b910a59e1a734f8f20415d0570.tar.gz nixpkgs-af62434159aea3b910a59e1a734f8f20415d0570.tar.bz2 nixpkgs-af62434159aea3b910a59e1a734f8f20415d0570.tar.lz nixpkgs-af62434159aea3b910a59e1a734f8f20415d0570.tar.xz nixpkgs-af62434159aea3b910a59e1a734f8f20415d0570.tar.zst nixpkgs-af62434159aea3b910a59e1a734f8f20415d0570.zip | |
kmymoney-4.6.2, fix build with qt-4.8
svn path=/nixpkgs/trunk/; revision=32230
Diffstat (limited to 'pkgs/applications/office/kmymoney')
| -rw-r--r-- | pkgs/applications/office/kmymoney/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/applications/office/kmymoney/qt-4.8.patch | 32 |
2 files changed, 35 insertions, 3 deletions
diff --git a/pkgs/applications/office/kmymoney/default.nix b/pkgs/applications/office/kmymoney/default.nix index 4bbe8400fd5..da815c5fb6b 100644 --- a/pkgs/applications/office/kmymoney/default.nix +++ b/pkgs/applications/office/kmymoney/default.nix @@ -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/; diff --git a/pkgs/applications/office/kmymoney/qt-4.8.patch b/pkgs/applications/office/kmymoney/qt-4.8.patch new file mode 100644 index 00000000000..7e9a44337cd --- /dev/null +++ b/pkgs/applications/office/kmymoney/qt-4.8.patch @@ -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&a=commitdiff&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; + } + |