fix bug 29648

4 files changed, 49 insertions, 32 deletions

diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog
index 6cba2297a594..2ce4a66d4b5b 100644
--- a/kde-base/kdebase/ChangeLog
+++ b/kde-base/kdebase/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdebase
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.89 2003/09/26 17:25:17 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.90 2003/09/26 21:22:55 caleb Exp $
+
+  26 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdebase-3.1.4.ebuild,
+  files/focus-patch.diff:
+  add a focus patch that fixes bug #29648 - no revision bump
 
   26 Sep 2003; Jason Wever <weeve@gentoo.org> kdebase-3.1.4.ebuild:
   Added sparc keyword.
diff --git a/kde-base/kdebase/Manifest b/kde-base/kdebase/Manifest
index 03b154aa453c..277b73c32493 100644
--- a/kde-base/kdebase/Manifest
+++ b/kde-base/kdebase/Manifest
@@ -1,47 +1,48 @@
-MD5 19a09c8e585d1e298d88ff96b36095d0 ChangeLog 15733
-MD5 3a402daa3c966cb11070be489af72824 kdebase-2.2.2-r5.ebuild 2949
-MD5 4c5f1af579421648a9bc8f7bc0b3e5f8 kdebase-3.0.4-r3.ebuild 4486
-MD5 46d2f98f4ec0ac0a50357b3ab351b8dc kdebase-3.0.5b.ebuild 7925
 MD5 79b42ed803947f6cc87b024f2171a1be kdebase-3.1.1a.ebuild 3608
 MD5 84d91eead31fcf756ae37c745232e88d kdebase-3.1.2.ebuild 3791
+MD5 46d2f98f4ec0ac0a50357b3ab351b8dc kdebase-3.0.5b.ebuild 7925
+MD5 4a590674ca453c7440a8e6f3a2598eca kdebase-3.1.4.ebuild 3959
+MD5 4c5f1af579421648a9bc8f7bc0b3e5f8 kdebase-3.0.4-r3.ebuild 4486
+MD5 3a402daa3c966cb11070be489af72824 kdebase-2.2.2-r5.ebuild 2949
+MD5 c5e47769d4235122e0d731ae7639cd64 kdebase-3.2.0_alpha2.ebuild 3236
 MD5 7f8caaad31ed3ee9ad12643b75ba08fa kdebase-3.1.3.ebuild 3918
+MD5 92e21a73318df9fd6f0e2f9823689da7 ChangeLog 15890
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
-MD5 6ededddc4eec1d7983f6bb4aff166cfe kdebase-3.1.4.ebuild 3922
-MD5 c5e47769d4235122e0d731ae7639cd64 kdebase-3.2.0_alpha2.ebuild 3236
-MD5 63e277899292d5e8e765367ab6f4234c files/digest-kdebase-2.2.2-r5 210
-MD5 4b4d530bf8e05f89991d2161242da3f2 files/digest-kdebase-3.0.4-r3 68
 MD5 c07ead342cf5e19907a9ba978d713d80 files/digest-kdebase-3.0.5b 69
 MD5 1c511caae066d700eabea2058d8caae3 files/digest-kdebase-3.1.1a 136
-MD5 ad9e6eef841435f5c66f31ef9874c563 files/digest-kdebase-3.1.2 68
-MD5 3c02c49be312168eec3fd325e0dc3905 files/digest-kdebase-3.1.3 68
 MD5 b048371a651391ef2bb4166e40e6adff files/kde.pam 405
+MD5 f6156166c554420f1684f00d488f674a files/focus-patch.diff 542
 MD5 6eb40b28a36f889d0f1919cdbf160ef7 files/kscreensaver.pam 79
-MD5 13e89585cfb3d572a179ae7a8590fa95 files/digest-kdebase-3.1.4 68
+MD5 4b4d530bf8e05f89991d2161242da3f2 files/digest-kdebase-3.0.4-r3 68
+MD5 63e277899292d5e8e765367ab6f4234c files/digest-kdebase-2.2.2-r5 210
 MD5 11389fa15ff0492536b0b153a0b11ff1 files/digest-kdebase-3.2.0_alpha2 69
-MD5 4653ca8833aa10adb3a4d2fe0afa1863 files/2.2.2-r5/startkde-2.2.2-r5-gentoo 4010
+MD5 ad9e6eef841435f5c66f31ef9874c563 files/digest-kdebase-3.1.2 68
+MD5 3c02c49be312168eec3fd325e0dc3905 files/digest-kdebase-3.1.3 68
+MD5 13e89585cfb3d572a179ae7a8590fa95 files/digest-kdebase-3.1.4 68
+MD5 68409867ec02e18f4c594f2ea3dffd72 files/3.2.0_alpha2/kdmrc 17620
+MD5 2f1f31f38b93136baeb537500c8cfabc files/3.2.0_alpha2/backgroundrc 342
+MD5 0faaf9eacb170e30dae8818f927b2934 files/3.2.0_alpha2/startkde-3.2.0_alpha2-gentoo.diff 1923
+MD5 ce285a04f7eaf402c947046989a141f1 files/3.1.2/startkde-3.1.2-gentoo.diff 1878
+MD5 7db6d7353b1bfbb47d44e9df63be1410 files/3.1.2/kdmrc 17661
+MD5 2f1f31f38b93136baeb537500c8cfabc files/3.1.2/backgroundrc 342
+MD5 9d860dc75112c99b5706fb02c9eacae0 files/3.1.2/fontconfig-2.2-support.patch 696
+MD5 7c9cbd2320beaf7cd91b417794e172d2 files/3.1.2/sftp.patch 337
+MD5 7db6d7353b1bfbb47d44e9df63be1410 files/3.1.3/kdmrc 17661
+MD5 2f1f31f38b93136baeb537500c8cfabc files/3.1.3/backgroundrc 342
+MD5 8eb921e8d8edd7bb769af64521ec3404 files/3.1.3/startkde-3.1.3-gentoo.diff 1878
+MD5 7db6d7353b1bfbb47d44e9df63be1410 files/3.1.4/kdmrc 17661
+MD5 2f1f31f38b93136baeb537500c8cfabc files/3.1.4/backgroundrc 342
+MD5 8e50b3888c85740fe7425dbda247a12d files/3.1.4/startkde-3.1.4-gentoo.diff 1878
 MD5 41d954f907dd2ba220ebca498e7f1735 files/3.0.4-r3/kdebase-3.0.4-konsole-qt31.diff 611
+MD5 5a8c948b28b4558217ee06a9ea0c0305 files/3.0.4-r3/startkde-3.0.4-r3-gentoo.diff 1605
 MD5 b0dd1d862909571ddd17ea58bf3925d4 files/3.0.4-r3/kdebase-3.0.4-nspluginviewer-qt31.diff.gz 13733
 MD5 54c424a5920645360378aa5f494d35b2 files/3.0.4-r3/kdebase-3.0.4-xft1.1-fix.diff 3129
 MD5 867ead4d7b68109c1437e1b96eb26342 files/3.0.4-r3/kdebase-3.0.4-xft_h-fix.diff 214
-MD5 5a8c948b28b4558217ee06a9ea0c0305 files/3.0.4-r3/startkde-3.0.4-r3-gentoo.diff 1605
+MD5 4653ca8833aa10adb3a4d2fe0afa1863 files/2.2.2-r5/startkde-2.2.2-r5-gentoo 4010
 MD5 91f01b28ae245f6af19ea53cb5586101 files/3.0.5b/kdebase-3.0.5b-nspluginviewer-qt31.diff.gz 36346
-MD5 290aae1d211e55fcc2e6aa54859eb342 files/3.0.5b/kdebase-3.0.5b-xft2.0-fix.diff 4745
-MD5 867ead4d7b68109c1437e1b96eb26342 files/3.0.5b/kdebase-3.0.5b-xft_h-fix.diff 214
 MD5 836a4045534a443437eea7506a7fa3f7 files/3.0.5b/startkde-3.0.5b-gentoo.diff 1641
-MD5 2f1f31f38b93136baeb537500c8cfabc files/3.1.1a/backgroundrc 342
+MD5 867ead4d7b68109c1437e1b96eb26342 files/3.0.5b/kdebase-3.0.5b-xft_h-fix.diff 214
+MD5 290aae1d211e55fcc2e6aa54859eb342 files/3.0.5b/kdebase-3.0.5b-xft2.0-fix.diff 4745
 MD5 7db6d7353b1bfbb47d44e9df63be1410 files/3.1.1a/kdmrc 17661
+MD5 2f1f31f38b93136baeb537500c8cfabc files/3.1.1a/backgroundrc 342
 MD5 f12f03b607574596c17507007591b61b files/3.1.1a/startkde-3.1.1a-gentoo.diff 1879
-MD5 2f1f31f38b93136baeb537500c8cfabc files/3.1.2/backgroundrc 342
-MD5 9d860dc75112c99b5706fb02c9eacae0 files/3.1.2/fontconfig-2.2-support.patch 696
-MD5 7db6d7353b1bfbb47d44e9df63be1410 files/3.1.2/kdmrc 17661
-MD5 7c9cbd2320beaf7cd91b417794e172d2 files/3.1.2/sftp.patch 337
-MD5 ce285a04f7eaf402c947046989a141f1 files/3.1.2/startkde-3.1.2-gentoo.diff 1878
-MD5 2f1f31f38b93136baeb537500c8cfabc files/3.1.3/backgroundrc 342
-MD5 7db6d7353b1bfbb47d44e9df63be1410 files/3.1.3/kdmrc 17661
-MD5 8eb921e8d8edd7bb769af64521ec3404 files/3.1.3/startkde-3.1.3-gentoo.diff 1878
-MD5 2f1f31f38b93136baeb537500c8cfabc files/3.1.4/backgroundrc 342
-MD5 7db6d7353b1bfbb47d44e9df63be1410 files/3.1.4/kdmrc 17661
-MD5 8e50b3888c85740fe7425dbda247a12d files/3.1.4/startkde-3.1.4-gentoo.diff 1878
-MD5 2f1f31f38b93136baeb537500c8cfabc files/3.2.0_alpha2/backgroundrc 342
-MD5 68409867ec02e18f4c594f2ea3dffd72 files/3.2.0_alpha2/kdmrc 17620
-MD5 0faaf9eacb170e30dae8818f927b2934 files/3.2.0_alpha2/startkde-3.2.0_alpha2-gentoo.diff 1923
diff --git a/kde-base/kdebase/files/focus-patch.diff b/kde-base/kdebase/files/focus-patch.diff
new file mode 100644
index 000000000000..f4ff04812c77
--- /dev/null
+++ b/kde-base/kdebase/files/focus-patch.diff
@@ -0,0 +1,11 @@
+--- kdesktop/lockeng.cc 29 Nov 2002 15:09:11 -0000 1.53.2.1 
++++ kdesktop/lockeng.cc 16 Sep 2003 13:57:40 -0000 1.53.2.2 
+@@ -277,6 +277,9 @@ bool SaverEngine::x11Event(XEvent *event
+ 	    {
+ 	    if (!event->xkey.send_event && mXAutoLock && mState == Waiting)
+     		mXAutoLock->keyPressed();
++            // don't futher process key events that were received only because XAutoLock wants them
++            if (!event->xkey.send_event && mXAutoLock && !QWidget::find( event->xkey.window ))
++                return true;
+ 	    break;
+ 	    }
diff --git a/kde-base/kdebase/kdebase-3.1.4.ebuild b/kde-base/kdebase/kdebase-3.1.4.ebuild
index 371ece348295..edcffff7a6fb 100644
--- a/kde-base/kdebase/kdebase-3.1.4.ebuild
+++ b/kde-base/kdebase/kdebase-3.1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.1.4.ebuild,v 1.4 2003/09/26 17:25:17 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.1.4.ebuild,v 1.5 2003/09/26 21:22:55 caleb Exp $
 inherit kde-dist eutils
 
 IUSE="ldap pam motif encode oggvorbis cups ssl opengl samba java"
@@ -42,6 +42,7 @@ PATCHES=""
 
 src_unpack() {
 	kde_src_unpack
+	epatch ${FILESDIR}/focus-patch.diff
 	#cd ${S} && aclocal
 }