[arch-commits] Commit in kshutdown/repos (10 files)
Giovanni Scafora
giovanni at archlinux.org
Mon Feb 27 16:09:41 UTC 2012
Date: Monday, February 27, 2012 @ 11:09:41
Author: giovanni
Revision: 151542
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
kshutdown/repos/extra-i686/PKGBUILD
(from rev 151541, kshutdown/trunk/PKGBUILD)
kshutdown/repos/extra-i686/kshutdown.install
(from rev 151541, kshutdown/trunk/kshutdown.install)
kshutdown/repos/extra-i686/kshutdown_3.0beta2-mga-fix_requestshutdown_call.patch
(from rev 151541, kshutdown/trunk/kshutdown_3.0beta2-mga-fix_requestshutdown_call.patch)
kshutdown/repos/extra-x86_64/PKGBUILD
(from rev 151541, kshutdown/trunk/PKGBUILD)
kshutdown/repos/extra-x86_64/kshutdown.install
(from rev 151541, kshutdown/trunk/kshutdown.install)
kshutdown/repos/extra-x86_64/kshutdown_3.0beta2-mga-fix_requestshutdown_call.patch
(from rev 151541, kshutdown/trunk/kshutdown_3.0beta2-mga-fix_requestshutdown_call.patch)
Deleted:
kshutdown/repos/extra-i686/PKGBUILD
kshutdown/repos/extra-i686/kshutdown.install
kshutdown/repos/extra-x86_64/PKGBUILD
kshutdown/repos/extra-x86_64/kshutdown.install
--------------------------------------------------------------------+
extra-i686/PKGBUILD | 63 +++++-----
extra-i686/kshutdown.install | 22 +--
extra-i686/kshutdown_3.0beta2-mga-fix_requestshutdown_call.patch | 20 +++
extra-x86_64/PKGBUILD | 63 +++++-----
extra-x86_64/kshutdown.install | 22 +--
extra-x86_64/kshutdown_3.0beta2-mga-fix_requestshutdown_call.patch | 20 +++
6 files changed, 128 insertions(+), 82 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2012-02-27 16:09:13 UTC (rev 151541)
+++ extra-i686/PKGBUILD 2012-02-27 16:09:41 UTC (rev 151542)
@@ -1,30 +0,0 @@
-# $Id$
-# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
-
-pkgname=kshutdown
-pkgver=2.0
-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')
-install='kshutdown.install'
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-source-${pkgver}.zip")
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}/build"
- make DESTDIR="${pkgdir}" install
-}
-md5sums=('af9d2bfda919e7712319e14e6ca89610')
Copied: kshutdown/repos/extra-i686/PKGBUILD (from rev 151541, kshutdown/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-02-27 16:09:41 UTC (rev 151542)
@@ -0,0 +1,33 @@
+# $Id$
+# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
+
+pkgname=kshutdown
+pkgver=3.0beta2
+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')
+install='kshutdown.install'
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-source-${pkgver}.zip"
+ 'kshutdown_3.0beta2-mga-fix_requestshutdown_call.patch')
+md5sums=('1621e19cc74c9578b6cfc3e32166f853'
+ 'c03185629d063c8ebbf59a423cf78980')
+
+build() {
+ 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
+}
Deleted: extra-i686/kshutdown.install
===================================================================
--- extra-i686/kshutdown.install 2012-02-27 16:09:13 UTC (rev 151541)
+++ extra-i686/kshutdown.install 2012-02-27 16:09:41 UTC (rev 151542)
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: kshutdown/repos/extra-i686/kshutdown.install (from rev 151541, kshutdown/trunk/kshutdown.install)
===================================================================
--- extra-i686/kshutdown.install (rev 0)
+++ extra-i686/kshutdown.install 2012-02-27 16:09:41 UTC (rev 151542)
@@ -0,0 +1,11 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: kshutdown/repos/extra-i686/kshutdown_3.0beta2-mga-fix_requestshutdown_call.patch (from rev 151541, kshutdown/trunk/kshutdown_3.0beta2-mga-fix_requestshutdown_call.patch)
===================================================================
--- extra-i686/kshutdown_3.0beta2-mga-fix_requestshutdown_call.patch (rev 0)
+++ extra-i686/kshutdown_3.0beta2-mga-fix_requestshutdown_call.patch 2012-02-27 16:09:41 UTC (rev 151542)
@@ -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
+
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2012-02-27 16:09:13 UTC (rev 151541)
+++ extra-x86_64/PKGBUILD 2012-02-27 16:09:41 UTC (rev 151542)
@@ -1,30 +0,0 @@
-# $Id$
-# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
-
-pkgname=kshutdown
-pkgver=2.0
-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')
-install='kshutdown.install'
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-source-${pkgver}.zip")
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}/build"
- make DESTDIR="${pkgdir}" install
-}
-md5sums=('af9d2bfda919e7712319e14e6ca89610')
Copied: kshutdown/repos/extra-x86_64/PKGBUILD (from rev 151541, kshutdown/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2012-02-27 16:09:41 UTC (rev 151542)
@@ -0,0 +1,33 @@
+# $Id$
+# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
+
+pkgname=kshutdown
+pkgver=3.0beta2
+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')
+install='kshutdown.install'
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-source-${pkgver}.zip"
+ 'kshutdown_3.0beta2-mga-fix_requestshutdown_call.patch')
+md5sums=('1621e19cc74c9578b6cfc3e32166f853'
+ 'c03185629d063c8ebbf59a423cf78980')
+
+build() {
+ 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
+}
Deleted: extra-x86_64/kshutdown.install
===================================================================
--- extra-x86_64/kshutdown.install 2012-02-27 16:09:13 UTC (rev 151541)
+++ extra-x86_64/kshutdown.install 2012-02-27 16:09:41 UTC (rev 151542)
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: kshutdown/repos/extra-x86_64/kshutdown.install (from rev 151541, kshutdown/trunk/kshutdown.install)
===================================================================
--- extra-x86_64/kshutdown.install (rev 0)
+++ extra-x86_64/kshutdown.install 2012-02-27 16:09:41 UTC (rev 151542)
@@ -0,0 +1,11 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: kshutdown/repos/extra-x86_64/kshutdown_3.0beta2-mga-fix_requestshutdown_call.patch (from rev 151541, kshutdown/trunk/kshutdown_3.0beta2-mga-fix_requestshutdown_call.patch)
===================================================================
--- extra-x86_64/kshutdown_3.0beta2-mga-fix_requestshutdown_call.patch (rev 0)
+++ extra-x86_64/kshutdown_3.0beta2-mga-fix_requestshutdown_call.patch 2012-02-27 16:09:41 UTC (rev 151542)
@@ -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
+
More information about the arch-commits
mailing list