[arch-commits] Commit in libx11/trunk (PKGBUILD fix_typo.diff)

[Andreas Radke]

    Date: Friday, May 30, 2014 @ 16:31:28
  Author: andyrtr
Revision: 213851

upgpkg: libx11 1.6.2-2

fix FS#40537

Added:
  libx11/trunk/fix_typo.diff
Modified:
  libx11/trunk/PKGBUILD

---------------+
 PKGBUILD      |   15 ++++++++++++---
 fix_typo.diff |   27 +++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-05-30 13:32:16 UTC (rev 213850)
+++ PKGBUILD	2014-05-30 14:31:28 UTC (rev 213851)
@@ -1,9 +1,10 @@
 # $Id$
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
 # Maintainer: Jan de Groot <jgc at 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/"
@@ -10,9 +11,17 @@
 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}"
   ./configure --prefix=/usr --disable-static --disable-xf86bigfont

Added: fix_typo.diff
===================================================================
--- fix_typo.diff	                        (rev 0)
+++ fix_typo.diff	2014-05-30 14:31:28 UTC (rev 213851)
@@ -0,0 +1,27 @@
+From 5dcb40f28d59587597d2ff6e6ac64c71cfe6ff7b Mon Sep 17 00:00:00 2001
+From: James Cloos <cloos at 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 at 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
+