summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@kiwwwi.com.ar>2013-01-23 19:31:16 -0300
committerNicolás Reynolds <fauno@kiwwwi.com.ar>2013-01-23 19:31:16 -0300
commit59a85546825bde45248cd216c2d8fae8f72e4046 (patch)
tree4671056dabe2acadd54ab89d8cfcb46bf2283145 /core
parent1f07b846d901eeaf0019566766f8a327ed2d078d (diff)
parent91fea2e90c87b282a3bb39b080b8c51eb52cdbbe (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community/chmsee/PKGBUILD community/libzdb/PKGBUILD community/notmuch/PKGBUILD community/v8/PKGBUILD community/zathura-ps/PKGBUILD core/dash/PKGBUILD extra/slim/PKGBUILD
Diffstat (limited to 'core')
-rw-r--r--core/dash/PKGBUILD4
-rw-r--r--core/kbd/PKGBUILD14
-rw-r--r--core/kbd/fix-keymap-loading-1.15.5.patch47
-rw-r--r--core/rfkill/PKGBUILD8
-rw-r--r--core/rfkill/service.block1
-rw-r--r--core/rfkill/service.unblock1
6 files changed, 62 insertions, 13 deletions
diff --git a/core/dash/PKGBUILD b/core/dash/PKGBUILD
index 41f067cb7..3a4f830a8 100644
--- a/core/dash/PKGBUILD
+++ b/core/dash/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 135572 2011-08-15 22:58:37Z tomegun $
+# $Id: PKGBUILD 175814 2013-01-22 03:43:27Z dan $
# Maintainer: Dan McGee <dan@archlinux.org>
pkgname=dash
pkgver=0.5.7
-pkgrel=2.1
+pkgrel=3
pkgdesc="A POSIX compliant shell that aims to be as small as possible"
arch=('i686' 'x86_64' 'mips64el')
url="http://gondor.apana.org.au/~herbert/dash/"
diff --git a/core/kbd/PKGBUILD b/core/kbd/PKGBUILD
index df6a1a5a3..425d03a23 100644
--- a/core/kbd/PKGBUILD
+++ b/core/kbd/PKGBUILD
@@ -1,19 +1,21 @@
-# $Id: PKGBUILD 175117 2013-01-14 07:36:39Z tpowa $
+# $Id: PKGBUILD 175749 2013-01-21 10:51:33Z tpowa $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
pkgname=kbd
pkgver=1.15.5
-pkgrel=2
+pkgrel=3
pkgdesc="Keytable files and keyboard utilities"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.kbd-project.org"
license=('GPL')
depends=('glibc' 'pam')
-source=(ftp://ftp.altlinux.org/pub/people/legion/kbd/${pkgname}-${pkgver}.tar.gz)
+source=(ftp://ftp.altlinux.org/pub/people/legion/kbd/${pkgname}-${pkgver}.tar.gz
+ 'fix-keymap-loading-1.15.5.patch')
provides=('vlock')
conflicts=('vlock')
replaces=('vlock')
-md5sums=('34c71feead8ab9c01ec638acea8cd877')
+md5sums=('34c71feead8ab9c01ec638acea8cd877'
+ '4362091d5e23bab2d158f8c7693a45d8')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
@@ -27,7 +29,9 @@ build() {
mv data/keymaps/i386/dvorak/no{,-dvorak}.map
mv data/keymaps/i386/fgGIod/trf{,-fgGIod}.map
mv data/keymaps/i386/colemak/{en-latin9,colemak}.map
-
+ # fix https://bugs.archlinux.org/task/33308
+ # keymap loading is broken for cetain keymaps
+ patch -Np1 -i ../fix-keymap-loading-1.15.5.patch
./configure --prefix=/usr --datadir=/usr/share/kbd --mandir=/usr/share/man
make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes
}
diff --git a/core/kbd/fix-keymap-loading-1.15.5.patch b/core/kbd/fix-keymap-loading-1.15.5.patch
new file mode 100644
index 000000000..ae179d887
--- /dev/null
+++ b/core/kbd/fix-keymap-loading-1.15.5.patch
@@ -0,0 +1,47 @@
+commit 7e06e56157e8431d02e1377cdc44230944203d88
+Author: Alexey Gladkov <gladkov.alexey@gmail.com>
+Date: Tue Dec 11 14:24:44 2012 +0400
+
+ Fix regression in 16117ce6ab
+
+ Signed-off-by: Alexey Gladkov <gladkov.alexey@gmail.com>
+
+diff --git a/src/loadkeys.analyze.l b/src/loadkeys.analyze.l
+index c18dcea..f817c78 100644
+--- a/src/loadkeys.analyze.l
++++ b/src/loadkeys.analyze.l
+@@ -307,8 +307,10 @@ To to|To|TO
+ char *s = xstrndup(yytext+1, strlen(yytext)-2);
+ /* use static pathname to store *s ? */
+ open_include(s);
+- yy_pop_state();
+- state_ptr--;
++ while (state_ptr > 0) {
++ yy_pop_state();
++ state_ptr--;
++ }
+ }
+ <INCLSTR>[^"]|\"\"|\"[^"\n]*{Eol} {
+ yyerror(_("expected filename between quotes"));
+@@ -323,7 +325,7 @@ To to|To|TO
+ }
+ {Eol} {
+ line_nr++;
+- if (state_ptr > 0) {
++ while (state_ptr > 0) {
+ yy_pop_state();
+ state_ptr--;
+ }
+@@ -428,8 +430,10 @@ To to|To|TO
+ }
+ <STR>\" {
+ *p = '\0';
+- yy_pop_state();
+- state_ptr--;
++ while (state_ptr > 0) {
++ yy_pop_state();
++ state_ptr--;
++ }
+ return(STRLITERAL);
+ }
+ . {
diff --git a/core/rfkill/PKGBUILD b/core/rfkill/PKGBUILD
index 9eb84ddd3..580296392 100644
--- a/core/rfkill/PKGBUILD
+++ b/core/rfkill/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 171055 2012-11-16 01:20:16Z bisson $
+# $Id: PKGBUILD 175740 2013-01-21 04:49:48Z bisson $
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
# Contributor: Thomas Bächler <thomas@archlinux.org>
# Contributor: Giovanni Scafora <giovanni@archlinux.org>
pkgname=rfkill
pkgver=0.4
-pkgrel=6
+pkgrel=7
pkgdesc='Tool for enabling and disabling wireless devices'
url='http://linuxwireless.org/en/users/Documentation/rfkill'
license=('custom')
@@ -17,8 +17,8 @@ source=("http://wireless.kernel.org/download/${pkgname}/${pkgname}-${pkgver}.tar
'conf.d'
'rc.d')
sha1sums=('fccabf5a272ac2891f24dc35449dc6f4c45ff44b'
- '8b4f0effcad564e929cf65c50773881d1209e54b'
- '10febfa26656bc395aeca477d4d44a1e0482375c'
+ '4d0ef151891c32c882dcec8b03ab7204f015d0d1'
+ 'c44581c4cc19509f53afd0abea1341cc30751fe2'
'6390eaa793b473098aaa11b13c5254d611a4c13a'
'd969fe927a9fb2926af43a311a7c1fa126fe59a9'
'380af0b002f51543557306ed68a27f0059fd5a6f')
diff --git a/core/rfkill/service.block b/core/rfkill/service.block
index 443c62526..420272c5d 100644
--- a/core/rfkill/service.block
+++ b/core/rfkill/service.block
@@ -5,7 +5,6 @@ After=rfkill-unblock@all.service
[Service]
Type=oneshot
ExecStart=/usr/sbin/rfkill block %I
-RemainAfterExit=yes
[Install]
WantedBy=multi-user.target
diff --git a/core/rfkill/service.unblock b/core/rfkill/service.unblock
index fb8776653..40f4e3244 100644
--- a/core/rfkill/service.unblock
+++ b/core/rfkill/service.unblock
@@ -5,7 +5,6 @@ After=rfkill-block@all.service
[Service]
Type=oneshot
ExecStart=/usr/sbin/rfkill unblock %I
-RemainAfterExit=yes
[Install]
WantedBy=multi-user.target