diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-05-31 03:57:01 +0000 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-05-31 03:57:01 +0000 |
| commit | 7cd564d1e9657febf970765ffd43fcee8abe7ff5 (patch) | |
| tree | 49981b5eb9933d5122695dbe1698233d0ef53133 /extra/libx11 | |
| parent | 4ac93228afaf8da847b4ec91aac9c43f3bef472c (diff) | |
Sat May 31 03:30:32 UTC 2014
Diffstat (limited to 'extra/libx11')
| -rw-r--r-- | extra/libx11/PKGBUILD | 17 | ||||
| -rw-r--r-- | extra/libx11/fix_typo.diff | 27 |
2 files changed, 40 insertions, 4 deletions
diff --git a/extra/libx11/PKGBUILD b/extra/libx11/PKGBUILD index 478b842e9..8e60be8f1 100644 --- a/extra/libx11/PKGBUILD +++ b/extra/libx11/PKGBUILD @@ -1,17 +1,26 @@ -# $Id: PKGBUILD 198269 2013-10-30 13:50:33Z allan $ +# $Id: PKGBUILD 213852 2014-05-30 14:31:43Z andyrtr $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libx11 pkgver=1.6.2 -pkgrel=1 +pkgrel=2 pkgdesc="X11 client-side library" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" depends=('libxcb' 'xproto' 'kbproto') makedepends=('xorg-util-macros' 'xextproto' 'xtrans' 'inputproto') license=('custom') -source=(${url}/releases/individual/lib/libX11-${pkgver}.tar.bz2) -sha256sums=('2aa027e837231d2eeea90f3a4afe19948a6eb4c8b2bec0241eba7dbc8106bd16') +source=(${url}/releases/individual/lib/libX11-${pkgver}.tar.bz2 + fix_typo.diff) +sha256sums=('2aa027e837231d2eeea90f3a4afe19948a6eb4c8b2bec0241eba7dbc8106bd16' + '384a10e57e0d6125ebb7e6eaca046e02f59e8101eaa7ba470e52b5bcc18bedf3') + +prepare() { + cd "${srcdir}/libX11-${pkgver}" + # upstream patch for https://bugs.archlinux.org/task/40537 + patch -Np1 -i ${srcdir}/fix_typo.diff +} build() { cd "${srcdir}/libX11-${pkgver}" diff --git a/extra/libx11/fix_typo.diff b/extra/libx11/fix_typo.diff new file mode 100644 index 000000000..a55a94074 --- /dev/null +++ b/extra/libx11/fix_typo.diff @@ -0,0 +1,27 @@ +From 5dcb40f28d59587597d2ff6e6ac64c71cfe6ff7b Mon Sep 17 00:00:00 2001 +From: James Cloos <cloos@jhcloos.com> +Date: Tue, 17 Sep 2013 16:50:42 +0000 +Subject: nls/en_US.UTF-8/Compose.pre: Fix typo. + +Fix typo added in 215ce6a67863, s/actute/acute/. + +Fixes bug #69476. Reported by Jean Krohn. + +Signed-off-by: James Cloos <cloos@jhcloos.com> +--- +diff --git a/nls/en_US.UTF-8/Compose.pre b/nls/en_US.UTF-8/Compose.pre +index a741332..7314d7f 100644 +--- a/nls/en_US.UTF-8/Compose.pre ++++ b/nls/en_US.UTF-8/Compose.pre +@@ -743,7 +743,7 @@ XCOMM Part 3 + <Multi_key> <i> <quotedbl> : "ï" idiaeresis # LATIN SMALL LETTER I WITH DIAERESIS + <Multi_key> <diaeresis> <i> : "ï" idiaeresis # LATIN SMALL LETTER I WITH DIAERESIS + <Multi_key> <i> <diaeresis> : "ï" idiaeresis # LATIN SMALL LETTER I WITH DIAERESIS +-<dead_actute> <j> : "j́" # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301 ++<dead_acute> <j> : "j́" # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301 + <Multi_key> <apostrophe> <j> : "j́" # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301 + <Multi_key> <j> <apostrophe> : "j́" # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301 + <Multi_key> <acute> <j> : "j́" # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301 +-- +cgit v0.9.0.2-2-gbebe + |