diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-14 10:24:35 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-14 10:24:35 +0100 |
| commit | a4f3ca8891e50241ac2ca144949e92b26920ffaf (patch) | |
| tree | d31841075429e437c4908580e8ec074f2fe40aa5 /extra/libxi | |
| parent | 3156702a5deccd61451be9f7d8ba0fd212a3043b (diff) | |
| parent | 01a0c4bc740842efa3bf1a7e1d6c8be5656e4e2a (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/aspell-ca/PKGBUILD
community/corkscrew/PKGBUILD
cross/mips64el-unknown-linux-gnu-binutils/PKGBUILD
extra/gstreamer0.10-base/PKGBUILD
extra/gstreamer0.10-good/PKGBUILD
extra/gstreamer0.10-ugly/PKGBUILD
extra/libxi/PKGBUILD
extra/mesa/PKGBUILD
extra/mkvtoolnix/PKGBUILD
extra/mpc/PKGBUILD
extra/poppler/PKGBUILD
extra/xf86-video-siliconmotion/PKGBUILD
extra/xorg-server/PKGBUILD
gnome-unstable/gconf/PKGBUILD
gnome-unstable/gnome-desktop/PKGBUILD
gnome-unstable/network-manager-applet/PKGBUILD
gnome-unstable/vte3/PKGBUILD
multilib/chuck/PKGBUILD
multilib/lib32-libpciaccess/PKGBUILD
multilib/lib32-libx11/PKGBUILD
multilib/lib32-libxcb/PKGBUILD
multilib/lib32-libxcb/libxcb-1.1-no-pthread-stubs.patch
multilib/lib32-libxft/PKGBUILD
multilib/lib32-libxi/PKGBUILD
multilib/lib32-llvm/PKGBUILD
multilib/lib32-mesa/PKGBUILD
testing/grep/PKGBUILD
testing/sudo/PKGBUILD
testing/xf86-input-joystick/PKGBUILD
testing/xf86-input-wacom/PKGBUILD
Diffstat (limited to 'extra/libxi')
| -rw-r--r-- | extra/libxi/PKGBUILD | 11 | ||||
| -rw-r--r-- | extra/libxi/XExtInt-align-classes-n32.diff | 31 |
2 files changed, 4 insertions, 38 deletions
diff --git a/extra/libxi/PKGBUILD b/extra/libxi/PKGBUILD index d500fb58a..4f70b7654 100644 --- a/extra/libxi/PKGBUILD +++ b/extra/libxi/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 145628 2011-12-24 14:44:56Z andyrtr $ +# $Id: PKGBUILD 153296 2012-03-12 20:52:30Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxi -pkgver=1.4.5 +pkgver=1.6.0 pkgrel=1 pkgdesc="X11 Input extension library" arch=('i686' 'x86_64' 'mips64el') @@ -11,14 +11,11 @@ depends=('libxext' 'inputproto') makedepends=('pkgconfig' 'xorg-util-macros') options=(!libtool) license=('custom') -source=(${url}/releases/individual/lib/libXi-${pkgver}.tar.bz2 - XExtInt-align-classes-n32.diff) -sha1sums=('8ac24dec8e488f49fd6a6b256c815da9ceec9737' - '30931831efa9a7f8a888f41bb9284fa32f2e2392') +source=(${url}/releases/individual/lib/libXi-${pkgver}.tar.bz2) +sha1sums=('b7edf48f93e8abd13ca688fa7f597452c4b74346') build() { cd "${srcdir}/libXi-${pkgver}" - patch -Nup0 < "${srcdir}/XExtInt-align-classes-n32.diff" ./configure --prefix=/usr --sysconfdir=/etc --disable-static make } diff --git a/extra/libxi/XExtInt-align-classes-n32.diff b/extra/libxi/XExtInt-align-classes-n32.diff deleted file mode 100644 index dc5cc4db3..000000000 --- a/extra/libxi/XExtInt-align-classes-n32.diff +++ /dev/null @@ -1,31 +0,0 @@ ---- src/XExtInt.c.orig 2011-06-14 20:46:50.254164713 +0200 -+++ src/XExtInt.c 2011-06-14 22:08:38.173047738 +0200 -@@ -1419,6 +1419,13 @@ - for (i = 0; i < nclasses; i++) - { - int l = 0; -+#ifdef _ABIN32 -+ /* On MIPS n32 doubles must be 8 byte aligned, but longs take -+ 4 bytes, so next_block could make this structure -+ unaligned. */ -+ if(len % 8 != 0) -+ len += 8 - len % 8; -+#endif - any_wire = (xXIAnyInfo*)ptr_wire; - switch(any_wire->type) - { -@@ -1467,6 +1474,14 @@ - - for (i = 0; i < nclasses; i++) - { -+#ifdef _ABIN32 -+ /* On MIPS n32 doubles must be 8 byte aligned, but longs take -+ 4 bytes, so next_block could make this structure -+ unaligned. */ -+ if(((size_t) ptr_lib) % 8 != 0) -+ ptr_lib += 8 - ((size_t) ptr_lib) % 8; -+#endif -+ - any_lib = (XIAnyClassInfo*)ptr_lib; - any_wire = (xXIAnyInfo*)ptr_wire; - |