diff options
| -rw-r--r-- | abs/core/libx11/PKGBUILD | 27 | ||||
| -rw-r--r-- | abs/core/libx11/fix_typo.diff | 27 | ||||
| -rw-r--r-- | abs/core/libx11/xorg.csh | 15 | ||||
| -rw-r--r-- | abs/core/libx11/xorg.sh | 15 |
4 files changed, 41 insertions, 43 deletions
diff --git a/abs/core/libx11/PKGBUILD b/abs/core/libx11/PKGBUILD index dfee942..4e34502 100644 --- a/abs/core/libx11/PKGBUILD +++ b/abs/core/libx11/PKGBUILD @@ -1,22 +1,26 @@ -# $Id: PKGBUILD 160633 2012-06-02 21:43:25Z andyrtr $ +# $Id$ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libx11 -pkgver=1.5.0 -pkgrel=1 +pkgver=1.6.2 +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') -options=('!libtool') license=('custom') source=(${url}/releases/individual/lib/libX11-${pkgver}.tar.bz2 - xorg.sh - xorg.csh) -sha256sums=('c382efd7e92bfc3cef39a4b7f1ecf2744ba4414a705e3bc1e697f75502bd4d86' - '1a1b5db0320579958fba24774bae7984a1b1b8c647ac6fbd4d8937178c48ed46' - '96c85ccbdcb056540f2e2b6cf48dea067f80260c16957ee401c49cf94cea5894') + 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}" @@ -24,7 +28,7 @@ build() { make } -package() { +check() { cd "${srcdir}/libX11-${pkgver}" make check } @@ -33,9 +37,6 @@ package() { cd "${srcdir}/libX11-${pkgver}" make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/etc/profile.d" - install -m755 "${srcdir}/"xorg.{sh,csh} "${pkgdir}/etc/profile.d/" - install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" } diff --git a/abs/core/libx11/fix_typo.diff b/abs/core/libx11/fix_typo.diff new file mode 100644 index 0000000..a55a940 --- /dev/null +++ b/abs/core/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 + diff --git a/abs/core/libx11/xorg.csh b/abs/core/libx11/xorg.csh deleted file mode 100644 index 39d5a97..0000000 --- a/abs/core/libx11/xorg.csh +++ /dev/null @@ -1,15 +0,0 @@ -setenv XDG_DATA_HOME ${HOME}/.local/share -setenv XDG_CONFIG_HOME ${HOME}/.config -setenv XDG_CACHE_HOME ${HOME}/.cache - -if (! ($?XDG_DATA_DIRS) ) then - setenv XDG_DATA_DIRS /usr/local/share/:/usr/share/ -else - setenv XDG_DATA_DIRS /usr/local/share/:/usr/share/:${XDG_DATA_DIRS} -endif - -if (! ($?XDG_CONFIG_DIRS) ) then - setenv XDG_CONFIG_DIRS /etc/xdg -else - setenv XDG_CONFIG_DIRS /etc/xdg:${XDG_CONFIG_DIRS} -endif diff --git a/abs/core/libx11/xorg.sh b/abs/core/libx11/xorg.sh deleted file mode 100644 index 4fc02e3..0000000 --- a/abs/core/libx11/xorg.sh +++ /dev/null @@ -1,15 +0,0 @@ -export XDG_DATA_HOME=$HOME/.local/share -export XDG_CONFIG_HOME=$HOME/.config -export XDG_CACHE_HOME=$HOME/.cache - -if [ -z $XDG_DATA_DIRS ]; then - export XDG_DATA_DIRS=/usr/local/share/:/usr/share/ -else - export XDG_DATA_DIRS=/usr/local/share/:/usr/share/:$XDG_DATA_DIRS -fi - -if [ -z $XDG_CONFIG_DIRS ]; then - export XDG_CONFIG_DIRS=/etc/xdg -else - export XDG_CONFIG_DIRS=/etc/xdg:$XDG_CONFIG_DIRS -fi |