diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-06-04 13:43:14 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-06-04 13:43:14 -0300 |
| commit | cbba2111ae585b17594535ec01f13bac66937331 (patch) | |
| tree | f097dd36996ae3c7c96c9f91c1dd428670572b80 /extra/libx11 | |
| parent | abcaa80b2d3bb539503c485bfea891adc7ffc193 (diff) | |
| parent | 1e6588d64f084decf287a58b7ff93ff0ce4d0446 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/multipath-tools/PKGBUILD
community/perl-gnome2-wnck/PKGBUILD
community/znc/PKGBUILD
core/openldap/PKGBUILD
extra/mod_perl/PKGBUILD
extra/perl-digest-nilsimsa/PKGBUILD
extra/php/PKGBUILD
extra/pidgin/PKGBUILD
extra/postgresql/PKGBUILD
extra/vim/PKGBUILD
extra/xcb-util-keysyms/PKGBUILD
extra/xcb-util-wm/PKGBUILD
extra/xournal/PKGBUILD
kde-unstable/kdepim/PKGBUILD
multilib/lib32-libx11/PKGBUILD
multilib/lib32-libxft/PKGBUILD
multilib/lib32-xcb-util/PKGBUILD
Diffstat (limited to 'extra/libx11')
| -rw-r--r-- | extra/libx11/PKGBUILD | 10 | ||||
| -rw-r--r-- | extra/libx11/xorg.csh | 4 | ||||
| -rw-r--r-- | extra/libx11/xorg.sh | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/extra/libx11/PKGBUILD b/extra/libx11/PKGBUILD index 541fc294c..acdc995ed 100644 --- a/extra/libx11/PKGBUILD +++ b/extra/libx11/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 160023 2012-05-28 10:00:52Z andyrtr $ +# $Id: PKGBUILD 160633 2012-06-02 21:43:25Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libx11 -pkgver=1.4.99.902 +pkgver=1.5.0 pkgrel=1 pkgdesc="X11 client-side library" arch=(i686 x86_64 'mips64el') @@ -14,9 +14,9 @@ license=('custom') source=(${url}/releases/individual/lib/libX11-${pkgver}.tar.bz2 xorg.sh xorg.csh) -sha1sums=('afe75b7c2c54e354f726fd36251bcfec1e1f833a' - '4b756387426afb2a5bb7a155631ec42348abf5c1' - '45b0b310776cf5d9a94b4a18a5c63ddad9de6ba8') +sha256sums=('c382efd7e92bfc3cef39a4b7f1ecf2744ba4414a705e3bc1e697f75502bd4d86' + '1a1b5db0320579958fba24774bae7984a1b1b8c647ac6fbd4d8937178c48ed46' + '96c85ccbdcb056540f2e2b6cf48dea067f80260c16957ee401c49cf94cea5894') build() { cd "${srcdir}/libX11-${pkgver}" diff --git a/extra/libx11/xorg.csh b/extra/libx11/xorg.csh index 26c49a222..39d5a9715 100644 --- a/extra/libx11/xorg.csh +++ b/extra/libx11/xorg.csh @@ -3,9 +3,9 @@ setenv XDG_CONFIG_HOME ${HOME}/.config setenv XDG_CACHE_HOME ${HOME}/.cache if (! ($?XDG_DATA_DIRS) ) then - setenv XDG_DATA_DIRS /usr/share/:/usr/local/share/ + setenv XDG_DATA_DIRS /usr/local/share/:/usr/share/ else - setenv XDG_DATA_DIRS /usr/share/:/usr/local/share/:${XDG_DATA_DIRS} + setenv XDG_DATA_DIRS /usr/local/share/:/usr/share/:${XDG_DATA_DIRS} endif if (! ($?XDG_CONFIG_DIRS) ) then diff --git a/extra/libx11/xorg.sh b/extra/libx11/xorg.sh index e1de6866c..4fc02e322 100644 --- a/extra/libx11/xorg.sh +++ b/extra/libx11/xorg.sh @@ -3,9 +3,9 @@ export XDG_CONFIG_HOME=$HOME/.config export XDG_CACHE_HOME=$HOME/.cache if [ -z $XDG_DATA_DIRS ]; then - export XDG_DATA_DIRS=/usr/share/:/usr/local/share/ + export XDG_DATA_DIRS=/usr/local/share/:/usr/share/ else - export XDG_DATA_DIRS=/usr/share/:/usr/local/share/:$XDG_DATA_DIRS + export XDG_DATA_DIRS=/usr/local/share/:/usr/share/:$XDG_DATA_DIRS fi if [ -z $XDG_CONFIG_DIRS ]; then |