[arch-commits] Commit in synaptiks/trunk (PKGBUILD synaptics170.patch)
Andrea Scarpino
andrea at nymeria.archlinux.org
Wed Apr 10 07:29:14 UTC 2013
Date: Wednesday, April 10, 2013 @ 09:29:14
Author: andrea
Revision: 88016
upgpkg: synaptiks 0.8.1-6
Fix crash with synaptics 1.7.0 (FS#34637)
Added:
synaptiks/trunk/synaptics170.patch
Modified:
synaptiks/trunk/PKGBUILD
--------------------+
PKGBUILD | 12 ++-
synaptics170.patch | 200 +++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 208 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-04-09 21:51:55 UTC (rev 88015)
+++ PKGBUILD 2013-04-10 07:29:14 UTC (rev 88016)
@@ -8,7 +8,7 @@
pkgname=synaptiks
pkgver=0.8.1
-pkgrel=5
+pkgrel=6
pkgdesc='A touchpad configuration and management tool for KDE'
arch=('any')
url="http://synaptiks.readthedocs.org/"
@@ -17,15 +17,19 @@
'python2-udev' 'xf86-input-synaptics')
install=$pkgname.install
source=("http://pypi.python.org/packages/source/s/$pkgname/$pkgname-$pkgver.tar.bz2"
- 'pyudev-fix.patch')
+ 'pyudev-fix.patch'
+ 'synaptics170.patch')
md5sums=('4137a5c7a6117cf8f2073bfdb05466d6'
- 'eb2b6adeab573874c1c686ba67786d9a')
+ 'eb2b6adeab573874c1c686ba67786d9a'
+ 'e04319829a73e26ca503452f290f3ec3')
package() {
- cd "$srcdir/$pkgname-$pkgver"
+ cd $pkgname-$pkgver
# FS#31328
patch -p1 -i "${srcdir}"/pyudev-fix.patch
+ # FS#34637
+ patch -p1 -i "${srcdir}"/synaptics170.patch
python2 setup.py install --root "$pkgdir" --optimize=1
install -Dm644 COPYING "$pkgdir/usr/share/licenses/${pkgname}/LICENSE"
Added: synaptics170.patch
===================================================================
--- synaptics170.patch (rev 0)
+++ synaptics170.patch 2013-04-10 07:29:14 UTC (rev 88016)
@@ -0,0 +1,200 @@
+--- a/doc/api/touchpad.rst
++++ b/doc/api/touchpad.rst
+@@ -27,8 +27,6 @@ The touchpad class
+
+ .. autoattribute:: acceleration_factor
+
+- .. autoattribute:: edge_motion_always
+-
+ .. rubric:: scrolling properties
+
+ .. autoattribute:: vertical_edge_scrolling
+@@ -55,8 +53,6 @@ The touchpad class
+
+ .. rubric:: tapping properties
+
+- .. autoattribute:: fast_taps
+-
+ .. autoattribute:: rt_tap_action
+
+ .. autoattribute:: rb_tap_action
+--- a/doc/handbook/reference.rst
++++ b/doc/handbook/reference.rst
+@@ -69,13 +69,6 @@ The touchpad configuration module is available in |systemsettings| under
+ The acceleration between :guilabel:`Minimum speed` and :guilabel:`Maximum
+ speed`
+
+-:guilabel:`Continue cursor motion when hitting the touchpad edge`
+- Continue the cursor move while the finger stays in the touchpad edge
+-
+- :guilabel:`For all movements, not only dragging`
+- Always continue cursor movement, when hitting the touchpad edge, not only
+- when dragging
+-
+
+ .. _commands-scrolling-configuration:
+
+@@ -152,13 +145,6 @@ The touchpad configuration module is available in |systemsettings| under
+
+ Screenshot of the tapping configuration page
+
+-:guilabel:`General tapping settings`
+-
+- :guilabel:`Make single taps faster and double taps slower (fast taps)`
+- Enable or disable fast taps. If fast taps are enabled, the driver will
+- react faster on single taps, but slower on double clicks caused by double
+- taps.
+-
+ :guilabel:`Mouse clicks triggered by tapping`
+ :guilabel:`Top left corner`
+ Configure the mouse button, which is triggered by tapping the top left
+--- a/doc/handbook/usage.rst
++++ b/doc/handbook/usage.rst
+@@ -41,12 +41,6 @@ though the touchpad does not actually have one. In this case, the middle mouse
+ button is triggered by pressing the left mouse button and the right mouse
+ button at the same time.
+
+-Some systems have a circular touchpad. Unfortunately the touchpad driver does
+-not detect circular touchpad automatically, so if you have a circular touchpad,
+-please enable :guilabel:`The touchpad is circular` to let the driver know, that
+-your touchpad is circular.
+-
+-
+ .. _motion-configuration:
+
+ Motion configuration
+--- a/synaptiks/config.py
++++ b/synaptiks/config.py
+@@ -173,7 +173,6 @@ class TouchpadConfiguration(MutableMapping):
+
+ CONFIG_KEYS = frozenset([
+ 'minimum_speed', 'maximum_speed', 'acceleration_factor',
+- 'edge_motion_always', 'fast_taps',
+ 'rt_tap_action', 'rb_tap_action', 'lt_tap_action', 'lb_tap_action',
+ 'f1_tap_action', 'f2_tap_action', 'f3_tap_action',
+ 'tap_and_drag_gesture', 'locked_drags', 'locked_drags_timeout',
+@@ -182,7 +181,7 @@ class TouchpadConfiguration(MutableMapping):
+ 'vertical_scrolling_distance', 'horizontal_scrolling_distance',
+ 'vertical_two_finger_scrolling', 'horizontal_two_finger_scrolling',
+ 'circular_scrolling', 'circular_scrolling_trigger',
+- 'circular_scrolling_distance', 'circular_touchpad'])
++ 'circular_scrolling_distance'])
+
+ @classmethod
+ def load(cls, touchpad, filename=None):
+--- a/synaptiks/kde/widgets/ui/hardwarepage.ui
++++ b/synaptiks/kde/widgets/ui/hardwarepage.ui
+@@ -27,32 +27,6 @@
+ </widget>
+ </item>
+ <item>
+- <widget class="QGroupBox" name="groupBox">
+- <property name="title">
+- <string>Hardware settings</string>
+- </property>
+- <layout class="QVBoxLayout" name="verticalLayout_2">
+- <item>
+- <widget class="QLabel" name="label_2">
+- <property name="text">
+- <string comment="@info">Please enable this setting, if your touchpad is circular.</string>
+- </property>
+- <property name="wordWrap">
+- <bool>true</bool>
+- </property>
+- </widget>
+- </item>
+- <item>
+- <widget class="QCheckBox" name="touchpad_circular_touchpad">
+- <property name="text">
+- <string comment="@option:check">The touchpad is circular</string>
+- </property>
+- </widget>
+- </item>
+- </layout>
+- </widget>
+- </item>
+- <item>
+ <spacer name="verticalSpacer">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+--- a/synaptiks/kde/widgets/ui/motionpage.ui
++++ b/synaptiks/kde/widgets/ui/motionpage.ui
+@@ -81,22 +81,6 @@
+ </widget>
+ </item>
+ <item>
+- <widget class="QGroupBox" name="edgeMotionGroup">
+- <property name="title">
+- <string comment="@title:group">Continue cursor motion when hitting the touchpad edge</string>
+- </property>
+- <layout class="QVBoxLayout" name="verticalLayout_3">
+- <item>
+- <widget class="QCheckBox" name="touchpad_edge_motion_always">
+- <property name="text">
+- <string comment="@option:radio">For all movements, not only dragging</string>
+- </property>
+- </widget>
+- </item>
+- </layout>
+- </widget>
+- </item>
+- <item>
+ <spacer name="verticalSpacer">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+diff --git a/synaptiks/kde/widgets/ui/tappingpage.ui b/synaptiks/kde/widgets/ui/tappingpage.ui
+index 8d92c2c..89ca751 100644
+--- a/synaptiks/kde/widgets/ui/tappingpage.ui
++++ b/synaptiks/kde/widgets/ui/tappingpage.ui
+@@ -15,22 +15,6 @@
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout_2">
+ <item>
+- <widget class="QGroupBox" name="generalSettingsGroup">
+- <property name="title">
+- <string comment="@title:group">General tapping settings</string>
+- </property>
+- <layout class="QVBoxLayout" name="verticalLayout_4">
+- <item>
+- <widget class="QCheckBox" name="touchpad_fast_taps">
+- <property name="text">
+- <string comment="@option:check">Make single taps faster and double taps slower (fast taps)</string>
+- </property>
+- </widget>
+- </item>
+- </layout>
+- </widget>
+- </item>
+- <item>
+ <widget class="QGroupBox" name="tappingButtonGroup">
+ <property name="title">
+ <string comment="@title:group">Mouse clicks triggered by tapping</string>
+--- a/synaptiks/touchpad.py
++++ b/synaptiks/touchpad.py
+@@ -196,14 +196,6 @@ Whether the touchpad is off or not. Three valid values:
+ acceleration_factor = _move_speed_property(
+ 2, 'The acceleration factor of cursor movement as float')
+
+- edge_motion_always = device_property(
+- 'Synaptics Edge Motion Always', 'bool', 0,
+- '``True`` if edge motion is enabled, ``False`` otherwise.')
+-
+- fast_taps = device_property(
+- 'Synaptics Tap FastTap', 'bool', 0,
+- '``True`` if edge taps are enabled, ``False`` otherwise.')
+-
+ _tap_action_property = partial(device_property,
+ 'Synaptics Tap Action', 'byte')
+ rt_tap_action = _tap_action_property(
+@@ -291,11 +283,6 @@ generate a single scroll event.
+ circular_scrolling_distance.convert_from_property = math.degrees
+ circular_scrolling_distance.convert_to_property = math.radians
+
+- circular_touchpad = device_property(
+- 'Synaptics Circular Pad', 'bool', 0,
+- '``True``, if the touchpad is considered circular, ``False`` '
+- 'otherwise')
+-
+ @property
+ def coasting(self):
+ """
More information about the arch-commits
mailing list