Fri Dec 30 23:14:51 UTC 2011

3 files changed, 27 insertions, 8 deletions

diff --git a/kde-unstable/kdelibs/PKGBUILD b/kde-unstable/kdelibs/PKGBUILD
index da14bb45f..ab4146f9f 100644
--- a/kde-unstable/kdelibs/PKGBUILD
+++ b/kde-unstable/kdelibs/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 145655 2011-12-26 11:58:35Z andrea $
+# $Id: PKGBUILD 145732 2011-12-29 13:54:39Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kdelibs
 pkgver=4.7.95
-pkgrel=3
+pkgrel=4
 pkgdesc="KDE Core Libraries"
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -17,10 +17,12 @@ makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell')
 replaces=('kdelibs-experimental')
 install=${pkgname}.install
 source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
-        'kde-applications-menu.patch' 'archlinux-menu.patch')
+        'kde-applications-menu.patch' 'archlinux-menu.patch'
+        'fix-knotify-filepath.patch')
 sha1sums=('6760074426f19152865cb7f8089b34feb5abadeb'
           '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
-          '63a850ab4196b9d06934f2b4a13acd9f7739bc67')
+          '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
+          '3312f6005aa56a9b992c74008fe5b314f1c8ffba')
 
 build() {
        cd "${srcdir}"/${pkgname}-${pkgver}
@@ -30,6 +32,9 @@ build() {
        # add Archlinux menu entry
        patch -p1 -i "${srcdir}"/archlinux-menu.patch
 
+       # https://bugs.kde.org/show_bug.cgi?id=285028
+       patch -p1 -i "${srcdir}"/fix-knotify-filepath.patch
+
        cd "${srcdir}"
        mkdir build
        cd build
diff --git a/kde-unstable/kdelibs/fix-knotify-filepath.patch b/kde-unstable/kdelibs/fix-knotify-filepath.patch
new file mode 100644
index 000000000..2cd995e97
--- /dev/null
+++ b/kde-unstable/kdelibs/fix-knotify-filepath.patch
@@ -0,0 +1,13 @@
+diff --git a/knotify/config/knotifyconfigactionswidget.cpp b/knotify/config/knotifyconfigactionswidget.cpp
+index 88d18b6..0e76658 100644
+--- a/knotify/config/knotifyconfigactionswidget.cpp
++++ b/knotify/config/knotifyconfigactionswidget.cpp
+@@ -128,7 +128,7 @@ void KNotifyConfigActionsWidget::slotPlay(  )
+ 	KUrl soundURL = m_ui.Sound_select->url();
+ 	if ( soundURL.isRelative() )
+ 	{
+-		QString soundString = soundURL.toLocalFile();
++		QString soundString = m_ui.Sound_select->text();
+ 		// we need a way to get the application name in order to ba able to do this :
+ 		/*QString search = QString("%1/sounds/%2").arg(config->appname).arg(soundFile);
+ 		search = KGlobal::mainComponent().dirs()->findResource("data", search);
diff --git a/kde-unstable/kdeplasma-addons/PKGBUILD b/kde-unstable/kdeplasma-addons/PKGBUILD
index 3bbd178f3..569b8c831 100644
--- a/kde-unstable/kdeplasma-addons/PKGBUILD
+++ b/kde-unstable/kdeplasma-addons/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 145665 2011-12-26 12:35:54Z andrea $
+# $Id: PKGBUILD 145734 2011-12-29 15:43:39Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -75,13 +75,13 @@ pkgname=('kdeplasma-addons-applets-bball'
          'kdeplasma-addons-wallpapers-virus'
          'kdeplasma-addons-wallpapers-weather')
 pkgver=4.7.95
-pkgrel=2
+pkgrel=3
 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')
+             'scim' 'qwt' 'boost' 'libkexiv2' 'ibus')
 source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
 sha1sums=('b9207824aa8b764f203ef436111999fea429feb7')
 
@@ -232,7 +232,8 @@ package_kdeplasma-addons-applets-kimpanel() {
 	pkgdesc='A generic input method panel for Oriental languages'
 	depends=('kdebase-workspace' 'kdeplasma-addons-libs')
 	optdepends=('scim: SCIM backend'
-		'fcitx: FCITX backend')
+		        'fcitx: FCITX backend'
+                'ibus: IBUS backend')
 	cd $srcdir/build/applets/kimpanel
 	make DESTDIR=$pkgdir install
 }