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

[Eric Bélanger]

    Date: Friday, March 16, 2012 @ 00:43:47
  Author: eric
Revision: 153571

upgpkg: kshutdown 3.0beta3-1

Upstream update, Remove old patch

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

-------------------------------------------------------+
 PKGBUILD                                              |   11 +++-----
 kshutdown_3.0beta2-mga-fix_requestshutdown_call.patch |   20 ----------------
 2 files changed, 4 insertions(+), 27 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-03-16 04:12:42 UTC (rev 153570)
+++ PKGBUILD	2012-03-16 04:43:47 UTC (rev 153571)
@@ -2,23 +2,20 @@
 # Maintainer: Tobias Powalowski <tpowa at archlinux.org>
 
 pkgname=kshutdown
-pkgver=3.0beta2
+pkgver=3.0beta3
 pkgrel=1
 pkgdesc="Shutdown Utility for KDE"
 arch=(i686 x86_64)
 url="http://kshutdown.sourceforge.net/"
 license=('GPL')
 depends=('kdebase-workspace')
-makedepends=('pkgconfig' 'cmake' 'automoc4')
+makedepends=('pkg-config' 'cmake' 'automoc4')
 install='kshutdown.install'
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-source-${pkgver}.zip"
-        'kshutdown_3.0beta2-mga-fix_requestshutdown_call.patch')
-md5sums=('1621e19cc74c9578b6cfc3e32166f853'
-         'c03185629d063c8ebbf59a423cf78980')
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-source-${pkgver}.zip")
+md5sums=('2b1ee9aa2300989650cd808c3860cd0a')
 
 build() {
   cd "${srcdir}"
-  patch -Np0 -i "${srcdir}/kshutdown_3.0beta2-mga-fix_requestshutdown_call.patch"
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \

Deleted: kshutdown_3.0beta2-mga-fix_requestshutdown_call.patch
===================================================================
--- kshutdown_3.0beta2-mga-fix_requestshutdown_call.patch	2012-03-16 04:12:42 UTC (rev 153570)
+++ kshutdown_3.0beta2-mga-fix_requestshutdown_call.patch	2012-03-16 04:43:47 UTC (rev 153571)
@@ -1,20 +0,0 @@
-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
-