diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-01-12 13:04:54 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-01-12 13:04:54 +0100 |
| commit | 24633b6f6af8dc77ca77224448d226d8e99c9ce1 (patch) | |
| tree | 0e862445be6a105957104f94f7e4f2668e1fdbba /extra/xf86-input-synaptics | |
| parent | d28ed89b1e41f7e71045a5c2e898aa3b369eda47 (diff) | |
| parent | 8c2563c3c13cb7a279544f6926cbdd2eb902cc9a (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/cdemu-daemon/PKGBUILD
community/chmsee/PKGBUILD
community/fceux/PKGBUILD
community/ginac/PKGBUILD
community/gstreamermm/PKGBUILD
community/gtksourceviewmm/PKGBUILD
community/lgi/PKGBUILD
community/libmirage/PKGBUILD
core/gawk/PKGBUILD
core/gettext/PKGBUILD
extra/enca/PKGBUILD
extra/gnutls/PKGBUILD
extra/hdf5/PKGBUILD
extra/kdebase/PKGBUILD
extra/libass/PKGBUILD
extra/libdiscid/PKGBUILD
extra/libxcomposite/PKGBUILD
extra/libxdamage/PKGBUILD
extra/maxima/PKGBUILD
extra/nx/PKGBUILD
extra/opencv/PKGBUILD
extra/pidgin/PKGBUILD
extra/redland/PKGBUILD
extra/sharutils/PKGBUILD
extra/soundtouch/PKGBUILD
extra/sqlite/PKGBUILD
extra/twisted/PKGBUILD
libre/dpkg/PKGBUILD
Diffstat (limited to 'extra/xf86-input-synaptics')
| -rw-r--r-- | extra/xf86-input-synaptics/PKGBUILD | 17 | ||||
| -rw-r--r-- | extra/xf86-input-synaptics/add_tapbuttons.diff | 17 |
2 files changed, 28 insertions, 6 deletions
diff --git a/extra/xf86-input-synaptics/PKGBUILD b/extra/xf86-input-synaptics/PKGBUILD index 2f1c11af3..c9bd84516 100644 --- a/extra/xf86-input-synaptics/PKGBUILD +++ b/extra/xf86-input-synaptics/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 168560 2012-10-13 11:43:49Z andyrtr $ +# $Id: PKGBUILD 174734 2013-01-05 13:53:36Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Thomas Bächler <thomas@archlinux.org> @@ -6,7 +6,7 @@ pkgname=xf86-input-synaptics pkgver=1.6.2 -pkgrel=2 +pkgrel=4 pkgdesc="Synaptics driver for notebook touchpads" arch=('i686' 'x86_64' 'mips64el') license=('custom') @@ -19,14 +19,19 @@ provides=('synaptics') 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') + '5298d3e871db3768b34cf8516d3f53f9291202e2ea5de3300256e1cd9119a1ec') build() { cd "${srcdir}/${pkgname}-${pkgver}" + + # * upstream disabled tapping by default if a physical left button is present - see FS#33282 + # * enable MatchDevicePath directive by default - FS#33291 + patch -Np1 -i ${srcdir}/add_tapbuttons.diff + ./configure --prefix=/usr make } @@ -35,7 +40,7 @@ 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 -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}/" diff --git a/extra/xf86-input-synaptics/add_tapbuttons.diff b/extra/xf86-input-synaptics/add_tapbuttons.diff new file mode 100644 index 000000000..f9170f74a --- /dev/null +++ b/extra/xf86-input-synaptics/add_tapbuttons.diff @@ -0,0 +1,17 @@ +--- a/conf/50-synaptics.conf 2012-05-11 01:01:10.000000000 +0200 ++++ b/conf/50-synaptics.conf.new 2013-01-05 14:20:21.959670353 +0100 +@@ -11,10 +11,13 @@ + 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 +-# MatchDevicePath "/dev/input/event*" ++ MatchDevicePath "/dev/input/event*" + EndSection + + Section "InputClass" |