http://bugs.winehq.org/show_bug.cgi?id=9787
--- Comment #337 from Andrey Turkin andrey.turkin@gmail.com 2009-01-11 11:59:42 --- 2Nicky:
BTW, out of pure curiosity, could you explain to me what is the difference
between the two patches (I'm noob at C) Wine uses some autogenerated files, and some of them are included in git/tarballs so that users do not need to regenerate them. The problem is that AcceptEx patch adds new wineclient-wineserver calls, i.e. modifies protocol.def file (protocol definition), and there are several c source and header files generated from it. With first patch version (with generated files) once somebody else change protocol.def files, not only changes in protocol.def must be merged, but also changes in few more machine-generated files must be merge too - thus problems with rejected hunks. Second version does not include generated files, so merge succeeds but these generated files won't be updated until user run tools/make_requests to regenerate them.
2St.MPA3b
1st version of 1.1.12 patch failed with 1 hunk too, new version applied just fine, but wine dont compile with it. I have x86_64. Build log: http://ok.undo.it/wine-acceptex.log
Nice nick :) From log it seems you forgot to invoke tools/make_requests . Just add "tools/make_requests || die" line as last line of src_unpack ebuild section.