diff options
| author | root <root@rshg054.dnsready.net> | 2012-05-12 00:02:41 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-05-12 00:02:41 +0000 |
| commit | e1da03cf5ba92abee0e3afd9dc4cef438ebf96c7 (patch) | |
| tree | 233b060ecee707d77b6c0d3d91de90eb4beed13e /extra/slim | |
| parent | 2ced64d6aa5881fa575de1861c464c432deee26f (diff) | |
Sat May 12 00:02:41 UTC 2012
Diffstat (limited to 'extra/slim')
| -rw-r--r-- | extra/slim/PKGBUILD | 11 | ||||
| -rw-r--r-- | extra/slim/fix-numlock-1.3.3.patch | 46 |
2 files changed, 53 insertions, 4 deletions
diff --git a/extra/slim/PKGBUILD b/extra/slim/PKGBUILD index f968b228c..1ef39a739 100644 --- a/extra/slim/PKGBUILD +++ b/extra/slim/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 158739 2012-05-08 16:15:26Z tpowa $ +# $Id: PKGBUILD 158801 2012-05-10 13:44:49Z tpowa $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Thayer Williams <thayer@archlinux.org> # Contributor: Alexander Fehr <pizzapunk gmail com> @@ -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 @@ source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.gz" 'logrotate' 'slim.service' 'ptr_pam.patch' - 'session-name.patch') + 'session-name.patch' + 'fix-numlock-1.3.3.patch') install=install @@ -29,6 +30,7 @@ build() { 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 @@ md5sums=('ce53e44c1e4a2eacf5bb7688ee2a5de8' '43da096480bf72c3ccec8ad8400f34f0' 'aef560f5a765582b2a7fc1fac5b323a7' 'ae4b237d472ec5d373e30080aa0ff804' - 'ebcb6829028615686de7b64ceeaaf8ed') + 'ebcb6829028615686de7b64ceeaaf8ed' + '6c29c93370e44ed310ff30132424b619') diff --git a/extra/slim/fix-numlock-1.3.3.patch b/extra/slim/fix-numlock-1.3.3.patch new file mode 100644 index 000000000..179fffcbf --- /dev/null +++ b/extra/slim/fix-numlock-1.3.3.patch @@ -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) { |