Date: Tuesday, March 24, 2015 @ 21:05:42 Author: arojas Revision: 234645
archrelease: copy trunk to extra-i686, extra-x86_64 Added: ksysguard/repos/extra-i686/PKGBUILD (from rev 234644, ksysguard/trunk/PKGBUILD) ksysguard/repos/extra-i686/ksysguard.install (from rev 234644, ksysguard/trunk/ksysguard.install) ksysguard/repos/extra-x86_64/PKGBUILD (from rev 234644, ksysguard/trunk/PKGBUILD) ksysguard/repos/extra-x86_64/ksysguard.install (from rev 234644, ksysguard/trunk/ksysguard.install) Deleted: ksysguard/repos/extra-i686/PKGBUILD ksysguard/repos/extra-i686/a148102e8ed56c7a8d0f790fad2f9366b27882d4.patch ksysguard/repos/extra-i686/ksysguard.install ksysguard/repos/extra-x86_64/PKGBUILD ksysguard/repos/extra-x86_64/a148102e8ed56c7a8d0f790fad2f9366b27882d4.patch ksysguard/repos/extra-x86_64/ksysguard.install -------------------------------------------------------------+ /PKGBUILD | 80 ++++++++++ /ksysguard.install | 24 +++ extra-i686/PKGBUILD | 46 ----- extra-i686/a148102e8ed56c7a8d0f790fad2f9366b27882d4.patch | 53 ------ extra-i686/ksysguard.install | 12 - extra-x86_64/PKGBUILD | 46 ----- extra-x86_64/a148102e8ed56c7a8d0f790fad2f9366b27882d4.patch | 53 ------ extra-x86_64/ksysguard.install | 12 - 8 files changed, 104 insertions(+), 222 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2015-03-24 20:05:21 UTC (rev 234644) +++ extra-i686/PKGBUILD 2015-03-24 20:05:42 UTC (rev 234645) @@ -1,46 +0,0 @@ -# $Id$ -# Maintainer: Felix Yan <felixonm...@archlinux.org> -# Contributor: Andrea Scarpino <and...@archlinux.org> -# Contributor: Antonio Rojas - -pkgname=ksysguard -pkgver=5.2.1 -pkgrel=2 -pkgdesc='KSysGuard' -arch=('i686' 'x86_64') -url='https://projects.kde.org/projects/kde/workspace/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" - a148102e8ed56c7a8d0f790fad2f9366b27882d4.patch) -md5sums=('065e0efe3bd28f8e8565b109dc64f647' - '8c12f14d885c4d59cb35c1b9e0281d5b') - -prepare() { - mkdir build - - # FS#44104 - cd $pkgname-$pkgver - patch -p1 -i ../a148102e8ed56c7a8d0f790fad2f9366b27882d4.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 -} Copied: ksysguard/repos/extra-i686/PKGBUILD (from rev 234644, ksysguard/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2015-03-24 20:05:42 UTC (rev 234645) @@ -0,0 +1,40 @@ +# $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 +} Deleted: extra-i686/a148102e8ed56c7a8d0f790fad2f9366b27882d4.patch =================================================================== --- extra-i686/a148102e8ed56c7a8d0f790fad2f9366b27882d4.patch 2015-03-24 20:05:21 UTC (rev 234644) +++ extra-i686/a148102e8ed56c7a8d0f790fad2f9366b27882d4.patch 2015-03-24 20:05:42 UTC (rev 234645) @@ -1,53 +0,0 @@ -commit a148102e8ed56c7a8d0f790fad2f9366b27882d4 -Author: Hrvoje Senjan <hrvoje.sen...@gmail.com> -Date: Thu Feb 26 15:57:22 2015 +0100 - - Register KSysguard to DBus - - Unbreaks starting the app via KRun - - Reviewed-by: Bhushan Shah - -diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt -index f021f0b..3f0ce93 100644 ---- a/gui/CMakeLists.txt -+++ b/gui/CMakeLists.txt -@@ -54,6 +54,7 @@ target_compile_definitions(kdeinit_ksysguard PRIVATE -DPROJECT_VERSION="${PROJEC - target_link_libraries(kdeinit_ksysguard - KF5::ProcessUi - KF5::SignalPlotter -+ KF5::DBusAddons - KF5::ItemViews - KF5::NewStuff - KF5::SysGuard -diff --git a/gui/ksysguard.cpp b/gui/ksysguard.cpp -index 919fd89..fa77506 100644 ---- a/gui/ksysguard.cpp -+++ b/gui/ksysguard.cpp -@@ -37,7 +37,7 @@ - #include <k4aboutdata.h> - #include <kactioncollection.h> - #include <kapplication.h> -- -+#include <KDBusService> - #include <kdebug.h> - #include <kedittoolbar.h> - #include <kglobal.h> -@@ -533,6 +533,7 @@ extern "C" Q_DECL_EXPORT int kdemain( int argc, char** argv ) - KAboutData aboutData( "ksysguard", i18n( "System Monitor" ), - PROJECT_VERSION, i18n(Description), KAboutLicense::GPL, - i18n( "(c) 1996-2008 The KDE System Monitor Developers" ) ); -+ aboutData.setOrganizationDomain(QByteArray("kde.org")); - aboutData.addAuthor( i18n("John Tapsell"), i18n("Current Maintainer"), "john.taps...@kde.org" ); - aboutData.addAuthor( i18n("Chris Schlaeger"), i18n("Previous Maintainer"), "c...@kde.org" ); - aboutData.addAuthor( i18n("Greg Martyn"), QString(), "greg.mar...@gmail.com" ); -@@ -585,6 +586,9 @@ extern "C" Q_DECL_EXPORT int kdemain( int argc, char** argv ) - Toplevel->show(); - KSGRD::SensorMgr->setBroadcaster( Toplevel ); // SensorMgr uses a QPointer for toplevel, so it is okay if Toplevel is deleted first - -+ // register to DBus -+ const KDBusService dbusService(KDBusService::Multiple); -+ - // run the application - int result = app.exec(); - Deleted: extra-i686/ksysguard.install =================================================================== --- extra-i686/ksysguard.install 2015-03-24 20:05:21 UTC (rev 234644) +++ extra-i686/ksysguard.install 2015-03-24 20:05:42 UTC (rev 234645) @@ -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 234644, ksysguard/trunk/ksysguard.install) =================================================================== --- extra-i686/ksysguard.install (rev 0) +++ extra-i686/ksysguard.install 2015-03-24 20:05:42 UTC (rev 234645) @@ -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 +} Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2015-03-24 20:05:21 UTC (rev 234644) +++ extra-x86_64/PKGBUILD 2015-03-24 20:05:42 UTC (rev 234645) @@ -1,46 +0,0 @@ -# $Id$ -# Maintainer: Felix Yan <felixonm...@archlinux.org> -# Contributor: Andrea Scarpino <and...@archlinux.org> -# Contributor: Antonio Rojas - -pkgname=ksysguard -pkgver=5.2.1 -pkgrel=2 -pkgdesc='KSysGuard' -arch=('i686' 'x86_64') -url='https://projects.kde.org/projects/kde/workspace/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" - a148102e8ed56c7a8d0f790fad2f9366b27882d4.patch) -md5sums=('065e0efe3bd28f8e8565b109dc64f647' - '8c12f14d885c4d59cb35c1b9e0281d5b') - -prepare() { - mkdir build - - # FS#44104 - cd $pkgname-$pkgver - patch -p1 -i ../a148102e8ed56c7a8d0f790fad2f9366b27882d4.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 -} Copied: ksysguard/repos/extra-x86_64/PKGBUILD (from rev 234644, ksysguard/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2015-03-24 20:05:42 UTC (rev 234645) @@ -0,0 +1,40 @@ +# $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 +} Deleted: extra-x86_64/a148102e8ed56c7a8d0f790fad2f9366b27882d4.patch =================================================================== --- extra-x86_64/a148102e8ed56c7a8d0f790fad2f9366b27882d4.patch 2015-03-24 20:05:21 UTC (rev 234644) +++ extra-x86_64/a148102e8ed56c7a8d0f790fad2f9366b27882d4.patch 2015-03-24 20:05:42 UTC (rev 234645) @@ -1,53 +0,0 @@ -commit a148102e8ed56c7a8d0f790fad2f9366b27882d4 -Author: Hrvoje Senjan <hrvoje.sen...@gmail.com> -Date: Thu Feb 26 15:57:22 2015 +0100 - - Register KSysguard to DBus - - Unbreaks starting the app via KRun - - Reviewed-by: Bhushan Shah - -diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt -index f021f0b..3f0ce93 100644 ---- a/gui/CMakeLists.txt -+++ b/gui/CMakeLists.txt -@@ -54,6 +54,7 @@ target_compile_definitions(kdeinit_ksysguard PRIVATE -DPROJECT_VERSION="${PROJEC - target_link_libraries(kdeinit_ksysguard - KF5::ProcessUi - KF5::SignalPlotter -+ KF5::DBusAddons - KF5::ItemViews - KF5::NewStuff - KF5::SysGuard -diff --git a/gui/ksysguard.cpp b/gui/ksysguard.cpp -index 919fd89..fa77506 100644 ---- a/gui/ksysguard.cpp -+++ b/gui/ksysguard.cpp -@@ -37,7 +37,7 @@ - #include <k4aboutdata.h> - #include <kactioncollection.h> - #include <kapplication.h> -- -+#include <KDBusService> - #include <kdebug.h> - #include <kedittoolbar.h> - #include <kglobal.h> -@@ -533,6 +533,7 @@ extern "C" Q_DECL_EXPORT int kdemain( int argc, char** argv ) - KAboutData aboutData( "ksysguard", i18n( "System Monitor" ), - PROJECT_VERSION, i18n(Description), KAboutLicense::GPL, - i18n( "(c) 1996-2008 The KDE System Monitor Developers" ) ); -+ aboutData.setOrganizationDomain(QByteArray("kde.org")); - aboutData.addAuthor( i18n("John Tapsell"), i18n("Current Maintainer"), "john.taps...@kde.org" ); - aboutData.addAuthor( i18n("Chris Schlaeger"), i18n("Previous Maintainer"), "c...@kde.org" ); - aboutData.addAuthor( i18n("Greg Martyn"), QString(), "greg.mar...@gmail.com" ); -@@ -585,6 +586,9 @@ extern "C" Q_DECL_EXPORT int kdemain( int argc, char** argv ) - Toplevel->show(); - KSGRD::SensorMgr->setBroadcaster( Toplevel ); // SensorMgr uses a QPointer for toplevel, so it is okay if Toplevel is deleted first - -+ // register to DBus -+ const KDBusService dbusService(KDBusService::Multiple); -+ - // run the application - int result = app.exec(); - Deleted: extra-x86_64/ksysguard.install =================================================================== --- extra-x86_64/ksysguard.install 2015-03-24 20:05:21 UTC (rev 234644) +++ extra-x86_64/ksysguard.install 2015-03-24 20:05:42 UTC (rev 234645) @@ -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 234644, ksysguard/trunk/ksysguard.install) =================================================================== --- extra-x86_64/ksysguard.install (rev 0) +++ extra-x86_64/ksysguard.install 2015-03-24 20:05:42 UTC (rev 234645) @@ -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 +}