[arch-commits] Commit in xf86-input-synaptics/trunk (3 files)

[andyrtr at archlinux.org]

    Date: Saturday, January 5, 2013 @ 04:29:57
  Author: andyrtr
Revision: 174621

upgpkg: xf86-input-synaptics 1.6.2-3

use upstream default config file and its file name - FS#33282; reenable disabled tapping by default

Added:
  xf86-input-synaptics/trunk/add_tapbuttons.diff
Modified:
  xf86-input-synaptics/trunk/PKGBUILD
Deleted:
  xf86-input-synaptics/trunk/10-synaptics.conf

---------------------+
 10-synaptics.conf   |    9 ---------
 PKGBUILD            |   14 +++++++++-----
 add_tapbuttons.diff |   12 ++++++++++++
 3 files changed, 21 insertions(+), 14 deletions(-)

Deleted: 10-synaptics.conf
===================================================================
--- 10-synaptics.conf	2013-01-05 08:50:57 UTC (rev 174620)
+++ 10-synaptics.conf	2013-01-05 09:29:57 UTC (rev 174621)
@@ -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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-01-05 08:50:57 UTC (rev 174620)
+++ PKGBUILD	2013-01-05 09:29:57 UTC (rev 174621)
@@ -6,7 +6,7 @@
 
 pkgname=xf86-input-synaptics
 pkgver=1.6.2
-pkgrel=2
+pkgrel=3
 pkgdesc="Synaptics driver for notebook touchpads"
 arch=('i686' 'x86_64')
 license=('custom')
@@ -19,14 +19,18 @@
 conflicts=('synaptics')
 groups=('xorg-drivers' 'xorg')
 options=(!libtool)
-backup=('etc/X11/xorg.conf.d/10-synaptics.conf')
+backup=('etc/X11/xorg.conf.d/50-synaptics.conf')
 source=(http://xorg.freedesktop.org/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        10-synaptics.conf)
+        add_tapbuttons.diff)
 sha256sums=('c3f7d6a085d480c352f030aeb43db2e5560d1468ed34be24d44a0fc3fda25920'
-            'bd506a0545c335faa6da7ec42b3f60f2c09b5ed9e26f03003d6f59be88107ee2')
+            '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
 }
@@ -35,7 +39,7 @@
   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 -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}/"
 

Added: add_tapbuttons.diff
===================================================================
--- add_tapbuttons.diff	                        (rev 0)
+++ add_tapbuttons.diff	2013-01-05 09:29:57 UTC (rev 174621)
@@ -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