summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilcio Amaral <gilcio.amaral@gmail.com>2012-09-10 14:11:05 +0200
committerRobby Workman <rworkman@slackbuilds.org>2012-09-10 16:35:38 -0500
commit30afd866cce5494f9d9b23f978b955785a379f54 (patch)
tree172723f32ef6f41de733052e871d8cb8eadc1082
parent857a3b329b37fe25a3f95f50c3385690d2b9b7ac (diff)
downloadslackbuilds-30afd866cce5494f9d9b23f978b955785a379f54.tar.gz
office/kmymoney: Added a patch for qt-4.8.x.
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
-rw-r--r--office/kmymoney/kdchart.patch27
-rw-r--r--office/kmymoney/kmymoney.SlackBuild4
2 files changed, 30 insertions, 1 deletions
diff --git a/office/kmymoney/kdchart.patch b/office/kmymoney/kdchart.patch
new file mode 100644
index 0000000000..aa89fe9794
--- /dev/null
+++ b/office/kmymoney/kdchart.patch
@@ -0,0 +1,27 @@
+commit c736b6f08e77df72d58c5b836b7b04f6098737df
+Author: Cristian OneČ› <onet.cristian@gmail.com>
+Date: Sat Feb 18 14:07:35 2012 +0200
+
+ BUG: 293448 - Since KDChart will not be updated in 4.6 patch KDChart to make it build against Qt 4.8.
+
+diff --git a/libkdchart/src/KDChartBackgroundAttributes.cpp b/libkdchart/src/KDChartBackgroundAttributes.cpp
+index f9f1520..3b86000 100644
+--- 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 KDChart::BackgroundAttributes& ba)
+ << "visible="<<ba.isVisible()
+ << "brush="<<ba.brush()
+ << "pixmapmode="<<ba.pixmapMode()
+- << "pixmap="<<ba.pixmap()
++ << "pixmap="<<QVariant(ba.pixmap())
+ << ")";
+ return dbg;
+ }
diff --git a/office/kmymoney/kmymoney.SlackBuild b/office/kmymoney/kmymoney.SlackBuild
index bfb43c4750..c176b11dcc 100644
--- a/office/kmymoney/kmymoney.SlackBuild
+++ b/office/kmymoney/kmymoney.SlackBuild
@@ -27,7 +27,7 @@
PRGNAM=kmymoney
VERSION=${VERSION:-4.6.2}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -72,6 +72,8 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+patch -p1 < $CWD/kdchart.patch
+
mkdir -p build
cd build
cmake \