diff options
| author | Tomáš Chvátal <scarabeus@gentoo.org> | 2009-05-28 10:42:25 +0200 |
|---|---|---|
| committer | Tomáš Chvátal <scarabeus@gentoo.org> | 2009-05-28 10:42:25 +0200 |
| commit | 194a8ec2af46949e242e357eeb8d34c18bb2a376 (patch) | |
| tree | 071422c2946353644caf26b22eb621d9f6169116 | |
| parent | 8c96c89887b7e716e3eb6dee17d2b230db9842f7 (diff) | |
| download | kde-194a8ec2af46949e242e357eeb8d34c18bb2a376.tar.gz kde-194a8ec2af46949e242e357eeb8d34c18bb2a376.tar.bz2 kde-194a8ec2af46949e242e357eeb8d34c18bb2a376.zip | |
[kde-base/libkworkspace] Fix logoff issue per bug #268129.
| -rw-r--r-- | kde-base/libkworkspace/Manifest | 3 | ||||
| -rw-r--r-- | kde-base/libkworkspace/files/4.2-fix_logoff.patch | 13 | ||||
| -rw-r--r-- | kde-base/libkworkspace/libkworkspace-4.2.9999.ebuild | 4 |
3 files changed, 19 insertions, 1 deletions
diff --git a/kde-base/libkworkspace/Manifest b/kde-base/libkworkspace/Manifest index aa468e7ec7b..b80b9ffd696 100644 --- a/kde-base/libkworkspace/Manifest +++ b/kde-base/libkworkspace/Manifest @@ -1,8 +1,9 @@ +AUX 4.2-fix_logoff.patch 632 RMD160 a1347f49003d8a6bb4ada13f143ad0ee4c0175b1 SHA1 7af5f97fd235d5ae9f7df6246157bfc24305c47a SHA256 5acf15d8adf2f3e7e6e19980283e7d072f8ce5428d223c0c5643b2e70bd49afb DIST kdebase-workspace-4.2.85.tar.bz2 51520831 RMD160 ea8c1fcb5dab13fa4fd3c68a3887704e326aff46 SHA1 c4e2de0dad0b5b5c7f096f5622abe737af2412f2 SHA256 c650c3f1a4e4929e010cfde3d82516083050518d6410fd51c9c3f59c8d4efdc0 DIST kdebase-workspace-4.2.87.tar.lzma 50232692 RMD160 4f72ae7cca4ac45668b009da173ab09692a9223f SHA1 f1a2c3fce5a066484061350178d11208da3bfe80 SHA256 5b02028678b2713c2c9fa42152dbda07e42fabe5e7143e78bf61d74bad558276 EBUILD libkworkspace-4.2.85.ebuild 627 RMD160 dd78fe0baded87e94480ab3ff8e73474aa6f7ed8 SHA1 8800b833545efa85ac4d57c10b6b2cab1ddfcbdc SHA256 0c013315dce6c7fbb3fa3bfbbfc2b6745017dfaaabcaa8fd44019336ccf91a43 EBUILD libkworkspace-4.2.87.ebuild 627 RMD160 dd78fe0baded87e94480ab3ff8e73474aa6f7ed8 SHA1 8800b833545efa85ac4d57c10b6b2cab1ddfcbdc SHA256 0c013315dce6c7fbb3fa3bfbbfc2b6745017dfaaabcaa8fd44019336ccf91a43 -EBUILD libkworkspace-4.2.9999.ebuild 496 RMD160 a981a27f8d3769b996860ebe1acfbb2d723384bf SHA1 39f8e73e8990c51c56231bddf28f91fdf759a3a6 SHA256 9080a8c362b79778d75b6be66fc36ebd11c0f06cea2ce659abd8aa2481420918 +EBUILD libkworkspace-4.2.9999.ebuild 549 RMD160 03536b2601f5794a24bd63588680c4b563c53761 SHA1 6bfeee08748a3b50cae8912ab608e30b5da1e088 SHA256 a837c778577279d811b83cc860972543825a933f8499e0b56f799675d186d8fe EBUILD libkworkspace-9999.ebuild 616 RMD160 b3589b5a3eb9977f5ba7253c104b27a519046133 SHA1 ff4c25f2b06160b02311cac76961302523593c1e SHA256 0e0ec6563bcfe4f1b9d11cf5c6e719eb51af67850d37e5e49b3627ead9ee4862 MISC ChangeLog 8109 RMD160 0e946c9b76be61ae9f07d1a96a08f11060965541 SHA1 65d14b064930b1bdab7f973db7bbd8b9f74580c1 SHA256 c38388026f371504f4b0d4c07e1adaef5f9985580bb1c9cdf2c47ab24c47e437 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a 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 00000000000..1d71da79b57 --- /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.9999.ebuild b/kde-base/libkworkspace/libkworkspace-4.2.9999.ebuild index 9bd1a2df5f7..b909d23ff04 100644 --- a/kde-base/libkworkspace/libkworkspace-4.2.9999.ebuild +++ b/kde-base/libkworkspace/libkworkspace-4.2.9999.ebuild @@ -18,3 +18,7 @@ KMEXTRACTONLY=" " KMSAVELIBS="true" + +PATCHES=( + "${FILESDIR}/${SLOT}-fix_logoff.patch" +) |