summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Stakenvicius <axs@gentoo.org>2012-03-05 15:38:44 +0000
committerIan Stakenvicius <axs@gentoo.org>2012-03-05 15:38:44 +0000
commit0f725cb9d108a478dc7a540b2f7a8e128cc127e7 (patch)
treedf316b39a717fdc1c14535f61e6768621c51541d /x11-misc/slim
parentawesome doesn't work with lua 5.2, restricted lua dep to 5.1.* - bug #406985 (diff)
downloadgentoo-2-0f725cb9d108a478dc7a540b2f7a8e128cc127e7.tar.gz
gentoo-2-0f725cb9d108a478dc7a540b2f7a8e128cc127e7.tar.bz2
gentoo-2-0f725cb9d108a478dc7a540b2f7a8e128cc127e7.zip
fixed numlock issue, bug #405579 -- thanks to Vincent for the patch.
(Portage version: 2.1.10.41/cvs/Linux i686)
Diffstat (limited to 'x11-misc/slim')
-rw-r--r--x11-misc/slim/ChangeLog6
-rw-r--r--x11-misc/slim/files/405579-fix-numlock.patch16
-rw-r--r--x11-misc/slim/slim-1.3.3.ebuild4
3 files changed, 24 insertions, 2 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/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() {