Add patch to fix KDE bug #128610 (screensaver not working).

Package-Manager: portage-2.1.1_pre1-r5

5 files changed, 188 insertions, 9 deletions

diff --git a/kde-base/kdesktop/ChangeLog b/kde-base/kdesktop/ChangeLog
index d843c1eb54cf..061047b5edd6 100644
--- a/kde-base/kdesktop/ChangeLog
+++ b/kde-base/kdesktop/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdesktop
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesktop/ChangeLog,v 1.54 2006/06/01 18:09:23 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesktop/ChangeLog,v 1.55 2006/07/01 21:34:21 flameeyes Exp $
+
+*kdesktop-3.5.3-r1 (01 Jul 2006)
+
+  01 Jul 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/kdesktop-3.5.3-screensaver.patch, +kdesktop-3.5.3-r1.ebuild:
+  Add patch to fix KDE bug #128610 (screensaver not working).
 
 *kdesktop-3.5.3 (01 Jun 2006)
 
diff --git a/kde-base/kdesktop/Manifest b/kde-base/kdesktop/Manifest
index 837a0dfa888b..26e85d6a571f 100644
--- a/kde-base/kdesktop/Manifest
+++ b/kde-base/kdesktop/Manifest
@@ -1,6 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX kdesktop-3.5.3-screensaver.patch 3336 RMD160 f8ac6f039ea14dbbf1f8579cd610a8f5e0f26bd2 SHA1 637dea7fab3bd9882dc09e9ed31904024016201f SHA256 0e6fa9e399914805c72042ddb358ea3760f30f6d1b2b782f744a3fe20d9c18d8
+MD5 c1c21846f3ff96630e1faebbd6a450c8 files/kdesktop-3.5.3-screensaver.patch 3336
+RMD160 f8ac6f039ea14dbbf1f8579cd610a8f5e0f26bd2 files/kdesktop-3.5.3-screensaver.patch 3336
+SHA256 0e6fa9e399914805c72042ddb358ea3760f30f6d1b2b782f744a3fe20d9c18d8 files/kdesktop-3.5.3-screensaver.patch 3336
 DIST kdebase-3.4.3.tar.bz2 22425835 RMD160 7af02903b0fc750e7b9778391ef8948b54f69ce7 SHA256 d7802446a046ed647e5d068b7c4a21cfdb9c883b31de65838f106c5b5d4b8b1c
 DIST kdebase-3.5.2.tar.bz2 23590820 RMD160 216ff59c49bb4fee2aa3b7d976ec40a8cccff107 SHA1 16cddd8766c3bd8821044fe9cce66f5291c8412b SHA256 21150b7e553e83487e70e70e3d13ce107c6c5d57133b40f413807887a9e431f7
 DIST kdebase-3.5.3.tar.bz2 23634194 RMD160 ef55c72b97577dd86e5c64bf589ff9b2d556ec07 SHA1 93f1566343af114b24987ee7b8e0e80877b57f25 SHA256 5a2b9bc5e2682684519dbae89b3bd73fbf5de1f1effd3ca072173a9638dc3ff8
@@ -12,14 +16,18 @@ EBUILD kdesktop-3.5.2.ebuild 1508 RMD160 cc162ef2092917979fa8d2931c8eb33561db18e
 MD5 6622b30f85e2bc28bd0446f07705a872 kdesktop-3.5.2.ebuild 1508
 RMD160 cc162ef2092917979fa8d2931c8eb33561db18ef kdesktop-3.5.2.ebuild 1508
 SHA256 199d4d33c244f61c0e4cb5316257afe6d633e15a46c7fb3d00a764400ff7c957 kdesktop-3.5.2.ebuild 1508
+EBUILD kdesktop-3.5.3-r1.ebuild 1564 RMD160 bdfdf8060c2d1a7fc0f51b3d0dfa2bee458579c5 SHA1 adf99075371f649d972dfd7b03c68d1a7741bdc6 SHA256 5dfd024a9c031b8dd94ab5196ca6ba30661a608370d0c76d8651a1c7d55a33d7
+MD5 be070cf493da580f72b120f0bee287e5 kdesktop-3.5.3-r1.ebuild 1564
+RMD160 bdfdf8060c2d1a7fc0f51b3d0dfa2bee458579c5 kdesktop-3.5.3-r1.ebuild 1564
+SHA256 5dfd024a9c031b8dd94ab5196ca6ba30661a608370d0c76d8651a1c7d55a33d7 kdesktop-3.5.3-r1.ebuild 1564
 EBUILD kdesktop-3.5.3.ebuild 1515 RMD160 d7bc817b9ca7d9a762cc2172d1b8f3663237bb4a SHA1 124938311198e8f6cf5b239c3039bbe2a166d8f7 SHA256 d6956e689b083707c65d9dad64c13f1827af9d930926722308a7dce963332af6
 MD5 8dd3988644b82c2b76a39bca100eb265 kdesktop-3.5.3.ebuild 1515
 RMD160 d7bc817b9ca7d9a762cc2172d1b8f3663237bb4a kdesktop-3.5.3.ebuild 1515
 SHA256 d6956e689b083707c65d9dad64c13f1827af9d930926722308a7dce963332af6 kdesktop-3.5.3.ebuild 1515
-MISC ChangeLog 6937 RMD160 f5977c73fa9bb98e7c0df73e63ec6a90b98f2e51 SHA1 c357b5b9a460b779cfdb8bc348519a8114ebafdc SHA256 a1f421747c89e7551c316a0c5605fcf614d7b5c51085825ad64d773c5056801e
-MD5 db42a7a7cd7433ac7a5bd94609ba02d2 ChangeLog 6937
-RMD160 f5977c73fa9bb98e7c0df73e63ec6a90b98f2e51 ChangeLog 6937
-SHA256 a1f421747c89e7551c316a0c5605fcf614d7b5c51085825ad64d773c5056801e ChangeLog 6937
+MISC ChangeLog 7157 RMD160 5a5a072745873215a1341c2c618c3c1cc98c768e SHA1 3acb8c3a27544a78d29bf15c3ca21dcfd087943d SHA256 5b92edf902b8014e6749409bf59e0efa039a01e4cec32fc46a6890a685981f4e
+MD5 ea030b39cd6caf07f2be78b2dd691ee3 ChangeLog 7157
+RMD160 5a5a072745873215a1341c2c618c3c1cc98c768e ChangeLog 7157
+SHA256 5b92edf902b8014e6749409bf59e0efa039a01e4cec32fc46a6890a685981f4e ChangeLog 7157
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -33,10 +41,13 @@ SHA256 e5c44a3cade03e986c8babd8c9302549943c3d0da8bcd264d957ef079c4d68d0 files/di
 MD5 c769b4fee1a0c608ff42cda1d49b9ac2 files/digest-kdesktop-3.5.3 250
 RMD160 2453307f2d55a127e9043490c766259d59768fbb files/digest-kdesktop-3.5.3 250
 SHA256 fbadbab6d9ca54d395d9e1f91808dadbb485cbeffbaf1b50b90f1e5efd772f27 files/digest-kdesktop-3.5.3 250
+MD5 c769b4fee1a0c608ff42cda1d49b9ac2 files/digest-kdesktop-3.5.3-r1 250
+RMD160 2453307f2d55a127e9043490c766259d59768fbb files/digest-kdesktop-3.5.3-r1 250
+SHA256 fbadbab6d9ca54d395d9e1f91808dadbb485cbeffbaf1b50b90f1e5efd772f27 files/digest-kdesktop-3.5.3-r1 250
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
+Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEfy1fAiZjviIA2XgRAjWQAJ4jt8Xrux+I2UIpFRWsnTC9/RhStwCg10cn
-0uksBwTJl9ZYxvZ3nE29KFc=
-=wiEs
+iD8DBQFEpuqFAiZjviIA2XgRAozRAKDxPwPwpNpxvdmEfXUU/BkTJ6TwkACg5MIK
+0I6fAsadQVTuDRqUmVs5Yto=
+=r1AB
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kdesktop/files/digest-kdesktop-3.5.3-r1 b/kde-base/kdesktop/files/digest-kdesktop-3.5.3-r1
new file mode 100644
index 000000000000..f6eb5d9b686e
--- /dev/null
+++ b/kde-base/kdesktop/files/digest-kdesktop-3.5.3-r1
@@ -0,0 +1,3 @@
+MD5 9cb6b8291c4f3f986e16f72129e8fcd0 kdebase-3.5.3.tar.bz2 23634194
+RMD160 ef55c72b97577dd86e5c64bf589ff9b2d556ec07 kdebase-3.5.3.tar.bz2 23634194
+SHA256 5a2b9bc5e2682684519dbae89b3bd73fbf5de1f1effd3ca072173a9638dc3ff8 kdebase-3.5.3.tar.bz2 23634194
diff --git a/kde-base/kdesktop/files/kdesktop-3.5.3-screensaver.patch b/kde-base/kdesktop/files/kdesktop-3.5.3-screensaver.patch
new file mode 100644
index 000000000000..8edf3a6b97c4
--- /dev/null
+++ b/kde-base/kdesktop/files/kdesktop-3.5.3-screensaver.patch
@@ -0,0 +1,101 @@
+Index: kdesktop/lockeng.cc
+===================================================================
+--- kdesktop/lockeng.cc	(revision 548007)
++++ kdesktop/lockeng.cc	(revision 548008)
+@@ -42,9 +42,6 @@
+     XGetScreenSaver(qt_xdisplay(), &mXTimeout, &mXInterval,
+                     &mXBlanking, &mXExposures);
+ 
+-    // We'll handle blanking
+-    XSetScreenSaver(qt_xdisplay(), 0, mXInterval, mXBlanking, mXExposures);
+-
+     mState = Waiting;
+     mXAutoLock = 0;
+     mEnabled = false;
+@@ -158,6 +155,9 @@
+         mXAutoLock->setDPMS(mDPMS);
+ 	//mXAutoLock->changeCornerLockStatus( mLockCornerTopLeft, mLockCornerTopRight, mLockCornerBottomLeft, mLockCornerBottomRight);
+ 
++        // We'll handle blanking 
++        XSetScreenSaver(qt_xdisplay(), mTimeout + 10, mXInterval, mXBlanking, mXExposures);
++
+         mXAutoLock->start();
+ 
+         kdDebug(1204) << "Saver Engine started, timeout: " << mTimeout << endl;
+@@ -170,6 +170,7 @@
+ 	    mXAutoLock = 0;
+ 	}
+ 
++	XSetScreenSaver(qt_xdisplay(), 0, mXInterval, mXBlanking, mXExposures);
+         kdDebug(1204) << "Saver Engine disabled" << endl;
+     }
+ 
+@@ -291,7 +292,6 @@
+     kdDebug(1204) << "SaverEngine: stopping lock" << endl;
+     emitDCOPSignal("KDE_stop_screensaver()", QByteArray());
+ 
+-
+     mLockProcess.kill();
+ 
+     if (mXAutoLock)
+@@ -300,6 +300,7 @@
+     }
+     processLockTransactions();
+     mState = Waiting;
++    XSetScreenSaver(qt_xdisplay(), mTimeout + 10, mXInterval, mXBlanking, mXExposures);
+ }
+ 
+ void SaverEngine::lockProcessExited()
+@@ -314,6 +315,7 @@
+     }
+     processLockTransactions();
+     mState = Waiting;
++    XSetScreenSaver(qt_xdisplay(), mTimeout + 10, mXInterval, mXBlanking, mXExposures);
+ }
+ 
+ //---------------------------------------------------------------------------
+@@ -322,6 +324,8 @@
+ //
+ void SaverEngine::idleTimeout()
+ {
++    // disable X screensaver
++    XSetScreenSaver(qt_xdisplay(), 0, mXInterval, mXBlanking, mXExposures);
+     startLockProcess( DefaultLock );
+ }
+ 
+Index: kdesktop/xautolock.cc
+===================================================================
+--- kdesktop/xautolock.cc	(revision 548007)
++++ kdesktop/xautolock.cc	(revision 548008)
+@@ -192,6 +192,7 @@
+ 
+     bool activate = false;
+ 
++    kdDebug() << now << " " << mTrigger << endl;
+     if (now >= mTrigger)
+     {
+         resetTrigger();
+@@ -202,6 +203,8 @@
+     BOOL on;
+     CARD16 state;
+     DPMSInfo( qt_xdisplay(), &state, &on );
++
++    kdDebug() << "DPMSInfo " << state << " " << on << endl;
+     // If DPMS is active, it makes XScreenSaverQueryInfo() report idle time
+     // that is always smaller than DPMS timeout (X bug I guess). So if DPMS
+     // saving is active, simply always activate our saving too, otherwise
+@@ -217,9 +220,11 @@
+ #ifdef HAVE_XSCREENSAVER
+     static XScreenSaverInfo* mitInfo = 0;
+     if (!mitInfo) mitInfo = XScreenSaverAllocInfo ();
+-    XScreenSaverQueryInfo (qt_xdisplay(), DefaultRootWindow (qt_xdisplay()), mitInfo);
+-    if (mitInfo->state == ScreenSaverDisabled)
+-	activate = false;
++    if (XScreenSaverQueryInfo (qt_xdisplay(), DefaultRootWindow (qt_xdisplay()), mitInfo)) {
++        kdDebug() << "XScreenSaverQueryInfo " << mitInfo->state << " " << ScreenSaverDisabled << endl;
++        if (mitInfo->state == ScreenSaverDisabled)
++	    activate = false;
++    }
+ #endif
+ 
+     if(mActive && activate)
diff --git a/kde-base/kdesktop/kdesktop-3.5.3-r1.ebuild b/kde-base/kdesktop/kdesktop-3.5.3-r1.ebuild
new file mode 100644
index 000000000000..d2629cba9d24
--- /dev/null
+++ b/kde-base/kdesktop/kdesktop-3.5.3-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesktop/kdesktop-3.5.3-r1.ebuild,v 1.1 2006/07/01 21:34:21 flameeyes Exp $
+
+KMNAME=kdebase
+MAXKDEVER=$PV
+KM_DEPRANGE="$PV $MAXKDEVER"
+inherit kde-meta eutils
+
+DESCRIPTION="The KDE desktop"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="xscreensaver"
+
+DEPEND="$DEPEND
+$(deprange $PV $MAXKDEVER kde-base/libkonq)
+$(deprange $PV $MAXKDEVER kde-base/kdm)
+$(deprange $PV $MAXKDEVER kde-base/kcontrol)
+	xscreensaver? ( || ( (
+			x11-proto/scrnsaverproto
+			) virtual/x11 )
+		)"
+	# Requires the desktop background settings module,
+	# so until we separate the kcontrol modules into separate ebuilds :-),
+	# there's a dep here
+RDEPEND="${DEPEND}
+$(deprange 3.5.0 $MAXKDEVER kde-base/kcheckpass)
+$(deprange $PV $MAXKDEVER kde-base/kdialog)
+	xscreensaver? ( || ( (
+			x11-libs/libXScrnSaver
+			) virtual/x11 )
+		)"
+
+KMCOPYLIB="libkonq libkonq/"
+KMEXTRACTONLY="kcheckpass/kcheckpass.h
+	libkonq/
+	kdm/kfrontend/themer/
+	kioslave/thumbnail/configure.in.in" # for the HAVE_LIBART test
+KMCOMPILEONLY="kcontrol/background
+	kdmlib/"
+KMNODOCS=true
+
+PATCHES="${FILESDIR}/${P}-screensaver.patch"
+
+src_compile() {
+	myconf="${myconf} $(use_with xscreensaver)"
+	kde-meta_src_compile
+}
+
+src_install() {
+	# ugly, needs fixing: don't install kcontrol/background
+	kde-meta_src_install
+
+	rmdir ${D}/${PREFIX}/share/templates/.source/emptydir
+}
+
+pkg_postinst() {
+	mkdir -p ${PREFIX}/share/templates/.source/emptydir
+}