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

[Laurent Carlier]

    Date: Wednesday, October 5, 2016 @ 05:33:30
  Author: lcarlier
Revision: 277720

upgpkg: libx11 1.6.4-1

upstream release 1.6.4

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-10-04 22:09:53 UTC (rev 277719)
+++ PKGBUILD	2016-10-05 05:33:30 UTC (rev 277720)
@@ -3,7 +3,7 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=libx11
-pkgver=1.6.3
+pkgver=1.6.4
 pkgrel=1
 pkgdesc="X11 client-side library"
 arch=(i686 x86_64)
@@ -12,9 +12,10 @@
 makedepends=('xorg-util-macros' 'xextproto' 'xtrans' 'inputproto')
 license=('custom')
 source=(${url}/releases/individual/lib/libX11-${pkgver}.tar.bz2{,.sig})
-sha256sums=('cf31a7c39f2f52e8ebd0db95640384e63451f9b014eed2bb7f5de03e8adc8111'
+sha256sums=('b7c748be3aa16ec2cbd81edc847e9b6ee03f88143ab270fb59f58a044d34e441'
             'SKIP')
 validpgpkeys=('4A193C06D35E7C670FA4EF0BA2FB9E081F2D130E')
+validpgpkeys+=('C41C985FDCF1E5364576638B687393EE37D128F8') # Matthieu Herrb <matthieu.herrb at laas.fr>
 
 build() {
   cd "${srcdir}/libX11-${pkgver}"

Deleted: fix_typo.diff
===================================================================
--- fix_typo.diff	2016-10-04 22:09:53 UTC (rev 277719)
+++ fix_typo.diff	2016-10-05 05:33:30 UTC (rev 277720)
@@ -1,27 +0,0 @@
-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
-