diff --git a/.gitignore b/.gitignore index 6586f0f..0064e97 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /xf86-input-libinput-0.9.0.tar.bz2 /xf86-input-libinput-0.10.0.tar.bz2 /xf86-input-libinput-0.11.0.tar.bz2 +/xf86-input-libinput-0.12.0.tar.bz2 diff --git a/0001-Support-buttons-BTN_BACK-on-mice.patch b/0001-Support-buttons-BTN_BACK-on-mice.patch deleted file mode 100644 index ebbfeae..0000000 --- a/0001-Support-buttons-BTN_BACK-on-mice.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 9c5cf971439292661e1f3055ef882526baae6310 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Mon, 15 Jun 2015 10:17:20 +1000 -Subject: [PATCH xf86-input-libinput] Support buttons > BTN_BACK on mice - -https://bugzilla.redhat.com/show_bug.cgi?id=1230945 - -Signed-off-by: Peter Hutterer ---- - src/libinput.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/libinput.c b/src/libinput.c -index 595b177..a06e44f 100644 ---- a/src/libinput.c -+++ b/src/libinput.c -@@ -456,7 +456,7 @@ xf86libinput_init_pointer(InputInfoPtr pInfo) - Atom btnlabels[MAX_BUTTONS]; - Atom axislabels[TOUCHPAD_NUM_AXES]; - -- for (i = BTN_BACK; i >= BTN_SIDE; i--) { -+ for (i = BTN_JOYSTICK - 1; i >= BTN_SIDE; i--) { - if (libinput_device_pointer_has_button(driver_data->device, i)) { - nbuttons += i - BTN_SIDE + 1; - break; --- -2.4.3 - diff --git a/sources b/sources index b173b4c..dd74d9f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -710f0a2ecb6a3aefee80aba0fbbe6e18 xf86-input-libinput-0.11.0.tar.bz2 +116a4a349758826935cb47bfc7841619 xf86-input-libinput-0.12.0.tar.bz2 diff --git a/xorg-x11-drv-libinput.spec b/xorg-x11-drv-libinput.spec index 7e451aa..ccec3c3 100644 --- a/xorg-x11-drv-libinput.spec +++ b/xorg-x11-drv-libinput.spec @@ -4,8 +4,8 @@ Summary: Xorg X11 libinput input driver Name: xorg-x11-drv-libinput -Version: 0.11.0 -Release: 3%{?dist} +Version: 0.12.0 +Release: 1%{?dist} URL: http://www.x.org License: MIT @@ -15,9 +15,6 @@ Source1: 90-libinput.conf # Fedora-specific unless merged into 1.7.3 at least Patch00: 0001-Fedora-use-unaccelerated-vmask-on-input-ABI-21.patch -# https://bugzilla.redhat.com/show_bug.cgi?id=1230945 -Patch01: 0001-Support-buttons-BTN_BACK-on-mice.patch - ExcludeArch: s390 s390x BuildRequires: autoconf automake libtool @@ -28,7 +25,7 @@ BuildRequires: xorg-x11-util-macros Requires: Xorg %(xserver-sdk-abi-requires ansic) Requires: Xorg %(xserver-sdk-abi-requires xinput) Requires: xkeyboard-config -Requires: libinput >= 0.8.0 +Requires: libinput >= 0.19.0 # For the unaccelerated valuator masks, drop in F23 Requires: xorg-x11-server-Xorg >= 1.17.1-14 @@ -40,7 +37,6 @@ supporting all devices. %prep %setup -q -n %{tarball}-%{version} %patch00 -p1 -%patch01 -p1 %build autoreconf --force -v --install || exit 1 @@ -76,6 +72,9 @@ Xorg X11 libinput input driver development files. %{_includedir}/xorg/libinput-properties.h %changelog +* Tue Jul 14 2015 Peter Hutterer 0.12.0-1 +- xf86-input-libinput 0.12.0 + * Mon Jul 13 2015 Peter Hutterer 0.11.0-3 - Restore unaccelerated valuator masks (#1208992)