diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-10-15 00:31:49 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-10-15 00:31:49 -0300 |
| commit | 93db7f2fb23cba78cde4343b506a676e376ca4a8 (patch) | |
| tree | 3fec56215a344b1e01e49a27198f919ac981320b /core/kbd/PKGBUILD | |
| parent | c162e34d12c6cf76532a7f6b3d538d493a8bf17a (diff) | |
| parent | 39e9111d76d232d65ca0c43285dea5bd5d58d28e (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/avant-window-navigator/PKGBUILD
community/awn-extras-applets/PKGBUILD
community/cinnamon-control-center/PKGBUILD
community/gnome-menus2/PKGBUILD
community/gnome-panel/PKGBUILD
community/gpsim/PKGBUILD
community/kgraphviewer/PKGBUILD
community/kpovmodeler/PKGBUILD
community/libdesktop-agnostic/PKGBUILD
community/python-basemap/PKGBUILD
community/python-mpi4py/PKGBUILD
community/python-psutil/PKGBUILD
community/qgo/PKGBUILD
community/ude/PKGBUILD
community/virtkey/PKGBUILD
extra/alsaplayer/PKGBUILD
extra/aterm/PKGBUILD
extra/cups-pdf/PKGBUILD
extra/ffmpeg/PKGBUILD
extra/gtk2/PKGBUILD
extra/kdeplasma-applets-networkmanagement/PKGBUILD
extra/libffado/PKGBUILD
extra/libtar/PKGBUILD
extra/maxima/PKGBUILD
extra/php-xcache/PKGBUILD
extra/postgresql/PKGBUILD
extra/xorg-server/PKGBUILD
extra/xorg-xauth/PKGBUILD
Diffstat (limited to 'core/kbd/PKGBUILD')
| -rw-r--r-- | core/kbd/PKGBUILD | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/core/kbd/PKGBUILD b/core/kbd/PKGBUILD index 7e88f3f7e..b2e250cda 100644 --- a/core/kbd/PKGBUILD +++ b/core/kbd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 193453 2013-08-20 12:18:42Z tpowa $ +# $Id: PKGBUILD 196308 2013-10-11 09:58:13Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=kbd pkgver=2.0.0 -pkgrel=1 +pkgrel=2 pkgdesc="Keytable files and keyboard utilities" arch=('i686' 'x86_64' 'mips64el') url="http://www.kbd-project.org" @@ -12,13 +12,17 @@ depends=('glibc' 'pam') makedepends=('check') source=(ftp://ftp.altlinux.org/pub/people/legion/kbd/${pkgname}-${pkgver}.tar.gz 'fix-dvorak-es.patch' - 'fix-euro2.patch') + 'fix-euro2.patch' + 'fix-alt_is_meta.patch' + 'merge-fullline_singleline.patch') provides=('vlock') conflicts=('vlock') replaces=('vlock') md5sums=('5ba259a0b2464196f6488a72070a3d60' '998957c4f815347dcc874c4d7555dc66' - 'd869200acbc0aab6a9cafa43cb140d4e') + 'd869200acbc0aab6a9cafa43cb140d4e' + '91de90cde763c7f704027c2837360098' + 'b21e24509ea9db206971ce8a02dfc46f') prepare() { cd ${srcdir}/${pkgname}-${pkgver} @@ -36,6 +40,9 @@ prepare() { patch -Np1 -i ../fix-dvorak-es.patch # fix euro2 #28213 patch -Np1 -i ../fix-euro2.patch + # fix #36689 + patch -Np1 -i ../fix-alt_is_meta.patch + patch -Np1 -i ../merge-fullline_singleline.patch } build() { |