[arch-commits] Commit in xf86-input-vmmouse/trunk (PKGBUILD abi.patch)

[Jan de Groot]

    Date: Tuesday, August 24, 2010 @ 05:08:31
  Author: jgc
Revision: 88594

upgpkg: xf86-input-vmmouse 12.6.10-1
Update to 12.6.10, build for xserver 1.9

Modified:
  xf86-input-vmmouse/trunk/PKGBUILD
Deleted:
  xf86-input-vmmouse/trunk/abi.patch

-----------+
 PKGBUILD  |   19 +++++++++++--------
 abi.patch |   12 ------------
 2 files changed, 11 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-08-24 09:08:18 UTC (rev 88593)
+++ PKGBUILD	2010-08-24 09:08:31 UTC (rev 88594)
@@ -2,25 +2,28 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=xf86-input-vmmouse
-pkgver=12.6.7
+pkgver=12.6.10
 pkgrel=1
 pkgdesc="X.org VMWare Mouse input driver"
 arch=(i686 x86_64)
 license=('custom')
 url="http://xorg.freedesktop.org/"
 depends=('glibc' 'sh')
-makedepends=('pkgconfig' 'xorg-server>=1.8.0')
-conflicts=('xorg-server<1.8.0')
+makedepends=('xorg-server-devel')
+conflicts=('xorg-server<1.9.0')
 groups=('xorg-input-drivers')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('7e5752180cb8b2261e96abd9b19d8485bca0d4eb')
+sha1sums=('4c510d3f3ceaeb3bf826d440a406fe53fd85902c')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+  ./configure --prefix=/usr
+  make
+  make DESTDIR="${pkgdir}" install
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+
+  install -m755 -d "${pkgdir}/etc"
+  mv "${pkgdir}/usr/share/X11" "${pkgdir}/etc/"
 }

Deleted: abi.patch
===================================================================
--- abi.patch	2010-08-24 09:08:18 UTC (rev 88593)
+++ abi.patch	2010-08-24 09:08:31 UTC (rev 88594)
@@ -1,12 +0,0 @@
-diff -up xf86-input-vmmouse-12.6.5/src/vmmouse.c.jx xf86-input-vmmouse-12.6.5/src/vmmouse.c
---- xf86-input-vmmouse-12.6.5/src/vmmouse.c.jx	2009-08-06 13:23:09.000000000 -0400
-+++ xf86-input-vmmouse-12.6.5/src/vmmouse.c	2009-08-27 14:26:54.000000000 -0400
-@@ -1175,8 +1175,6 @@ VMMousePlug(pointer	module,
- {
-    static Bool Initialised = FALSE;
- 
--   xf86LoaderReqSymLists(reqSymbols, NULL);
--
-    if (!Initialised)
-       Initialised = TRUE;
-