Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a277dc762b5fdb71376deaae4c4b86bb70934e39
commit a277dc762b5fdb71376deaae4c4b86bb70934e39 Author: centuri0 <achev...@gmail.com> Date: Wed Feb 22 17:48:58 2012 +0100 kmymoney2-4.6.2-1-i686 * version bump diff --git a/source/kde-extra/kmymoney2/FrugalBuild b/source/kde-extra/kmymoney2/FrugalBuild index 3a339b4..a0de76e 100644 --- a/source/kde-extra/kmymoney2/FrugalBuild +++ b/source/kde-extra/kmymoney2/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: BMH1980 <bmh1...@frugalware.org> pkgname=kmymoney2 -pkgver=4.6.1 +pkgver=4.6.2 pkgrel=1 pkgdesc="Personal finance software for KDE" groups=('kde-extra') @@ -13,12 +13,14 @@ _F_sourceforge_name="kmymoney" _F_sourceforge_ext=".tar.bz2" Fconfopts="$Fconfopts --enable-gcc-hidden-visibility=no" Finclude sourceforge kde +source=("${source[@]}" "qt-4.8.patch") depends=("${depends[@]}" "kdelibs>=$_F_kde_ver" 'libofx>=0.8.2' 'kdepim>=4.4.9' \ 'libqtdesigner>=4.6.2-3' 'libqt3support' 'cppunit' 'gpgme' 'shared-mime-info' \ - 'aqbanking' 'libalkimia') + "aqbanking>=5.0.0" 'libalkimia') makedepends=("${makedepends[@]}" "boost>=1.46.1" 'kdelibs-compiletime' 'kdepimlibs-compiletime' \ 'docbook-xsl' 'doxygen' 'ksgmltools2') _F_cd_path="$_F_sourceforge_name-$pkgver" -sha1sums=('dc1e80b256795df819c6167c22dc90ffcad741db') +sha1sums=('b7dc6ce3a36c441ae2d199725db9aa2ec23fdd1f' \ + '3670fcd7a55f534e4a789f56c80f2d938f05254f') # optimization OK diff --git a/source/kde-extra/kmymoney2/qt-4.8.patch b/source/kde-extra/kmymoney2/qt-4.8.patch new file mode 100644 index 0000000..aa89fe9 --- /dev/null +++ b/source/kde-extra/kmymoney2/qt-4.8.patch @@ -0,0 +1,27 @@ +commit c736b6f08e77df72d58c5b836b7b04f6098737df +Author: Cristian OneÈ <onet.crist...@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; + }
_______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git