summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2009-05-28 08:43:21 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2009-05-28 08:43:21 +0000
commit73b014d12bdae4178ea082d89330539db880cb51 (patch)
treeeebec1ebed74cb43861c7c41d719f924dc9bc607 /kde-base/libkworkspace
parentUpdate kde-env from kde-testing. KDEDIRS no longer needed. (diff)
downloadhistorical-73b014d12bdae4178ea082d89330539db880cb51.tar.gz
historical-73b014d12bdae4178ea082d89330539db880cb51.tar.bz2
historical-73b014d12bdae4178ea082d89330539db880cb51.zip
Fix logoff issue per bug #268129.
Package-Manager: portage-2.2_rc33/cvs/Linux i686
Diffstat (limited to 'kde-base/libkworkspace')
-rw-r--r--kde-base/libkworkspace/ChangeLog8
-rw-r--r--kde-base/libkworkspace/Manifest14
-rw-r--r--kde-base/libkworkspace/files/4.2-fix_logoff.patch13
-rw-r--r--kde-base/libkworkspace/libkworkspace-4.2.3-r1.ebuild24
4 files changed, 57 insertions, 2 deletions
diff --git a/kde-base/libkworkspace/ChangeLog b/kde-base/libkworkspace/ChangeLog
index 92330ff6dce2..ba5db0c60a92 100644
--- a/kde-base/libkworkspace/ChangeLog
+++ b/kde-base/libkworkspace/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for kde-base/libkworkspace
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkworkspace/ChangeLog,v 1.30 2009/05/09 15:26:00 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkworkspace/ChangeLog,v 1.31 2009/05/28 08:43:20 scarabeus Exp $
+
+*libkworkspace-4.2.3-r1 (28 May 2009)
+
+ 28 May 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+ +files/4.2-fix_logoff.patch, +libkworkspace-4.2.3-r1.ebuild:
+ Fix logoff issue per bug #268129.
09 May 2009; Tomas Chvatal <scarabeus@gentoo.org>
libkworkspace-4.2.3.ebuild:
diff --git a/kde-base/libkworkspace/Manifest b/kde-base/libkworkspace/Manifest
index 98ee0b476897..9e0444a9442d 100644
--- a/kde-base/libkworkspace/Manifest
+++ b/kde-base/libkworkspace/Manifest
@@ -1,6 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 4.2-fix_logoff.patch 632 RMD160 a1347f49003d8a6bb4ada13f143ad0ee4c0175b1 SHA1 7af5f97fd235d5ae9f7df6246157bfc24305c47a SHA256 5acf15d8adf2f3e7e6e19980283e7d072f8ce5428d223c0c5643b2e70bd49afb
DIST kdebase-workspace-4.2.2.tar.bz2 50800751 RMD160 a7cc0bedde529ff7e27ed9e0b6362ef6c20c4082 SHA1 9397220827f378cedf38e800e06e9ca8b1a1235d SHA256 1620cf0467eb08046aeee6bce46ca17948a703e98c0e3d0de3064ab39f196c2f
DIST kdebase-workspace-4.2.3.tar.bz2 50801994 RMD160 6f3576fc61261f13b75b94d90606bf61d6b000f6 SHA1 0c92579c651c5a08ff6440762eb5c2ad9d5bc0ad SHA256 e281f9fb63391a162378dcddd4ed8327d8438d1ff4b261adb22c01a89b56aff3
EBUILD libkworkspace-4.2.2.ebuild 666 RMD160 6f0fd5b24977770b59f0208b826086c7cf8c7af1 SHA1 09259ade86867af3d62ac2ff7df855e7133b90e8 SHA256 0f7f8c7fb48e02b1fed9e0f1af91cc4e190e35a7be0c6aa5ebb37362309c6106
+EBUILD libkworkspace-4.2.3-r1.ebuild 597 RMD160 82ca7170378ebc63735554c055f017257218f818 SHA1 1442efb20fc7064fa7626e5292b2c000b3223d3b SHA256 ca7edd092441fd094f2c2879a4a26f87d987e4701fdc23630043d1b54f7c76a9
EBUILD libkworkspace-4.2.3.ebuild 541 RMD160 c631d0e96a0fd27b0ef1dd54c2a0df94b7f0ea88 SHA1 e8e6eb6e04b23ed1c47ce0082af8e28ba91c3445 SHA256 aa3b986793963c6390e83a873e2a9c47a3d445cf1a632d7fd6c7cd6136e0c10d
-MISC ChangeLog 4831 RMD160 ae87cf2c2d67fd03f11b3074ffeb70d8cae33fc2 SHA1 becc022a07d2990ba4fba96a89aec057ab0e02e6 SHA256 199c18e2f7c2d7309b671d92b2207faeddf9114187e69e0c0bd50aa480bba3f9
+MISC ChangeLog 5025 RMD160 016e92811d6a6456076c23b854bbf3dd643f648d SHA1 d221d4228d08060ca493d6162de2be47d71e09e9 SHA256 348280678ebf186a78e0b49aa7eee6ae8a39133a760265656e24c9f1bab9cf4e
MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkoeTrYACgkQHB6c3gNBRYeSngCfbBapeE+SXv8z1ddJwbvobRFb
+Y58An3DW7SocHBZG5a2rTJ5iLMNgNM32
+=XfPt
+-----END PGP SIGNATURE-----
diff --git a/kde-base/libkworkspace/files/4.2-fix_logoff.patch b/kde-base/libkworkspace/files/4.2-fix_logoff.patch
new file mode 100644
index 000000000000..1d71da79b573
--- /dev/null
+++ b/kde-base/libkworkspace/files/4.2-fix_logoff.patch
@@ -0,0 +1,13 @@
+Index: trunk/KDE/kdebase/workspace/libs/kworkspace/kdisplaymanager.cpp
+===================================================================
+--- trunk/KDE/kdebase/workspace/libs/kworkspace/kdisplaymanager.cpp (revision 911248)
++++ trunk/KDE/kdebase/workspace/libs/kworkspace/kdisplaymanager.cpp (revision 911249)
+@@ -201,7 +201,7 @@
+ KWorkSpace::ShutdownMode shutdownMode, /* NOT Default */
+ const QString &bootOption )
+ {
+- if (shutdownType == KWorkSpace::ShutdownTypeNone)
++ if (shutdownType == KWorkSpace::ShutdownTypeNone || shutdownType == KWorkSpace::ShutdownTypeLogout)
+ return;
+
+ bool cap_ask;
diff --git a/kde-base/libkworkspace/libkworkspace-4.2.3-r1.ebuild b/kde-base/libkworkspace/libkworkspace-4.2.3-r1.ebuild
new file mode 100644
index 000000000000..b53fb66f1f77
--- /dev/null
+++ b/kde-base/libkworkspace/libkworkspace-4.2.3-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkworkspace/libkworkspace-4.2.3-r1.ebuild,v 1.1 2009/05/28 08:43:21 scarabeus Exp $
+
+EAPI="2"
+
+KMNAME="kdebase-workspace"
+KMMODULE="libs/kworkspace"
+inherit kde4-meta
+
+DESCRIPTION="A library for KDE desktop applications"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="debug"
+
+KMEXTRACTONLY="
+ ksmserver/org.kde.KSMServerInterface.xml
+ kwin/org.kde.KWin.xml
+"
+
+KMSAVELIBS="true"
+
+PATCHES=(
+ "${FILESDIR}/${SLOT}-fix_logoff.patch"
+)