fixed numlock issue, bug #405579 -- thanks to Vincent for the patch.

Package-Manager: portage-2.1.10.41/cvs/Linux i686

4 files changed, 30 insertions, 7 deletions

diff --git a/x11-misc/slim/ChangeLog b/x11-misc/slim/ChangeLog
index 4651bec45286..5d91b5834e79 100644
--- a/x11-misc/slim/ChangeLog
+++ b/x11-misc/slim/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/slim
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v 1.80 2012/02/23 15:17:56 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v 1.81 2012/03/05 15:38:44 axs Exp $
+
+  05 Mar 2012; Ian Stakenvicius <axs@gentoo.org>
+  +files/405579-fix-numlock.patch, slim-1.3.3.ebuild:
+  fixed numlock issue, bug #405579 -- thanks to Vincent for the patch.
 
 *slim-1.3.3 (23 Feb 2012)
 
diff --git a/x11-misc/slim/Manifest b/x11-misc/slim/Manifest
index e7537ec6bdb7..ab09aef2df46 100644
--- a/x11-misc/slim/Manifest
+++ b/x11-misc/slim/Manifest
@@ -7,6 +7,7 @@ AUX 252280-fix-default_user-focus_passwd.patch 328 RMD160 ca60567fc2f03403bbd60f
 AUX 261359-fix-SIGTERM-freeze.patch 1284 RMD160 ba75eda8cc539138f68f26de18c76a5e290f4d93 SHA1 dd8b782438bbdb86c44a4e1cb64bd8c3e3afefe6 SHA256 bd3221c9b94cc64ba6f4d786ec57a5d085f247b283cd64117034be15fedc5201
 AUX 261713-restart-xserver-if-killed.patch 3198 RMD160 97b6627b17f74a6fb88a967fee7364bdb3280710 SHA1 15d7bffb0588ac33ece488aa209c2418023d4739 SHA256 c4ff22a4930d6ef12ee6ff30f4782b64785c00d54f687ac620e5cbd5eee283f9
 AUX 346037-stop_setting_host_for_pam_ck_connector_so.patch 328 RMD160 62012df3cccf607d8cba139b0754a7238bfb1dd3 SHA1 04f26bc3ad82dab47c8911f3ac069b756fe5a1a8 SHA256 51bee429be20f2538b19b84c311b136761acdf2b857661af11749e45cc73ad44
+AUX 405579-fix-numlock.patch 438 RMD160 c6e6e94fcc716c61ac251c35fabb2ac4e9997638 SHA1 d043c6870bd83df554f8a0304d34348113ebbed1 SHA256 204fb0dfce0f5e2ca5c884c53cba419cc19177a0c27457603fbd7f4be3fb9104
 AUX Xsession-r2 4262 RMD160 4346445ae8c0fb6857d098988863e9d9a368e326 SHA1 5798765fb36d260492e5aa58c7e73bb31674018c SHA256 13904325f2c6f905227059c7eb7cf162b233bdb5721ec95ef5e3f35e679a43a3
 AUX Xsession-r3 4045 RMD160 538a23b1f0812fe2243d678276bced4ea03256a3 SHA1 b4deabb6795738cedca66f171e2fc504dc0cc96d SHA256 5eaa3c03278443f27a8477397dd0bcaa5f95e7d0cf99448f028bf0165ce089af
 AUX slim-1.3.2-bsd-install.patch 1315 RMD160 290a7c31b077bce33b120ab55b9bdd3c6262d2be SHA1 a50d2e3e2810af82ab9bef058a72286734afd338 SHA256 bfb5a506b3baec6d24e6f0cfba34f045768bbccccc652af11199f30a7c45d843
@@ -20,13 +21,13 @@ DIST slim-1.3.2.tar.gz 220592 RMD160 1ca6504c07ea2d420fde86b6db0f4cfbbd6680fc SH
 DIST slim-1.3.3.tar.gz 226797 RMD160 d85f66df7239992b001cb37addc7f341a7042d12 SHA1 791635fc13ec859ed3be8bf1eb2ce0ba2bb3f155 SHA256 c15248d99c36cb45c66298b0797246d43cd851765536746a431a1533e48dbbb9
 EBUILD slim-1.3.2-r6.ebuild 4475 RMD160 a49ecbd1806b9afd8a8fc2a998c210b53748a03b SHA1 b78166f0e425544983e7c45f176c7d964796d0f4 SHA256 a7809a0855a4fe663c96c5c6f3ebc9ba830dbebaa5b38bb0d5fb377ee70ef654
 EBUILD slim-1.3.2-r7.ebuild 4360 RMD160 cf5c26a404dc34221169d56f35b5668c4b178eaa SHA1 960fd6c04e2fc45c95afc9dc3834aef8f77d8bb7 SHA256 c202f61587465d9c6f760ee5cb184835f45db92f8951f182b9477afe61c5703f
-EBUILD slim-1.3.3.ebuild 3023 RMD160 6738e1b599d388914e7ea033d9c2ae29446334dd SHA1 34b4e2988c9df848eddd2b5a7e6df5c2a3a96c7a SHA256 631df519929ab0134dbcf944f7775f89e44459593cd23aceec3aa73fb177ac1d
-MISC ChangeLog 12950 RMD160 bdd43fe5b1a379fc579bc962c6bd6a6fb68fdb6b SHA1 befa272e270f7fafc0d4f3ec3001c22c00b8fa05 SHA256 e9053129f5b5626e67fd1711679167b78805731164e6dc9fa5b39f43695313dc
+EBUILD slim-1.3.3.ebuild 3112 RMD160 0f538f0246ebf1630d2c7369a4a4c9f8d2e2a1ca SHA1 dd889a1c9538b54999aba3377d443e7c01cc706d SHA256 8bca5c0c714017153534f1a1b15585b24e5b9ba6cc2597147638e9c8f42a6f41
+MISC ChangeLog 13125 RMD160 ab939acf6ee76d30fd8ba692314196d496eaa6a3 SHA1 31fd616554908f555d9a6412477a30e6140c9ae8 SHA256 695342f1fd5e66752a5b1d53950e4bf83947c634e3418947d30c9c31a4ead897
 MISC metadata.xml 317 RMD160 fcfaa261187ff694f4a90b78c82250387f85b375 SHA1 fec8ad82b63348fcabfae1082a661ff051d1b51a SHA256 5b7154fd1fce1e40461b40b06533854dc7605d8b5eb19f68eeb9d84527c579c4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk9GWKoACgkQAJxUfCtlWe0+ggD/euceJZZZXhRyL0vFln8R5L11
-h666kpyz9e7gTvCMErABAIZdI94CUybu3fIP5r9xQhREBiq6MZ22wd7NH11dVZlf
-=2zR6
+iF4EAREIAAYFAk9U3gcACgkQAJxUfCtlWe2aZQD6AovBRz7F9bVf6AAfTaP0CEvd
+VkbPLeb/piZh9Y57s6EBALB6yOHEY6nWauw7oxC/8896tUBJxXinD3BHANr7qPaX
+=Uttk
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/slim/files/405579-fix-numlock.patch b/x11-misc/slim/files/405579-fix-numlock.patch
new file mode 100644
index 000000000000..1e6ea7ec6176
--- /dev/null
+++ b/x11-misc/slim/files/405579-fix-numlock.patch
@@ -0,0 +1,16 @@
+--- numlock.cpp.orig	2012-03-04 16:21:34.000000000 +0100
++++ numlock.cpp	2012-03-04 16:24:49.000000000 +0100
+@@ -68,9 +68,11 @@
+         return;
+ 
+     if( flag == true )
+-        XkbLockModifiers ( dpy, XkbUseCoreKbd, mask, 0);
+-    else
+         XkbLockModifiers ( dpy, XkbUseCoreKbd, mask, mask);
++    else
++        XkbLockModifiers ( dpy, XkbUseCoreKbd, mask, 0);
++
++    XSync( dpy, false );
+ }
+ 
+ void NumLock::setOn(Display *dpy) {
diff --git a/x11-misc/slim/slim-1.3.3.ebuild b/x11-misc/slim/slim-1.3.3.ebuild
index 05cc8891fcc7..d5b37d50a240 100644
--- a/x11-misc/slim/slim-1.3.3.ebuild
+++ b/x11-misc/slim/slim-1.3.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/slim-1.3.3.ebuild,v 1.1 2012/02/23 15:17:56 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/slim-1.3.3.ebuild,v 1.2 2012/03/05 15:38:44 axs Exp $
 
 EAPI=4
 
@@ -46,6 +46,8 @@ src_prepare() {
 
 	# Upstream bug #15287 (still not fixed in codebase)
 	epatch "${FILESDIR}"/15287-fix-pam-authentication-with-pam_unix2.patch
+	# Gentoo bug 405579, Upstream bug #18552
+	epatch "${FILESDIR}"/405579-fix-numlock.patch
 }
 
 src_configure() {