Update to 1.17.6

This commit is contained in:
Richard Hughes 2014-03-04 18:33:35 +00:00
parent ffa7efd4a6
commit 4cff93b87d
3 changed files with 5 additions and 42 deletions

View File

@ -1,38 +0,0 @@
diff -up clutter-1.16.0/clutter/evdev/clutter-device-manager-evdev.c.jx clutter-1.16.0/clutter/evdev/clutter-device-manager-evdev.c
--- clutter-1.16.0/clutter/evdev/clutter-device-manager-evdev.c.jx 2013-09-22 13:22:30.000000000 -0400
+++ clutter-1.16.0/clutter/evdev/clutter-device-manager-evdev.c 2013-10-07 16:48:28.232916813 -0400
@@ -535,11 +535,6 @@ dispatch_one_event (ClutterEventSource *
else if (e->code == BTN_TOOL_FINGER && e->value != AUTOREPEAT_VALUE)
{
source->touching = e->value;
- if (e->value)
- {
- source->last_x = source->cur_x;
- source->last_y = source->cur_y;
- }
}
else
{
@@ -580,6 +575,22 @@ dispatch_one_event (ClutterEventSource *
break;
case EV_ABS:
+ /* first touch is magic */
+ if (source->touching == 1)
+ {
+ switch (e->code)
+ {
+ case ABS_X:
+ source->last_x = source->cur_x = e->value;
+ break;
+ case ABS_Y:
+ source->last_y = source->cur_y = e->value;
+ source->touching = 2; /* note, assumes delivery order... */
+ break;
+ }
+ break;
+ }
+
switch (e->code)
{
case ABS_X:

View File

@ -5,7 +5,7 @@
%endif
Name: clutter
Version: 1.17.4
Version: 1.17.6
Release: 1%{?dist}
Summary: Open Source software library for creating rich graphical user interfaces
@ -13,7 +13,6 @@ Group: Development/Libraries
License: LGPLv2+
URL: http://www.clutter-project.org/
Source0: http://download.gnome.org/sources/clutter/1.17/clutter-%{version}.tar.xz
Patch0: clutter-1.16.0-fix-evdev-touchpad.patch
BuildRequires: glib2-devel mesa-libGL-devel pkgconfig pango-devel
BuildRequires: cairo-gobject-devel gdk-pixbuf2-devel atk-devel
@ -82,7 +81,6 @@ This package contains documentation for clutter.
%prep
%setup -q
%patch0 -p1 -b .touch
%build
# needed for patch1, autogen.sh is not enough due to divergent autoconf
@ -137,6 +135,9 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
%{_datadir}/gtk-doc/html/cally
%changelog
* Tue Mar 04 2014 Richard Hughes <rhughes@redhat.com> - 1.17.6-1
- Update to 1.17.6
* Wed Feb 19 2014 Richard Hughes <rhughes@redhat.com> - 1.17.4-1
- Update to 1.17.4

View File

@ -1 +1 @@
96a5dd7ef5156b231c245e0e7d0e4e93 clutter-1.17.4.tar.xz
b4209b76c068231e009d5235435f7a38 clutter-1.17.6.tar.xz