[arch-commits] Commit in slim/trunk (PKGBUILD fix-numlock-1.3.3.patch)

[Tobias Powalowski]

    Date: Thursday, May 10, 2012 @ 09:36:56
  Author: tpowa
Revision: 158800

upgpkg: slim 1.3.3-3

fix numlock issue

Added:
  slim/trunk/fix-numlock-1.3.3.patch
Modified:
  slim/trunk/PKGBUILD

-------------------------+
 PKGBUILD                |    9 ++++++---
 fix-numlock-1.3.3.patch |   46 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-05-10 13:15:10 UTC (rev 158799)
+++ PKGBUILD	2012-05-10 13:36:56 UTC (rev 158800)
@@ -6,7 +6,7 @@
 
 pkgname=slim
 pkgver=1.3.3
-pkgrel=2
+pkgrel=3
 pkgdesc='Desktop-independent graphical login manager for X11'
 arch=('i686' 'x86_64')
 url='http://slim.berlios.de/'
@@ -20,7 +20,8 @@
         'logrotate'
         'slim.service'
         'ptr_pam.patch'
-        'session-name.patch')
+        'session-name.patch'
+        'fix-numlock-1.3.3.patch')
 
 
 install=install
@@ -29,6 +30,7 @@
         cd "${srcdir}/${pkgname}-${pkgver}"
 	patch -p1 -i ../ptr_pam.patch # FS#23995: pointer mishandling confuses PAM
 	patch -p1 -i ../session-name.patch # FS#26693: fix default session name
+        patch -p1 -i ../fix-numlock-1.3.3.patch # FS#29818: fix numlock handling
         cd ${srcdir}
         mkdir build
         cd build
@@ -60,4 +62,5 @@
          '43da096480bf72c3ccec8ad8400f34f0'
          'aef560f5a765582b2a7fc1fac5b323a7'
          'ae4b237d472ec5d373e30080aa0ff804'
-         'ebcb6829028615686de7b64ceeaaf8ed')
+         'ebcb6829028615686de7b64ceeaaf8ed'
+         '6c29c93370e44ed310ff30132424b619')

Added: fix-numlock-1.3.3.patch
===================================================================
--- fix-numlock-1.3.3.patch	                        (rev 0)
+++ fix-numlock-1.3.3.patch	2012-05-10 13:36:56 UTC (rev 158800)
@@ -0,0 +1,46 @@
+--- trunk/app.cpp	2012/02/21 23:57:28	211
++++ trunk/app.cpp	2012/04/16 23:28:34	212
+@@ -332,6 +332,15 @@
+             Login();
+         }
+     }
++
++    // Set NumLock
++    string numlock = cfg->getOption("numlock");
++    if (numlock == "on") {
++        NumLock::setOn(Dpy);
++    } else if (numlock == "off") {
++        NumLock::setOff(Dpy);
++    }
++    
+     // Start looping
+     int panelclosed = 1;
+     Panel::ActionType Action;
+@@ -971,13 +980,6 @@
+         break;
+     }
+ 
+-    string numlock = cfg->getOption("numlock");
+-    if (numlock == "on") {
+-        NumLock::setOn(Dpy);
+-    } else if (numlock == "off") {
+-        NumLock::setOff(Dpy);
+-    }
+-    
+     delete args;
+ 
+     serverStarted = true;
+--- trunk/numlock.cpp	2012/02/21 23:57:28	211
++++ trunk/numlock.cpp	2012/04/16 23:28:34	212
+@@ -68,9 +68,9 @@
+         return;
+ 
+     if( flag == true )
+-        XkbLockModifiers ( dpy, XkbUseCoreKbd, mask, 0);
+-    else
+         XkbLockModifiers ( dpy, XkbUseCoreKbd, mask, mask);
++    else
++        XkbLockModifiers ( dpy, XkbUseCoreKbd, mask, 0);
+ }
+ 
+ void NumLock::setOn(Display *dpy) {