[arch-commits] Commit in kshutdown/trunk (3 files)

[Giovanni Scafora]

    Date: Monday, February 27, 2012 @ 11:09:13
  Author: giovanni
Revision: 151541

upgpkg: kshutdown 3.0beta2-1

signing rebuild, upstream release, added patch to fix build under KDE 4.8

Added:
  kshutdown/trunk/kshutdown_3.0beta2-mga-fix_requestshutdown_call.patch
Modified:
  kshutdown/trunk/PKGBUILD
  kshutdown/trunk/kshutdown.install

-------------------------------------------------------+
 PKGBUILD                                              |   29 ++++++++--------
 kshutdown.install                                     |    6 +--
 kshutdown_3.0beta2-mga-fix_requestshutdown_call.patch |   20 +++++++++++
 3 files changed, 39 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-02-27 15:28:45 UTC (rev 151540)
+++ PKGBUILD	2012-02-27 16:09:13 UTC (rev 151541)
@@ -2,29 +2,32 @@
 # Maintainer: Tobias Powalowski <tpowa at archlinux.org>
 
 pkgname=kshutdown
-pkgver=2.0
+pkgver=3.0beta2
 pkgrel=1
 pkgdesc="Shutdown Utility for KDE"
-arch=('i686' 'x86_64')
+arch=(i686 x86_64)
 url="http://kshutdown.sourceforge.net/"
 license=('GPL')
 depends=('kdebase-workspace')
 makedepends=('pkgconfig' 'cmake' 'automoc4')
 install='kshutdown.install'
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-source-${pkgver}.zip")
-md5sums=('af9d2bfda919e7712319e14e6ca89610')
+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} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_INSTALL_PREFIX=/usr
-	make
+  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
 }
 
 package() {
-	cd "${srcdir}/build"
-	make DESTDIR="${pkgdir}" install
+  cd "${srcdir}/build"
+  make DESTDIR="${pkgdir}" install
 }

Modified: kshutdown.install
===================================================================
--- kshutdown.install	2012-02-27 15:28:45 UTC (rev 151540)
+++ kshutdown.install	2012-02-27 16:09:13 UTC (rev 151541)
@@ -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
 }

Added: kshutdown_3.0beta2-mga-fix_requestshutdown_call.patch
===================================================================
--- kshutdown_3.0beta2-mga-fix_requestshutdown_call.patch	                        (rev 0)
+++ kshutdown_3.0beta2-mga-fix_requestshutdown_call.patch	2012-02-27 16:09:13 UTC (rev 151541)
@@ -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
+