diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-29 02:31:43 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-29 02:31:43 -0300 |
| commit | e87b42b0f90e1a4d8b255f1dab945f2f3bb13cdc (patch) | |
| tree | e36d5720f76b5db9dd5f97260108607023d7d2e7 /extra/kshutdown | |
| parent | c0e37a8f32f335c12352f23cdc73113099e057ec (diff) | |
| parent | 32b05a621cb20af1bd4b7cd6f5609b7512bb20f1 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
extra/avfs/PKGBUILD
extra/gtk2/PKGBUILD
extra/hercules/PKGBUILD
multilib/lib32-libcap/PKGBUILD
multilib/lib32-qt/PKGBUILD
Diffstat (limited to 'extra/kshutdown')
| -rw-r--r-- | extra/kshutdown/PKGBUILD | 25 | ||||
| -rw-r--r-- | extra/kshutdown/kshutdown.install | 6 | ||||
| -rw-r--r-- | extra/kshutdown/kshutdown_3.0beta2-mga-fix_requestshutdown_call.patch | 20 |
3 files changed, 37 insertions, 14 deletions
diff --git a/extra/kshutdown/PKGBUILD b/extra/kshutdown/PKGBUILD index 99e58f307..b45bff933 100644 --- a/extra/kshutdown/PKGBUILD +++ b/extra/kshutdown/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 122317 2011-05-03 18:58:40Z tpowa $ +# $Id: PKGBUILD 151542 2012-02-27 16:09:41Z giovanni $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=kshutdown -pkgver=2.0 +pkgver=3.0beta2 pkgrel=1 pkgdesc="Shutdown Utility for KDE" arch=(i686 x86_64 'mips64el') @@ -11,20 +11,23 @@ license=('GPL') depends=('kdebase-workspace') makedepends=('pkgconfig' 'cmake' 'automoc4') install='kshutdown.install' -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-source-${pkgver}.zip") +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-source-${pkgver}.zip" + 'kshutdown_3.0beta2-mga-fix_requestshutdown_call.patch') +md5sums=('1621e19cc74c9578b6cfc3e32166f853' + 'c03185629d063c8ebbf59a423cf78980') build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../${pkgname}-${pkgver} \ + cd "${srcdir}" + patch -Np0 -i "${srcdir}/kshutdown_3.0beta2-mga-fix_requestshutdown_call.patch" + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr - make + make } package() { - cd "${srcdir}/build" - make DESTDIR="${pkgdir}" install + cd "${srcdir}/build" + make DESTDIR="${pkgdir}" install } -md5sums=('af9d2bfda919e7712319e14e6ca89610') diff --git a/extra/kshutdown/kshutdown.install b/extra/kshutdown/kshutdown.install index e70c054ec..1c0de2e4f 100644 --- a/extra/kshutdown/kshutdown.install +++ b/extra/kshutdown/kshutdown.install @@ -1,11 +1,11 @@ post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null + xdg-icon-resource forceupdate --theme hicolor &> /dev/null } post_upgrade() { - post_install + post_install } post_remove() { - post_install + post_install } diff --git a/extra/kshutdown/kshutdown_3.0beta2-mga-fix_requestshutdown_call.patch b/extra/kshutdown/kshutdown_3.0beta2-mga-fix_requestshutdown_call.patch new file mode 100644 index 000000000..4739e601d --- /dev/null +++ b/extra/kshutdown/kshutdown_3.0beta2-mga-fix_requestshutdown_call.patch @@ -0,0 +1,20 @@ +diff -uNr kshutdown-3.0beta2.orig/src/kshutdown.cpp kshutdown-3.0beta2/src/kshutdown.cpp +--- kshutdown-3.0beta2.orig/src/kshutdown.cpp 2011-12-29 22:18:45.000000000 -0500 ++++ kshutdown-3.0beta2/src/kshutdown.cpp 2011-12-30 19:09:08.128451522 -0500 +@@ -886,13 +886,13 @@ + #ifdef KS_NATIVE_KDE + if ( + // TODO: check if logout is available +- (m_kdeShutDownAvailable || (m_type == U_SHUTDOWN_TYPE_LOGOUT)) && ++ (m_kdeShutDownAvailable || (m_type == U_SHUTDOWN_TYPE_LOGOUT))) + KWorkSpace::requestShutDown( + KWorkSpace::ShutdownConfirmNo, + m_type, + KWorkSpace::ShutdownModeForceNow +- ) +- ) ++ ); ++ + return true; + #endif // KS_NATIVE_KDE + |