[arch-commits] Commit in xf86-input-synaptics/repos (8 files)
andyrtr at archlinux.org
andyrtr at archlinux.org
Sat Jan 5 09:30:37 UTC 2013
Date: Saturday, January 5, 2013 @ 04:30:36
Author: andyrtr
Revision: 174622
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
xf86-input-synaptics/repos/extra-i686/PKGBUILD
(from rev 174621, xf86-input-synaptics/trunk/PKGBUILD)
xf86-input-synaptics/repos/extra-i686/add_tapbuttons.diff
(from rev 174621, xf86-input-synaptics/trunk/add_tapbuttons.diff)
xf86-input-synaptics/repos/extra-x86_64/PKGBUILD
(from rev 174621, xf86-input-synaptics/trunk/PKGBUILD)
xf86-input-synaptics/repos/extra-x86_64/add_tapbuttons.diff
(from rev 174621, xf86-input-synaptics/trunk/add_tapbuttons.diff)
Deleted:
xf86-input-synaptics/repos/extra-i686/10-synaptics.conf
xf86-input-synaptics/repos/extra-i686/PKGBUILD
xf86-input-synaptics/repos/extra-x86_64/10-synaptics.conf
xf86-input-synaptics/repos/extra-x86_64/PKGBUILD
----------------------------------+
extra-i686/10-synaptics.conf | 9 ---
extra-i686/PKGBUILD | 90 +++++++++++++++++++------------------
extra-i686/add_tapbuttons.diff | 12 ++++
extra-x86_64/10-synaptics.conf | 9 ---
extra-x86_64/PKGBUILD | 90 +++++++++++++++++++------------------
extra-x86_64/add_tapbuttons.diff | 12 ++++
6 files changed, 118 insertions(+), 104 deletions(-)
Deleted: extra-i686/10-synaptics.conf
===================================================================
--- extra-i686/10-synaptics.conf 2013-01-05 09:29:57 UTC (rev 174621)
+++ extra-i686/10-synaptics.conf 2013-01-05 09:30:36 UTC (rev 174622)
@@ -1,9 +0,0 @@
-Section "InputClass"
- Identifier "touchpad catchall"
- Driver "synaptics"
- MatchIsTouchpad "on"
- MatchDevicePath "/dev/input/event*"
- Option "TapButton1" "1"
- Option "TapButton2" "2"
- Option "TapButton3" "3"
-EndSection
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2013-01-05 09:29:57 UTC (rev 174621)
+++ extra-i686/PKGBUILD 2013-01-05 09:30:36 UTC (rev 174622)
@@ -1,43 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-# Contributor: Tobias Powalowski <tpowa at archlinux.org>
-# Contributor: Thomas Bächler <thomas at archlinux.org>
-# Contributor: Alexander Baldeck <alexander at archlinux.org>
-
-pkgname=xf86-input-synaptics
-pkgver=1.6.2
-pkgrel=2
-pkgdesc="Synaptics driver for notebook touchpads"
-arch=('i686' 'x86_64')
-license=('custom')
-url="http://xorg.freedesktop.org/"
-depends=('libxtst' 'mtdev')
-makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'libxi' 'libx11' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19')
-replaces=('synaptics')
-provides=('synaptics')
-conflicts=('synaptics')
-groups=('xorg-drivers' 'xorg')
-options=(!libtool)
-backup=('etc/X11/xorg.conf.d/10-synaptics.conf')
-source=(http://xorg.freedesktop.org/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
- 10-synaptics.conf)
-sha256sums=('c3f7d6a085d480c352f030aeb43db2e5560d1468ed34be24d44a0fc3fda25920'
- 'bd506a0545c335faa6da7ec42b3f60f2c09b5ed9e26f03003d6f59be88107ee2')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
- install -m755 -d "${pkgdir}/etc/X11/xorg.conf.d"
- install -m644 "${srcdir}/10-synaptics.conf" "${pkgdir}/etc/X11/xorg.conf.d/"
- install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
- install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-
- rm -rf "${pkgdir}/usr/share/X11"
-}
Copied: xf86-input-synaptics/repos/extra-i686/PKGBUILD (from rev 174621, xf86-input-synaptics/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2013-01-05 09:30:36 UTC (rev 174622)
@@ -0,0 +1,47 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Contributor: Tobias Powalowski <tpowa at archlinux.org>
+# Contributor: Thomas Bächler <thomas at archlinux.org>
+# Contributor: Alexander Baldeck <alexander at archlinux.org>
+
+pkgname=xf86-input-synaptics
+pkgver=1.6.2
+pkgrel=3
+pkgdesc="Synaptics driver for notebook touchpads"
+arch=('i686' 'x86_64')
+license=('custom')
+url="http://xorg.freedesktop.org/"
+depends=('libxtst' 'mtdev')
+makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'libxi' 'libx11' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19')
+replaces=('synaptics')
+provides=('synaptics')
+conflicts=('synaptics')
+groups=('xorg-drivers' 'xorg')
+options=(!libtool)
+backup=('etc/X11/xorg.conf.d/50-synaptics.conf')
+source=(http://xorg.freedesktop.org/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+ add_tapbuttons.diff)
+sha256sums=('c3f7d6a085d480c352f030aeb43db2e5560d1468ed34be24d44a0fc3fda25920'
+ '8c03303d9b63383d4a757447e517248d2d0095f87c6e77a5cd529bbf095bdb1b')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ # upstream disabled tapping by default if a physical left button is present - see FS#33282
+ patch -Np1 -i ${srcdir}/add_tapbuttons.diff
+
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+ install -m755 -d "${pkgdir}/etc/X11/xorg.conf.d"
+ install -m644 conf/50-synaptics.conf "${pkgdir}/etc/X11/xorg.conf.d/"
+ install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+ install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+
+ rm -rf "${pkgdir}/usr/share/X11"
+}
Copied: xf86-input-synaptics/repos/extra-i686/add_tapbuttons.diff (from rev 174621, xf86-input-synaptics/trunk/add_tapbuttons.diff)
===================================================================
--- extra-i686/add_tapbuttons.diff (rev 0)
+++ extra-i686/add_tapbuttons.diff 2013-01-05 09:30:36 UTC (rev 174622)
@@ -0,0 +1,12 @@
+--- a/conf/50-synaptics.conf 2012-05-11 01:01:10.000000000 +0200
++++ b/conf/50-synaptics.conf.new 2013-01-05 10:17:26.190650773 +0100
+@@ -11,6 +11,9 @@
+ Identifier "touchpad catchall"
+ Driver "synaptics"
+ MatchIsTouchpad "on"
++ Option "TapButton1" "1"
++ Option "TapButton2" "2"
++ Option "TapButton3" "3"
+ # This option is recommend on all Linux systems using evdev, but cannot be
+ # enabled by default. See the following link for details:
+ # http://who-t.blogspot.com/2010/11/how-to-ignore-configuration-errors.html
Deleted: extra-x86_64/10-synaptics.conf
===================================================================
--- extra-x86_64/10-synaptics.conf 2013-01-05 09:29:57 UTC (rev 174621)
+++ extra-x86_64/10-synaptics.conf 2013-01-05 09:30:36 UTC (rev 174622)
@@ -1,9 +0,0 @@
-Section "InputClass"
- Identifier "touchpad catchall"
- Driver "synaptics"
- MatchIsTouchpad "on"
- MatchDevicePath "/dev/input/event*"
- Option "TapButton1" "1"
- Option "TapButton2" "2"
- Option "TapButton3" "3"
-EndSection
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2013-01-05 09:29:57 UTC (rev 174621)
+++ extra-x86_64/PKGBUILD 2013-01-05 09:30:36 UTC (rev 174622)
@@ -1,43 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-# Contributor: Tobias Powalowski <tpowa at archlinux.org>
-# Contributor: Thomas Bächler <thomas at archlinux.org>
-# Contributor: Alexander Baldeck <alexander at archlinux.org>
-
-pkgname=xf86-input-synaptics
-pkgver=1.6.2
-pkgrel=2
-pkgdesc="Synaptics driver for notebook touchpads"
-arch=('i686' 'x86_64')
-license=('custom')
-url="http://xorg.freedesktop.org/"
-depends=('libxtst' 'mtdev')
-makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'libxi' 'libx11' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19')
-replaces=('synaptics')
-provides=('synaptics')
-conflicts=('synaptics')
-groups=('xorg-drivers' 'xorg')
-options=(!libtool)
-backup=('etc/X11/xorg.conf.d/10-synaptics.conf')
-source=(http://xorg.freedesktop.org/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
- 10-synaptics.conf)
-sha256sums=('c3f7d6a085d480c352f030aeb43db2e5560d1468ed34be24d44a0fc3fda25920'
- 'bd506a0545c335faa6da7ec42b3f60f2c09b5ed9e26f03003d6f59be88107ee2')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
- install -m755 -d "${pkgdir}/etc/X11/xorg.conf.d"
- install -m644 "${srcdir}/10-synaptics.conf" "${pkgdir}/etc/X11/xorg.conf.d/"
- install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
- install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-
- rm -rf "${pkgdir}/usr/share/X11"
-}
Copied: xf86-input-synaptics/repos/extra-x86_64/PKGBUILD (from rev 174621, xf86-input-synaptics/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2013-01-05 09:30:36 UTC (rev 174622)
@@ -0,0 +1,47 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Contributor: Tobias Powalowski <tpowa at archlinux.org>
+# Contributor: Thomas Bächler <thomas at archlinux.org>
+# Contributor: Alexander Baldeck <alexander at archlinux.org>
+
+pkgname=xf86-input-synaptics
+pkgver=1.6.2
+pkgrel=3
+pkgdesc="Synaptics driver for notebook touchpads"
+arch=('i686' 'x86_64')
+license=('custom')
+url="http://xorg.freedesktop.org/"
+depends=('libxtst' 'mtdev')
+makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'libxi' 'libx11' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19')
+replaces=('synaptics')
+provides=('synaptics')
+conflicts=('synaptics')
+groups=('xorg-drivers' 'xorg')
+options=(!libtool)
+backup=('etc/X11/xorg.conf.d/50-synaptics.conf')
+source=(http://xorg.freedesktop.org/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+ add_tapbuttons.diff)
+sha256sums=('c3f7d6a085d480c352f030aeb43db2e5560d1468ed34be24d44a0fc3fda25920'
+ '8c03303d9b63383d4a757447e517248d2d0095f87c6e77a5cd529bbf095bdb1b')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ # upstream disabled tapping by default if a physical left button is present - see FS#33282
+ patch -Np1 -i ${srcdir}/add_tapbuttons.diff
+
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+ install -m755 -d "${pkgdir}/etc/X11/xorg.conf.d"
+ install -m644 conf/50-synaptics.conf "${pkgdir}/etc/X11/xorg.conf.d/"
+ install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+ install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+
+ rm -rf "${pkgdir}/usr/share/X11"
+}
Copied: xf86-input-synaptics/repos/extra-x86_64/add_tapbuttons.diff (from rev 174621, xf86-input-synaptics/trunk/add_tapbuttons.diff)
===================================================================
--- extra-x86_64/add_tapbuttons.diff (rev 0)
+++ extra-x86_64/add_tapbuttons.diff 2013-01-05 09:30:36 UTC (rev 174622)
@@ -0,0 +1,12 @@
+--- a/conf/50-synaptics.conf 2012-05-11 01:01:10.000000000 +0200
++++ b/conf/50-synaptics.conf.new 2013-01-05 10:17:26.190650773 +0100
+@@ -11,6 +11,9 @@
+ Identifier "touchpad catchall"
+ Driver "synaptics"
+ MatchIsTouchpad "on"
++ Option "TapButton1" "1"
++ Option "TapButton2" "2"
++ Option "TapButton3" "3"
+ # This option is recommend on all Linux systems using evdev, but cannot be
+ # enabled by default. See the following link for details:
+ # http://who-t.blogspot.com/2010/11/how-to-ignore-configuration-errors.html
More information about the arch-commits
mailing list