Attachment 310868 Details for Bug 453871 – Output of "cvs diff -u" on F-9 branch

[patch] Output of "cvs diff -u" on F-9 branch

synaptics-update_to_git+multitouch_fixes.patch (text/plain), 10.25 KB, created by Stewart Adam on 2008-07-02 23:23:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stewart Adam

Created: 2008-07-02 23:23:32 UTC

Size: 10.25 KB

patch

obsolete

>? .build-0.14.7-0.1.20080702git.fc9.log
>? synaptics-0.14.6-multifingerbutton.patch
>? synaptics-0.14.7-0.1.20080702git.fc9.src.rpm
>? synaptics-0.14.7-20080702git.tar.bz2
>? synaptics-20080702
>? synaptics-update_to_git+multitouch_fixes.patch
>? x86_64
>Index: synaptics-0.14.6-delibcwrap.patch
>===================================================================
>RCS file: /cvs/extras/rpms/synaptics/F-9/synaptics-0.14.6-delibcwrap.patch,v
>retrieving revision 1.1
>diff -u -r1.1 synaptics-0.14.6-delibcwrap.patch
>--- synaptics-0.14.6-delibcwrap.patch	7 Jan 2008 16:24:52 -0000	1.1
>+++ synaptics-0.14.6-delibcwrap.patch	2 Jul 2008 23:15:08 -0000
>@@ -73,8 +73,8 @@
>  static int
>  move_distance(int dx, int dy)
>  {
>--    return xf86sqrt((dx * dx) + (dy * dy));
>-+    return sqrt((dx * dx) + (dy * dy));
>+-    return xf86sqrt(SQR(dx) + SQR(dy));
>++    return sqrt(SQR(dx) + SQR(dy));
>  }
>  
>  /*
>Index: synaptics-0.14.6-newx.patch
>===================================================================
>RCS file: /cvs/extras/rpms/synaptics/F-9/synaptics-0.14.6-newx.patch,v
>retrieving revision 1.1
>diff -u -r1.1 synaptics-0.14.6-newx.patch
>--- synaptics-0.14.6-newx.patch	7 Jan 2008 16:24:52 -0000	1.1
>+++ synaptics-0.14.6-newx.patch	2 Jul 2008 23:15:08 -0000
>@@ -34,55 +34,3 @@
>  
>  /*****************************************************************************
>   *	Local Headers
>-@@ -320,8 +322,10 @@ SynapticsPreInit(InputDriverPtr drv, IDe
>-     local->private_flags           = 0;
>-     local->flags                   = XI86_POINTER_CAPABLE | XI86_SEND_DRAG_EVENTS;
>-     local->conf_idev               = dev;
>-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
>-     local->motion_history_proc     = xf86GetMotionEvents;
>-     local->history_size            = 0;
>-+#endif
>-     local->always_core_feedback    = 0;
>- 
>-     xf86Msg(X_INFO, "Synaptics touchpad driver version %s (%d)\n", VERSION, VERSION_ID);
>-@@ -454,7 +458,9 @@ SynapticsPreInit(InputDriverPtr drv, IDe
>- 	goto SetupProc_fail;
>-     }
>- 
>-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
>-     local->history_size = xf86SetIntOption(opts, "HistorySize", 0);
>-+#endif
>- 
>-     xf86ProcessCommonOptions(local, opts);
>-     local->flags |= XI86_CONFIGURED;
>-@@ -612,8 +618,18 @@ DeviceInit(DeviceIntPtr dev)
>- 
>-     InitPointerDeviceStruct((DevicePtr)dev, map,
>- 			    SYN_MAX_BUTTONS,
>--			    miPointerGetMotionEvents, SynapticsCtrl,
>--			    miPointerGetMotionBufferSize());
>-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
>-+			    miPointerGetMotionEvents,
>-+#else
>-+			    GetMotionHistory,
>-+#endif
>-+			    SynapticsCtrl,
>-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
>-+			    miPointerGetMotionBufferSize()
>-+#else
>-+			    GetMotionHistorySize(), 2
>-+#endif
>-+                           );
>- 
>-     /* X valuator */
>-     xf86InitValuatorAxisStruct(dev, 0, 0, -1, 1, 0, 1);
>-@@ -622,7 +638,9 @@ DeviceInit(DeviceIntPtr dev)
>-     xf86InitValuatorAxisStruct(dev, 1, 0, -1, 1, 0, 1);
>-     xf86InitValuatorDefaults(dev, 1);
>- 
>-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
>-     xf86MotionHistoryAllocate(local);
>-+#endif
>- 
>-     if (!alloc_param_data(local))
>- 	return !Success;
>Index: synaptics-0.14.6-tap-to-click.patch
>===================================================================
>RCS file: /cvs/extras/rpms/synaptics/F-9/synaptics-0.14.6-tap-to-click.patch,v
>retrieving revision 1.1
>diff -u -r1.1 synaptics-0.14.6-tap-to-click.patch
>--- synaptics-0.14.6-tap-to-click.patch	9 Mar 2008 18:08:40 -0000	1.1
>+++ synaptics-0.14.6-tap-to-click.patch	2 Jul 2008 23:15:08 -0000
>@@ -1,10 +1,10 @@
> diff -up synaptics-0.14.6/synaptics.c.jx synaptics-0.14.6/synaptics.c
> --- synaptics-0.14.6/synaptics.c.jx	2008-03-09 13:55:18.000000000 -0400
> +++ synaptics-0.14.6/synaptics.c	2008-03-09 14:03:31.000000000 -0400
>-@@ -395,13 +395,13 @@ SynapticsPreInit(InputDriverPtr drv, IDe
>-     pars->touchpad_off = xf86SetIntOption(opts, "TouchpadOff", 0);
>+@@ -447,13 +447,13 @@ SynapticsPreInit(InputDriverPtr drv, IDe
>      pars->guestmouse_off = xf86SetBoolOption(opts, "GuestMouseOff", FALSE);
>      pars->locked_drags = xf86SetBoolOption(opts, "LockedDrags", FALSE);
>+     pars->locked_drag_time = xf86SetIntOption(opts, "LockedDragTimeout", 5000);
> -    pars->tap_action[RT_TAP] = xf86SetIntOption(opts, "RTCornerButton", 2);
> -    pars->tap_action[RB_TAP] = xf86SetIntOption(opts, "RBCornerButton", 3);
> +    pars->tap_action[RT_TAP] = xf86SetIntOption(opts, "RTCornerButton", 0);
>Index: synaptics.spec
>===================================================================
>RCS file: /cvs/extras/rpms/synaptics/F-9/synaptics.spec,v
>retrieving revision 1.36
>diff -u -r1.36 synaptics.spec
>--- synaptics.spec	10 Apr 2008 20:29:27 -0000	1.36
>+++ synaptics.spec	2 Jul 2008 23:15:08 -0000
>@@ -1,30 +1,31 @@
> %define moduledir %(pkg-config xorg-server --variable=moduledir )
>-
>+%define predate 20080702
> Name:           synaptics
>-Version:        0.14.6
>-Release:	8%{?dist}
>+Version:        0.14.7
>+Release:        0.1.%{predate}git%{?dist}
> Summary:        Synaptics Touchpad Driver
> 
> Group:          User Interface/X Hardware Support
>-License:        GPL
>+License:        GPLv2+
> URL:            http://w1.894.telia.com/~u89404340/touchpad/
>-Source0:        http://w1.894.telia.com/~u89404340/touchpad/files/%{name}-%{version}.tar.bz2
>-Source1:	10-synaptics.fdi
>-Patch0: synaptics-0.14.6-delibcwrap.patch
>-Patch1: synaptics-0.14.6-newx.patch
>-Patch2: synaptics-0.14.6-tap-to-click.patch
>-Patch3: synaptics-0.14.6-poll-delay.patch
>-Patch4: synaptics-0.14.6-poll-200ms.patch
>-Patch5: synaptics-0.14.6-alps.patch
>-Patch6: synaptics-0.14.6-optflags-debuginfo.patch
>+Source0:        http://w1.894.telia.com/~u89404340/touchpad/files/%{name}-%{version}-%{predate}git.tar.bz2
>+#Source1:        10-synaptics.fdi
>+Patch0:         synaptics-0.14.6-delibcwrap.patch
>+Patch1:         synaptics-0.14.6-newx.patch
>+Patch2:         synaptics-0.14.6-tap-to-click.patch
>+Patch3:         synaptics-0.14.6-poll-delay.patch
>+Patch4:         synaptics-0.14.6-poll-200ms.patch
>+Patch5:         synaptics-0.14.6-alps.patch
>+Patch6:         synaptics-0.14.6-optflags-debuginfo.patch
>+Patch7:         synaptics-0.14.6-multifingerbutton.patch
> BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}
>-BuildRequires:	pkgconfig
>-BuildRequires:	xorg-x11-server-sdk >= 1.0.99.901
>+BuildRequires:  pkgconfig
>+BuildRequires:  xorg-x11-server-sdk >= 1.0.99.901
> BuildRequires:  libX11-devel, libXi-devel, libXext-devel
> Requires:       xorg-x11-server-Xorg >= 1.0.99.901
>-Requires:	hal
>+Requires:       hal
> # This is what it should be, but the buildsystem is a disaster
>-# ExcludeArch:	s390 s390x
>+# ExcludeArch:  s390 s390x
> ExclusiveArch: %{ix86} x86_64 ppc ppc64
> 
> %description
>@@ -38,20 +39,25 @@
>     * Movement with adjustable, non-linear acceleration and speed.
>     * Button events through short touching of the touchpad.
>     * Double-Button events through double short touching of the touchpad.
>-    * Dragging through short touching and holding down the finger on the touchpad.
>-    * Middle and right button events on the upper and lower corner of the touchpad.
>-    * Vertical scrolling (button four and five events) through moving the finger on the right side of the touchpad.
>+    * Dragging through touching and holding down the finger on the touchpad.
>+    * Middle and right button on the upper and lower corner of the touchpad.
>+    * Vertical scrolling (button four and five events) through moving the
>+      finger on the right side of the touchpad.
>     * The up/down button sends button four/five events.
>-    * Horizontal scrolling (button six and seven events) through moving the finger on the lower side of the touchpad.
>-    * The multi-buttons send button four/five events, and six/seven events for horizontal scrolling.
>+    * Horizontal scrolling (button six and seven events) through moving the
>+      finger on the lower side of the touchpad.
>+    * The multi-buttons send button four/five events, and six/seven events for
>+      horizontal scrolling.
>     * Adjustable finger detection.
>-    * Multifinger taps: two finger for middle button and three finger for right button events. (Needs hardware support. Not all models implement this feature.)
>-    * Run-time configuration using shared memory. This means you can change parameter settings without restarting the X server.
>+    * Multifinger taps: two finger for middle button and three finger for right
>+      button events (hardware support is a prerequisite).
>+    * Run-time configuration using shared memory. This means you can change
>+      parameter settings without restarting the X server.
> 
> %prep
>-%setup -q
>+%setup -q -n %{name}-%{predate}
> %patch0 -p1 -b .delibcwrap
>-%if "%{?fedora}" >= "9"
>+%if 0%{?fedora} >= 9
> %patch1 -p1 -b .newx
> %endif
> %patch2 -p1 -b .tap
>@@ -59,6 +65,7 @@
> %patch4 -p1 -b .poll200ms
> %patch5 -p1 -b .alps-settings
> %patch6 -p1 -b .optflags-debuginfo
>+%patch7 -p1 -b .multifingerbutton
> # remove included XFree86 headers
> rm -rf Xincludes
> 
>@@ -67,14 +74,14 @@
> 
> %install
> rm -rf $RPM_BUILD_ROOT
>-make 	DESTDIR=$RPM_BUILD_ROOT \
>-	MANDIR='$(DESTDIR)%{_mandir}/' \
>-	BINDIR='$(DESTDIR)%{_bindir}' \
>-	ARCH='%{_arch}' \
>-	install
>+make  DESTDIR=$RPM_BUILD_ROOT \
>+  MANDIR='$(DESTDIR)%{_mandir}/' \
>+  BINDIR='$(DESTDIR)%{_bindir}' \
>+  ARCH='%{_arch}' \
>+  install
> 
>-install -d $RPM_BUILD_ROOT%{_datadir}/hal/fdi/policy/20thirdparty
>-install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/hal/fdi/policy/20thirdparty
>+#install -d $RPM_BUILD_ROOT%{_datadir}/hal/fdi/policy/20thirdparty
>+#install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/hal/fdi/policy/20thirdparty
> 
> %clean
> rm -rf $RPM_BUILD_ROOT
>@@ -82,13 +89,23 @@
> %files
> %defattr(-,root,root,-)
> %doc COMPATIBILITY FILES INSTALL INSTALL.DE INSTALL.FR LICENSE README README.alps TODO
>-%{_datadir}/hal/fdi/policy/20thirdparty/10-synaptics.fdi
>+#%{_datadir}/hal/fdi/policy/20thirdparty/10-synaptics.fdi
> %{moduledir}/input/*
> %{_bindir}/synclient
> %{_bindir}/syndaemon
> %{_mandir}/man?/*
> 
> %changelog
>+* Wed Jul 2 2008 Stewart Adam <s.adam at diffingo.com> - 0.14.7-0.1.20080702git
>+- git 2008/07/02
>+- Remove HAL .fdi file to prevent reset of settings found in xorg.conf
>+- Update patches:
>+    synaptics-0.14.6-delibcwrap.patch
>+    synaptics-0.14.6-newx.patch
>+    synaptics-0.14.6-tap-to-click.patch
>+- Fix rpmlint errors
>+- Add synaptics-0.14.6-multifingerbutton.patch
>+
> * Thu Apr 10 2008 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 0.14.6-8
> - Build with $RPM_OPT_FLAGS, fix debuginfo (#249979).
>

Actions: View | Diff

Attachments on bug 453871: 310868