[arch-commits] Commit in kdelibs/repos (4 files)

[Andrea Scarpino]

    Date: Thursday, December 29, 2011 @ 08:52:20
  Author: andrea
Revision: 145730

Fix filepath in KNotify (FS#27757)

Added:
  kdelibs/repos/extra-i686/fix-knotify-filepath.patch
  kdelibs/repos/extra-x86_64/fix-knotify-filepath.patch
Modified:
  kdelibs/repos/extra-i686/PKGBUILD
  kdelibs/repos/extra-x86_64/PKGBUILD

-----------------------------------------+
 extra-i686/PKGBUILD                     |   11 ++++++++---
 extra-i686/fix-knotify-filepath.patch   |   13 +++++++++++++
 extra-x86_64/PKGBUILD                   |   11 ++++++++---
 extra-x86_64/fix-knotify-filepath.patch |   13 +++++++++++++
 4 files changed, 42 insertions(+), 6 deletions(-)

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2011-12-29 13:13:45 UTC (rev 145729)
+++ extra-i686/PKGBUILD	2011-12-29 13:52:20 UTC (rev 145730)
@@ -4,7 +4,7 @@
 
 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 @@
 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 @@
        # 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

Added: extra-i686/fix-knotify-filepath.patch
===================================================================
--- extra-i686/fix-knotify-filepath.patch	                        (rev 0)
+++ extra-i686/fix-knotify-filepath.patch	2011-12-29 13:52:20 UTC (rev 145730)
@@ -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);

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2011-12-29 13:13:45 UTC (rev 145729)
+++ extra-x86_64/PKGBUILD	2011-12-29 13:52:20 UTC (rev 145730)
@@ -4,7 +4,7 @@
 
 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 @@
 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 @@
        # 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

Added: extra-x86_64/fix-knotify-filepath.patch
===================================================================
--- extra-x86_64/fix-knotify-filepath.patch	                        (rev 0)
+++ extra-x86_64/fix-knotify-filepath.patch	2011-12-29 13:52:20 UTC (rev 145730)
@@ -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);