git » kdeplasma-addons.git » commit 2209fbf

Merge kde-unstable into trunk

author Andrea Scarpino
2013-01-31 14:46:28 UTC
committer Andrea Scarpino
2013-01-31 14:46:28 UTC
parent 4c28c5c7ab27203387addbbefef745c20d5ea381

Merge kde-unstable into trunk

PKGBUILD +21 -4

diff --git a/PKGBUILD b/PKGBUILD
index e6b88b9..21ce992 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -60,6 +60,7 @@ pkgname=('kdeplasma-addons-applets-bball'
          'kdeplasma-addons-runners-contacts'
          'kdeplasma-addons-runners-converter'
          'kdeplasma-addons-runners-datetime'
+         'kdeplasma-addons-runners-dictionary'
          'kdeplasma-addons-runners-events'
          'kdeplasma-addons-runners-katesessions'
          'kdeplasma-addons-runners-konquerorsessions'
@@ -72,25 +73,27 @@ pkgname=('kdeplasma-addons-applets-bball'
          'kdeplasma-addons-wallpapers-marble'
          'kdeplasma-addons-wallpapers-pattern'
          'kdeplasma-addons-wallpapers-potd'
+         'kdeplasma-addons-wallpapers-qmlwallpapers'
          'kdeplasma-addons-wallpapers-virus'
          'kdeplasma-addons-wallpapers-weather')
-pkgver=4.9.5
+pkgver=4.10.0
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL')
 groups=('kde' 'kdeplasma-addons')
 makedepends=('cmake' 'automoc4' 'kdebase-workspace' 'kdeedu-marble' 'eigen'
-             'scim' 'qwt' 'boost' 'libkexiv2' 'ibus' 'qoauth' 'qjson')
+             'scim' 'qwt' 'boost' 'libkexiv2' 'ibus' 'qoauth' 'mesa')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
-sha1sums=('cb57f5dbb68c76591457db213844f6cff3ad407e')
+sha1sums=('665e7126813c9a900e6c6d5f379175f98969d7a8')
 
 build() {
 	mkdir build
 	cd build
 	cmake ../${pkgbase}-${pkgver} \
 		-DCMAKE_BUILD_TYPE=Release \
-        -DCMAKE_SKIP_RPATH=ON \
+		-DKDE4_BUILD_TESTS=OFF \
+		-DCMAKE_SKIP_RPATH=ON \
 		-DCMAKE_INSTALL_PREFIX=/usr
 	make
 }
@@ -527,6 +530,13 @@ package_kdeplasma-addons-runners-datetime() {
 	make DESTDIR=$pkgdir install
 }
 
+package_kdeplasma-addons-runners-dictionary() {
+	pkgdesc='Define words'
+	depends=('kdebase-workspace')
+	cd $srcdir/build/runners/dictionary
+	make DESTDIR=$pkgdir install
+}
+
 package_kdeplasma-addons-runners-events() {
 	pkgdesc='Calendar Events runner'
 	depends=('kdebase-workspace')
@@ -612,6 +622,13 @@ package_kdeplasma-addons-wallpapers-potd() {
         make DESTDIR=$pkgdir install
 }
 
+package_kdeplasma-addons-wallpapers-qmlwallpapers() {
+	pkgdesc='Animated Wallpapers'
+	depends=('kdebase-workspace')
+	cd $srcdir/build/wallpapers/qmlwallpapers
+	make DESTDIR=$pkgdir install
+}
+
 package_kdeplasma-addons-wallpapers-virus() {
 	pkgdesc='Virus'
 	depends=('kdebase-workspace')