Hello community,
here is the log from the commit of package xf86-input-synaptics for
openSUSE:Factory checked in at 2016-05-23 17:31:27
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xf86-input-synaptics (Old)
and /work/SRC/openSUSE:Factory/.xf86-input-synaptics.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xf86-input-synaptics"
Changes:
--------
---
/work/SRC/openSUSE:Factory/xf86-input-synaptics/xf86-input-synaptics.changes
2015-11-18 22:32:58.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.xf86-input-synaptics.new/xf86-input-synaptics.changes
2016-05-23 17:31:28.000000000 +0200
@@ -1,0 +2,17 @@
+Mon May 23 08:57:47 UTC 2016 - sndir...@suse.com
+
+- replaced n_conf-rename-to-70-synaptics.conf.patch with upstreamed
+ patch U_conf-rename-to-70-synaptics.conf.patch (boo #979554)
+
+-------------------------------------------------------------------
+Thu May 19 15:19:21 UTC 2016 - sndir...@suse.com
+
+- n_conf-rename-to-70-synaptics.conf.patch
+ * bump up synaptics driver to 70, so it get's preferred over
+ libinput, which was dropped down to 060 (boo #979554)
+- adjusted n_xf86-input-synaptics-default-tap.diff,
+ n_xf86-input-synaptics-xorg.conf.d_snippet.diff
+- removed Supplements: xorg-x11-server, so the driver no longer
+ gets installed by default
+
+-------------------------------------------------------------------
New:
----
U_conf-rename-to-70-synaptics.conf.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xf86-input-synaptics.spec ++++++
--- /var/tmp/diff_new_pack.vYK4p2/_old 2016-05-23 17:31:29.000000000 +0200
+++ /var/tmp/diff_new_pack.vYK4p2/_new 2016-05-23 17:31:29.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package xf86-input-synaptics
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -27,6 +27,7 @@
Source1:
http://xorg.freedesktop.org/releases/individual/driver/%{name}-%{version}.tar.bz2.sig
Source2: %{name}.keyring
Patch0: n_xf86-input-synaptics-wait.diff
+Patch1: U_conf-rename-to-70-synaptics.conf.patch
Patch2: n_xf86-input-synaptics-xorg.conf.d_snippet.diff
Patch5: n_xf86-input-synaptics-default-tap.diff
BuildRequires: autoconf >= 2.60
@@ -44,7 +45,6 @@
BuildRequires: pkgconfig(xproto)
BuildRequires: pkgconfig(xtst)
Requires: udev
-Supplements: xorg-x11-server
# This was part of the xorg-x11-driver-input package up to version 7.6
Conflicts: xorg-x11-driver-input <= 7.6
Provides: x11-input-synaptics = %{version}
@@ -75,6 +75,7 @@
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%patch2 -p1
%patch5 -p1
@@ -99,7 +100,7 @@
%files
%defattr(-,root,root)
%doc COPYING README
-%config %{_sysconfdir}/X11/xorg.conf.d/50-synaptics.conf
+%config %{_sysconfdir}/X11/xorg.conf.d/70-synaptics.conf
%dir %{_libdir}/xorg/modules/input
%{_libdir}/xorg/modules/input/synaptics_drv.so
%{_bindir}/synclient
++++++ U_conf-rename-to-70-synaptics.conf.patch ++++++
>From 59e5db025307404fbfbc82f2fb3fe91d6a3005d7 Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndir...@suse.de>
Date: Thu, 19 May 2016 17:35:57 +0200
Subject: [PATCH synaptics] conf: rename to 70-synaptics.conf
Bump up the synaptics driver to 70, so it get's preferred over libinput, which
was dropped down to 60. The synaptics driver is more of a leaf package
than libinput (which covers a multitude of device types) and can be removed by
default. When specifically installed by the user, the synaptics driver should
override the system default.
Similar to what was done for wacom configuration file.
https://bugzilla.suse.com/show_bug.cgi?id=979554
Signed-off-by: Stefan Dirsch <sndir...@suse.de>
Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
---
conf/50-synaptics.conf | 46 ----------------------------------------------
conf/70-synaptics.conf | 46 ++++++++++++++++++++++++++++++++++++++++++++++
conf/Makefile.am | 2 +-
man/synaptics.man | 2 +-
4 files changed, 48 insertions(+), 48 deletions(-)
delete mode 100644 conf/50-synaptics.conf
create mode 100644 conf/70-synaptics.conf
diff --git a/conf/50-synaptics.conf b/conf/50-synaptics.conf
deleted file mode 100644
index aa50456..0000000
--- a/conf/50-synaptics.conf
+++ /dev/null
@@ -1,46 +0,0 @@
-# Example xorg.conf.d snippet that assigns the touchpad driver
-# to all touchpads. See xorg.conf.d(5) for more information on
-# InputClass.
-# DO NOT EDIT THIS FILE, your distribution will likely overwrite
-# it when updating. Copy (and rename) this file into
-# /etc/X11/xorg.conf.d first.
-# Additional options may be added in the form of
-# Option "OptionName" "value"
-#
-Section "InputClass"
- Identifier "touchpad catchall"
- Driver "synaptics"
- MatchIsTouchpad "on"
-# 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*"
-EndSection
-
-Section "InputClass"
- Identifier "touchpad ignore duplicates"
- MatchIsTouchpad "on"
- MatchOS "Linux"
- MatchDevicePath "/dev/input/mouse*"
- Option "Ignore" "on"
-EndSection
-
-# This option enables the bottom right corner to be a right button on clickpads
-# and the right and middle top areas to be right / middle buttons on clickpads
-# with a top button area.
-# This option is only interpreted by clickpads.
-Section "InputClass"
- Identifier "Default clickpad buttons"
- MatchDriver "synaptics"
- Option "SoftButtonAreas" "50% 0 82% 0 0 0 0 0"
- Option "SecondarySoftButtonAreas" "58% 0 0 15% 42% 58% 0 15%"
-EndSection
-
-# This option disables software buttons on Apple touchpads.
-# This option is only interpreted by clickpads.
-Section "InputClass"
- Identifier "Disable clickpad buttons on Apple touchpads"
- MatchProduct "Apple|bcm5974"
- MatchDriver "synaptics"
- Option "SoftButtonAreas" "0 0 0 0 0 0 0 0"
-EndSection
diff --git a/conf/70-synaptics.conf b/conf/70-synaptics.conf
new file mode 100644
index 0000000..aa50456
--- /dev/null
+++ b/conf/70-synaptics.conf
@@ -0,0 +1,46 @@
+# Example xorg.conf.d snippet that assigns the touchpad driver
+# to all touchpads. See xorg.conf.d(5) for more information on
+# InputClass.
+# DO NOT EDIT THIS FILE, your distribution will likely overwrite
+# it when updating. Copy (and rename) this file into
+# /etc/X11/xorg.conf.d first.
+# Additional options may be added in the form of
+# Option "OptionName" "value"
+#
+Section "InputClass"
+ Identifier "touchpad catchall"
+ Driver "synaptics"
+ MatchIsTouchpad "on"
+# 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*"
+EndSection
+
+Section "InputClass"
+ Identifier "touchpad ignore duplicates"
+ MatchIsTouchpad "on"
+ MatchOS "Linux"
+ MatchDevicePath "/dev/input/mouse*"
+ Option "Ignore" "on"
+EndSection
+
+# This option enables the bottom right corner to be a right button on clickpads
+# and the right and middle top areas to be right / middle buttons on clickpads
+# with a top button area.
+# This option is only interpreted by clickpads.
+Section "InputClass"
+ Identifier "Default clickpad buttons"
+ MatchDriver "synaptics"
+ Option "SoftButtonAreas" "50% 0 82% 0 0 0 0 0"
+ Option "SecondarySoftButtonAreas" "58% 0 0 15% 42% 58% 0 15%"
+EndSection
+
+# This option disables software buttons on Apple touchpads.
+# This option is only interpreted by clickpads.
+Section "InputClass"
+ Identifier "Disable clickpad buttons on Apple touchpads"
+ MatchProduct "Apple|bcm5974"
+ MatchDriver "synaptics"
+ Option "SoftButtonAreas" "0 0 0 0 0 0 0 0"
+EndSection
diff --git a/conf/Makefile.am b/conf/Makefile.am
index 38d2a01..b883c10 100644
--- a/conf/Makefile.am
+++ b/conf/Makefile.am
@@ -20,7 +20,7 @@
if HAS_XORG_CONF_DIR
-dist_config_DATA = 50-synaptics.conf
+dist_config_DATA = 70-synaptics.conf
else
fdidir = $(datadir)/hal/fdi/policy/20thirdparty
dist_fdi_DATA = 11-x11-synaptics.fdi
diff --git a/man/synaptics.man b/man/synaptics.man
index 7083b3a..4f87b01 100644
--- a/man/synaptics.man
+++ b/man/synaptics.man
@@ -923,7 +923,7 @@ Configuration through
.I InputClass
sections is recommended in X servers 1.8 and later. See xorg.conf.d(5) for
more details. An example xorg.conf.d snippet is provided in
-.I ${sourcecode}/conf/50-synaptics.conf
+.I ${sourcecode}/conf/70-synaptics.conf
.LP
Configuration through hal fdi files is recommended in X servers 1.5, 1.6 and
1.7. An example hal policy file is provided in
--
2.6.6
++++++ n_xf86-input-synaptics-default-tap.diff ++++++
--- /var/tmp/diff_new_pack.vYK4p2/_old 2016-05-23 17:31:29.000000000 +0200
+++ /var/tmp/diff_new_pack.vYK4p2/_new 2016-05-23 17:31:29.000000000 +0200
@@ -1,9 +1,9 @@
---
- conf/50-synaptics.conf | 4 ++++
+ conf/70-synaptics.conf | 4 ++++
1 file changed, 4 insertions(+)
---- a/conf/50-synaptics.conf
-+++ b/conf/50-synaptics.conf
+--- a/conf/70-synaptics.conf
++++ b/conf/70-synaptics.conf
@@ -16,6 +16,10 @@ Section "InputClass"
# http://who-t.blogspot.com/2010/11/how-to-ignore-configuration-errors.html
MatchDevicePath "/dev/input/event*"
++++++ n_xf86-input-synaptics-xorg.conf.d_snippet.diff ++++++
--- /var/tmp/diff_new_pack.vYK4p2/_old 2016-05-23 17:31:29.000000000 +0200
+++ /var/tmp/diff_new_pack.vYK4p2/_new 2016-05-23 17:31:29.000000000 +0200
@@ -1,9 +1,9 @@
---
- conf/50-synaptics.conf | 3 ++-
+ conf/70-synaptics.conf | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
---- a/conf/50-synaptics.conf
-+++ b/conf/50-synaptics.conf
+--- a/conf/70-synaptics.conf
++++ b/conf/70-synaptics.conf
@@ -14,7 +14,8 @@
# This option is recommend on all Linux systems using evdev, but cannot be
# enabled by default. See the following link for details:
