Date: Saturday, April 4, 2015 @ 02:14:08
Author: arojas
Revision: 235408
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
ksysguard/repos/extra-i686/PKGBUILD
(from rev 235407, ksysguard/trunk/PKGBUILD)
ksysguard/repos/extra-i686/ksysguard.install
(from rev 235407, ksysguard/trunk/ksysguard.install)
ksysguard/repos/extra-i686/ksysguarddrc.patch
(from rev 235407, ksysguard/trunk/ksysguarddrc.patch)
ksysguard/repos/extra-x86_64/PKGBUILD
(from rev 235407, ksysguard/trunk/PKGBUILD)
ksysguard/repos/extra-x86_64/ksysguard.install
(from rev 235407, ksysguard/trunk/ksysguard.install)
ksysguard/repos/extra-x86_64/ksysguarddrc.patch
(from rev 235407, ksysguard/trunk/ksysguarddrc.patch)
Deleted:
ksysguard/repos/extra-i686/PKGBUILD
ksysguard/repos/extra-i686/ksysguard.install
ksysguard/repos/extra-x86_64/PKGBUILD
ksysguard/repos/extra-x86_64/ksysguard.install
---------------------------------+
/PKGBUILD | 90 ++++++++++++++++++++++++++++++++++++++
/ksysguard.install | 24 ++++++++++
extra-i686/PKGBUILD | 40 ----------------
extra-i686/ksysguard.install | 12 -----
extra-i686/ksysguarddrc.patch | 34 ++++++++++++++
extra-x86_64/PKGBUILD | 40 ----------------
extra-x86_64/ksysguard.install | 12 -----
extra-x86_64/ksysguarddrc.patch | 34 ++++++++++++++
8 files changed, 182 insertions(+), 104 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2015-04-04 00:05:19 UTC (rev 235407)
+++ extra-i686/PKGBUILD 2015-04-04 00:14:08 UTC (rev 235408)
@@ -1,40 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonm...@archlinux.org>
-# Contributor: Andrea Scarpino <and...@archlinux.org>
-# Contributor: Antonio Rojas
-
-pkgname=ksysguard
-pkgver=5.2.2
-pkgrel=1
-pkgdesc='Track and control the processes running in your system'
-arch=('i686' 'x86_64')
-url='https://userbase.kde.org/KSysGuard'
-license=('LGPL')
-depends=('knewstuff' 'libksysguard' 'lm_sensors' 'xdg-utils'
- 'hicolor-icon-theme' 'kdelibs4support')
-makedepends=('extra-cmake-modules' 'kdoctools' 'python')
-conflicts=('kdebase-workspace')
-groups=('plasma')
-install="${pkgname}.install"
-source=("http://download.kde.org/stable/plasma/${pkgver}/$pkgname-$pkgver.tar.xz";)
-md5sums=('7ab17df276ede1a2ced54c0dcdaa6127')
-
-prepare() {
- mkdir build
-}
-
-build() {
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DLIB_INSTALL_DIR=lib \
- -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
- -DBUILD_TESTING=OFF
- make
-}
-
-package() {
- cd build
- make DESTDIR="${pkgdir}" install
-}
Copied: ksysguard/repos/extra-i686/PKGBUILD (from rev 235407,
ksysguard/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2015-04-04 00:14:08 UTC (rev 235408)
@@ -0,0 +1,45 @@
+# $Id$
+# Maintainer: Felix Yan <felixonm...@archlinux.org>
+# Contributor: Andrea Scarpino <and...@archlinux.org>
+# Contributor: Antonio Rojas
+
+pkgname=ksysguard
+pkgver=5.2.2
+pkgrel=2
+pkgdesc='Track and control the processes running in your system'
+arch=('i686' 'x86_64')
+url='https://userbase.kde.org/KSysGuard'
+license=('LGPL')
+depends=('knewstuff' 'libksysguard' 'lm_sensors' 'xdg-utils'
+ 'hicolor-icon-theme' 'kdelibs4support')
+makedepends=('extra-cmake-modules' 'kdoctools' 'python')
+conflicts=('kdebase-workspace')
+groups=('plasma')
+install="${pkgname}.install"
+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() {
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DLIB_INSTALL_DIR=lib \
+ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
+ -DBUILD_TESTING=OFF
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="${pkgdir}" install
+}
Deleted: extra-i686/ksysguard.install
===================================================================
--- extra-i686/ksysguard.install 2015-04-04 00:05:19 UTC (rev 235407)
+++ extra-i686/ksysguard.install 2015-04-04 00:14:08 UTC (rev 235408)
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: ksysguard/repos/extra-i686/ksysguard.install (from rev 235407,
ksysguard/trunk/ksysguard.install)
===================================================================
--- extra-i686/ksysguard.install (rev 0)
+++ extra-i686/ksysguard.install 2015-04-04 00:14:08 UTC (rev 235408)
@@ -0,0 +1,12 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: ksysguard/repos/extra-i686/ksysguarddrc.patch (from rev 235407,
ksysguard/trunk/ksysguarddrc.patch)
===================================================================
--- extra-i686/ksysguarddrc.patch (rev 0)
+++ extra-i686/ksysguarddrc.patch 2015-04-04 00:14:08 UTC (rev 235408)
@@ -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})
+
+
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2015-04-04 00:05:19 UTC (rev 235407)
+++ extra-x86_64/PKGBUILD 2015-04-04 00:14:08 UTC (rev 235408)
@@ -1,40 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonm...@archlinux.org>
-# Contributor: Andrea Scarpino <and...@archlinux.org>
-# Contributor: Antonio Rojas
-
-pkgname=ksysguard
-pkgver=5.2.2
-pkgrel=1
-pkgdesc='Track and control the processes running in your system'
-arch=('i686' 'x86_64')
-url='https://userbase.kde.org/KSysGuard'
-license=('LGPL')
-depends=('knewstuff' 'libksysguard' 'lm_sensors' 'xdg-utils'
- 'hicolor-icon-theme' 'kdelibs4support')
-makedepends=('extra-cmake-modules' 'kdoctools' 'python')
-conflicts=('kdebase-workspace')
-groups=('plasma')
-install="${pkgname}.install"
-source=("http://download.kde.org/stable/plasma/${pkgver}/$pkgname-$pkgver.tar.xz";)
-md5sums=('7ab17df276ede1a2ced54c0dcdaa6127')
-
-prepare() {
- mkdir build
-}
-
-build() {
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DLIB_INSTALL_DIR=lib \
- -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
- -DBUILD_TESTING=OFF
- make
-}
-
-package() {
- cd build
- make DESTDIR="${pkgdir}" install
-}
Copied: ksysguard/repos/extra-x86_64/PKGBUILD (from rev 235407,
ksysguard/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2015-04-04 00:14:08 UTC (rev 235408)
@@ -0,0 +1,45 @@
+# $Id$
+# Maintainer: Felix Yan <felixonm...@archlinux.org>
+# Contributor: Andrea Scarpino <and...@archlinux.org>
+# Contributor: Antonio Rojas
+
+pkgname=ksysguard
+pkgver=5.2.2
+pkgrel=2
+pkgdesc='Track and control the processes running in your system'
+arch=('i686' 'x86_64')
+url='https://userbase.kde.org/KSysGuard'
+license=('LGPL')
+depends=('knewstuff' 'libksysguard' 'lm_sensors' 'xdg-utils'
+ 'hicolor-icon-theme' 'kdelibs4support')
+makedepends=('extra-cmake-modules' 'kdoctools' 'python')
+conflicts=('kdebase-workspace')
+groups=('plasma')
+install="${pkgname}.install"
+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() {
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DLIB_INSTALL_DIR=lib \
+ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
+ -DBUILD_TESTING=OFF
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="${pkgdir}" install
+}
Deleted: extra-x86_64/ksysguard.install
===================================================================
--- extra-x86_64/ksysguard.install 2015-04-04 00:05:19 UTC (rev 235407)
+++ extra-x86_64/ksysguard.install 2015-04-04 00:14:08 UTC (rev 235408)
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: ksysguard/repos/extra-x86_64/ksysguard.install (from rev 235407,
ksysguard/trunk/ksysguard.install)
===================================================================
--- extra-x86_64/ksysguard.install (rev 0)
+++ extra-x86_64/ksysguard.install 2015-04-04 00:14:08 UTC (rev 235408)
@@ -0,0 +1,12 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: ksysguard/repos/extra-x86_64/ksysguarddrc.patch (from rev 235407,
ksysguard/trunk/ksysguarddrc.patch)
===================================================================
--- extra-x86_64/ksysguarddrc.patch (rev 0)
+++ extra-x86_64/ksysguarddrc.patch 2015-04-04 00:14:08 UTC (rev 235408)
@@ -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})
+
+
