Date: Wednesday, March 11, 2015 @ 08:33:12 Author: lcarlier Revision: 233339
archrelease: copy trunk to testing-i686, testing-x86_64 Added: libx11/repos/testing-i686/ libx11/repos/testing-i686/PKGBUILD (from rev 233338, libx11/trunk/PKGBUILD) libx11/repos/testing-i686/fix_typo.diff (from rev 233338, libx11/trunk/fix_typo.diff) libx11/repos/testing-x86_64/ libx11/repos/testing-x86_64/PKGBUILD (from rev 233338, libx11/trunk/PKGBUILD) libx11/repos/testing-x86_64/fix_typo.diff (from rev 233338, libx11/trunk/fix_typo.diff) ------------------------------+ testing-i686/PKGBUILD | 36 ++++++++++++++++++++++++++++++++++++ testing-i686/fix_typo.diff | 27 +++++++++++++++++++++++++++ testing-x86_64/PKGBUILD | 36 ++++++++++++++++++++++++++++++++++++ testing-x86_64/fix_typo.diff | 27 +++++++++++++++++++++++++++ 4 files changed, 126 insertions(+) Copied: libx11/repos/testing-i686/PKGBUILD (from rev 233338, libx11/trunk/PKGBUILD) =================================================================== --- testing-i686/PKGBUILD (rev 0) +++ testing-i686/PKGBUILD 2015-03-11 07:33:12 UTC (rev 233339) @@ -0,0 +1,36 @@ +# $Id$ +# Maintainer: Andreas Radke <andy...@archlinux.org> +# Maintainer: Jan de Groot <j...@archlinux.org> + +pkgname=libx11 +pkgver=1.6.3 +pkgrel=1 +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{,.sig}) +sha256sums=('cf31a7c39f2f52e8ebd0db95640384e63451f9b014eed2bb7f5de03e8adc8111' + 'SKIP') +validpgpkeys=('4A193C06D35E7C670FA4EF0BA2FB9E081F2D130E') + +build() { + cd "${srcdir}/libX11-${pkgver}" + ./configure --prefix=/usr --disable-static --disable-xf86bigfont + make +} + +check() { + cd "${srcdir}/libX11-${pkgver}" + make check +} + +package() { + cd "${srcdir}/libX11-${pkgver}" + make DESTDIR="${pkgdir}" install + + install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" +} Copied: libx11/repos/testing-i686/fix_typo.diff (from rev 233338, libx11/trunk/fix_typo.diff) =================================================================== --- testing-i686/fix_typo.diff (rev 0) +++ testing-i686/fix_typo.diff 2015-03-11 07:33:12 UTC (rev 233339) @@ -0,0 +1,27 @@ +From 5dcb40f28d59587597d2ff6e6ac64c71cfe6ff7b Mon Sep 17 00:00:00 2001 +From: James Cloos <cl...@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 <cl...@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 + Copied: libx11/repos/testing-x86_64/PKGBUILD (from rev 233338, libx11/trunk/PKGBUILD) =================================================================== --- testing-x86_64/PKGBUILD (rev 0) +++ testing-x86_64/PKGBUILD 2015-03-11 07:33:12 UTC (rev 233339) @@ -0,0 +1,36 @@ +# $Id$ +# Maintainer: Andreas Radke <andy...@archlinux.org> +# Maintainer: Jan de Groot <j...@archlinux.org> + +pkgname=libx11 +pkgver=1.6.3 +pkgrel=1 +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{,.sig}) +sha256sums=('cf31a7c39f2f52e8ebd0db95640384e63451f9b014eed2bb7f5de03e8adc8111' + 'SKIP') +validpgpkeys=('4A193C06D35E7C670FA4EF0BA2FB9E081F2D130E') + +build() { + cd "${srcdir}/libX11-${pkgver}" + ./configure --prefix=/usr --disable-static --disable-xf86bigfont + make +} + +check() { + cd "${srcdir}/libX11-${pkgver}" + make check +} + +package() { + cd "${srcdir}/libX11-${pkgver}" + make DESTDIR="${pkgdir}" install + + install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" +} Copied: libx11/repos/testing-x86_64/fix_typo.diff (from rev 233338, libx11/trunk/fix_typo.diff) =================================================================== --- testing-x86_64/fix_typo.diff (rev 0) +++ testing-x86_64/fix_typo.diff 2015-03-11 07:33:12 UTC (rev 233339) @@ -0,0 +1,27 @@ +From 5dcb40f28d59587597d2ff6e6ac64c71cfe6ff7b Mon Sep 17 00:00:00 2001 +From: James Cloos <cl...@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 <cl...@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 +