Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 444876 - x11-drivers/xf86-input-synaptics-1.6.2-r1 - Outdated reset-num_active_touches.patch - Hunk #2 FAILED at 3119. -- saving rejects to file src/synaptics.c.rej
Summary: x11-drivers/xf86-input-synaptics-1.6.2-r1 - Outdated reset-num_active_touches...
Status: RESOLVED INVALID
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal
Assignee: Gilles Dartiguelongue (RETIRED)
URL:
Whiteboard:
Keywords: PATCH
Depends on:
Blocks:
 
Reported: 2012-11-26 22:37 UTC by Alessandro Di Federico
Modified: 2012-11-28 01:01 UTC (History)
3 users (show)

See Also:
Package list:
Runtime testing required: ---


Attachments
Patch without the second part (xf86-input-synaptics-1.6.2-reset-num_active_touches.patch,1.41 KB, patch)
2012-11-26 22:37 UTC, Alessandro Di Federico
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Alessandro Di Federico 2012-11-26 22:37:28 UTC
Created attachment 330690 [details, diff]
Patch without the second part

The patch "xf86-input-synaptics-1.6.2-reset-num_active_touches.patch" looks outdated. The second hunk has been integrated in the source code, so the applying the patch fails.

Attached you can find the same patch without the second part.

This was the relevant error in "/var/tmp/portage/portage/x11-drivers/xf86-input-synaptics-1.6.2-r1/temp/xf86-input-synaptics-1.6.2-reset-num_active_touches.patch.out":

PATCH COMMAND:  patch -p1 -g0 -E --no-backup-if-mismatch  < '/usr/portage/x11-drivers/xf86-input-synaptics/files/xf86-input-synaptics-1.6.2-reset-num_active_touches.patch'

=====================================================================
patching file src/synaptics.c
Hunk #1 succeeded at 1155 with fuzz 2 (offset 1 line).
Hunk #2 FAILED at 3119.
1 out of 2 hunks FAILED -- saving rejects to file src/synaptics.c.rej

patch program exited with status 1
=====================================================================
Comment 1 Chí-Thanh Christopher Nguyễn gentoo-dev 2012-11-28 00:22:54 UTC
I see no problem with xf86-input-synaptics-1.6.2-r1 here. Please attach your build.log.
Comment 2 Alessandro Di Federico 2012-11-28 01:01:37 UTC
Sorry, I had a colliding local patch.