Date: Saturday, April 4, 2015 @ 02:05:19
Author: arojas
Revision: 235407
Fix loading config file (FS#44144)
Added:
ksysguard/trunk/ksysguarddrc.patch
Modified:
ksysguard/trunk/PKGBUILD
--------------------+
PKGBUILD | 11 ++++++++---
ksysguarddrc.patch | 34 ++++++++++++++++++++++++++++++++++
2 files changed, 42 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2015-04-04 00:03:19 UTC (rev 235406)
+++ PKGBUILD 2015-04-04 00:05:19 UTC (rev 235407)
@@ -5,7 +5,7 @@
pkgname=ksysguard
pkgver=5.2.2
-pkgrel=1
+pkgrel=2
pkgdesc='Track and control the processes running in your system'
arch=('i686' 'x86_64')
url='https://userbase.kde.org/KSysGuard'
@@ -16,11 +16,16 @@
conflicts=('kdebase-workspace')
groups=('plasma')
install="${pkgname}.install"
-source=("http://download.kde.org/stable/plasma/${pkgver}/$pkgname-$pkgver.tar.xz";)
-md5sums=('7ab17df276ede1a2ced54c0dcdaa6127')
+source=("http://download.kde.org/stable/plasma/${pkgver}/$pkgname-$pkgver.tar.xz";
'ksysguarddrc.patch')
+md5sums=('7ab17df276ede1a2ced54c0dcdaa6127'
+ 'ce41545b8d3812feef4e396e98f15891')
prepare() {
mkdir build
+
+# Fix loading config file (FS#44144)
+ cd $pkgname-$pkgver
+ patch -p1 -i "$srcdir"/ksysguarddrc.patch
}
build() {
Added: ksysguarddrc.patch
===================================================================
--- ksysguarddrc.patch (rev 0)
+++ ksysguarddrc.patch 2015-04-04 00:05:19 UTC (rev 235407)
@@ -0,0 +1,34 @@
+From: David Rosca <now...@gmail.com>
+Date: Sun, 29 Mar 2015 17:19:54 +0000
+Subject: Fix opening ksysguarddrc config file
+X-Git-Url:
http://quickgit.kde.org/?p=ksysguard.git&a=commitdiff&h=5f045a9f8cb9a859b38862440ed1cd1d6eee3a9b
+---
+Fix opening ksysguarddrc config file
+
+Use KDE_INSTALL_FULL_SYSCONFDIR instead of SYSCONF_INSTALL_DIR and
+remove extra quotes in -DKSYSGUARDDRCFILE definiton.
+
+REVIEW: 123171
+---
+
+
+--- a/example/CMakeLists.txt
++++ b/example/CMakeLists.txt
+@@ -1,3 +1,3 @@
+-install( FILES ksysguarddrc DESTINATION ${SYSCONF_INSTALL_DIR} )
++install( FILES ksysguarddrc DESTINATION ${KDE_INSTALL_FULL_SYSCONFDIR} )
+ install( FILES ksysguard.notifyrc DESTINATION ${KNOTIFYRC_INSTALL_DIR} )
+
+
+--- a/ksysguardd/CMakeLists.txt
++++ b/ksysguardd/CMakeLists.txt
+@@ -3,7 +3,7 @@
+ # Laurent: Verify that we install it into (kdeprefix)/etc/ and not into /etc
+ # otherwise it's necessary to change it.
+ # into kde 3.x it was installed into /etc/
+-add_definitions(
-DKSYSGUARDDRCFILE="\\"${SYSCONF_INSTALL_DIR}/ksysguarddrc\\"" )
++add_definitions(
-DKSYSGUARDDRCFILE="${KDE_INSTALL_FULL_SYSCONFDIR}/ksysguarddrc" )
+
+ add_definitions(-DOSTYPE_${CMAKE_SYSTEM_NAME})
+
+
