From 5d738f85840804ee493d267784d9cce5dc52f535 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 30 Dec 2011 23:14:51 +0000 Subject: Fri Dec 30 23:14:51 UTC 2011 --- extra/kdelibs/PKGBUILD | 13 +++++++++---- extra/kdelibs/fix-knotify-filepath.patch | 13 +++++++++++++ 2 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 extra/kdelibs/fix-knotify-filepath.patch (limited to 'extra/kdelibs') diff --git a/extra/kdelibs/PKGBUILD b/extra/kdelibs/PKGBUILD index b3b8fc901..cba95a38d 100644 --- a/extra/kdelibs/PKGBUILD +++ b/extra/kdelibs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 145657 2011-12-26 12:00:06Z andrea $ +# $Id: PKGBUILD 145730 2011-12-29 13:52:20Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdelibs pkgver=4.7.4 -pkgrel=3 +pkgrel=4 pkgdesc="KDE Core Libraries" arch=('i686' 'x86_64') url='http://www.kde.org' @@ -18,10 +18,12 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'avahi' 'libgl' 'hspell') replaces=('kdelibs-experimental') install='kdelibs.install' source=("http://download.kde.org/stable/${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=('78b25e93a8c70ccc1e0f117cce960fe4e1deb8d8' '86ee8c8660f19de8141ac99cd6943964d97a1ed7' - '63a850ab4196b9d06934f2b4a13acd9f7739bc67') + '63a850ab4196b9d06934f2b4a13acd9f7739bc67' + '3312f6005aa56a9b992c74008fe5b314f1c8ffba') build() { cd "${srcdir}"/${pkgname}-${pkgver} @@ -31,6 +33,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/extra/kdelibs/fix-knotify-filepath.patch b/extra/kdelibs/fix-knotify-filepath.patch new file mode 100644 index 000000000..2cd995e97 --- /dev/null +++ b/extra/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); -- cgit v1.2.3-54-g00ecf