diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-07-25 11:33:12 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-07-25 11:33:12 -0300 |
| commit | 8b3071c77c79bbf0f373ca9b8ce0795c55d03669 (patch) | |
| tree | 0b9c9ccac567cbaf87b22dcd32f10ceed2db065c /extra/kdeplasma-addons | |
| parent | 0d18015803bebeb58911bf791653597291056095 (diff) | |
| parent | 43983783a3e8bf61896eb93a2858a14bbaf3a53b (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/compiz-bcop/PKGBUILD
community/compiz-fusion-plugins-extra/PKGBUILD
community/compiz-fusion-plugins-main/PKGBUILD
community/emerald/PKGBUILD
community/gmic/PKGBUILD
community/libcompizconfig/PKGBUILD
core/xinetd/PKGBUILD
extra/archboot/PKGBUILD
extra/kdeplasma-addons/PKGBUILD
extra/kipi-plugins/PKGBUILD
extra/libmpdclient/PKGBUILD
extra/live-media/PKGBUILD
extra/mysql/PKGBUILD
extra/pyopenssl/PKGBUILD
extra/r/PKGBUILD
extra/telepathy-mission-control/PKGBUILD
libre/libretools/PKGBUILD
multilib-testing/lib32-mesa/PKGBUILD
multilib/lib32-libldap/PKGBUILD
multilib/lib32-libldap/ntlm.patch
multilib/wine/PKGBUILD
testing/mesa/PKGBUILD
Diffstat (limited to 'extra/kdeplasma-addons')
| -rw-r--r-- | extra/kdeplasma-addons/PKGBUILD | 14 | ||||
| -rw-r--r-- | extra/kdeplasma-addons/kdeobservatory-qwt6.patch | 12 |
2 files changed, 22 insertions, 4 deletions
diff --git a/extra/kdeplasma-addons/PKGBUILD b/extra/kdeplasma-addons/PKGBUILD index 934b2b469..f17c7c32d 100644 --- a/extra/kdeplasma-addons/PKGBUILD +++ b/extra/kdeplasma-addons/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 130264 2011-07-04 19:28:03Z andrea $ +# $Id: PKGBUILD 131799 2011-07-15 11:47:07Z ronald $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -73,18 +73,24 @@ pkgname=('kdeplasma-addons-applets-bball' 'kdeplasma-addons-wallpapers-virus' 'kdeplasma-addons-wallpapers-weather') pkgver=4.6.5 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' license=('GPL' 'LGPL') groups=('kde' 'kdeplasma-addons') makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-workspace' 'kdegraphics-libs' 'kdeedu-marble' 'eigen' 'scim' 'qwt' 'boost') -source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") -sha1sums=('3bce5e41160ec318dbea9128c3e9104a4428deb8') +source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2" + "kdeobservatory-qwt6.patch") +sha1sums=('3bce5e41160ec318dbea9128c3e9104a4428deb8' + '140b2611fb23aed583c2691a77870e5c48152409') build() { cd ${srcdir} + + # qwt 6.0.0 patch + patch -Np0 -i ${srcdir}/kdeobservatory-qwt6.patch + mkdir build cd build cmake ../${pkgbase}-${pkgver} \ diff --git a/extra/kdeplasma-addons/kdeobservatory-qwt6.patch b/extra/kdeplasma-addons/kdeobservatory-qwt6.patch new file mode 100644 index 000000000..46ba0345d --- /dev/null +++ b/extra/kdeplasma-addons/kdeobservatory-qwt6.patch @@ -0,0 +1,12 @@ +diff -Naur kdeplasma-addons-4.6.5.bak/applets/kdeobservatory/src/commithistoryview.cpp kdeplasma-addons-4.6.5/applets/kdeobservatory/src/commithistoryview.cpp +--- kdeplasma-addons-4.6.5.bak/applets/kdeobservatory/src/commithistoryview.cpp 2011-07-15 14:04:17.323188525 +0200 ++++ kdeplasma-addons-4.6.5/applets/kdeobservatory/src/commithistoryview.cpp 2011-07-15 14:04:39.186521458 +0200 +@@ -124,7 +124,7 @@ + plot->setCanvasBackground(QColor(0, 0, 140)); + + QwtPlotCurve *curve = new QwtPlotCurve; +- curve->setData(x, y, j); ++ curve->setSamples(x, y, j); + delete []x; + delete []y; + |