[oe] Conflicting qte patches for Simpad

[Torsten Sadowski]

Hi,

after some time I tried to build a Simpad opie-image again (from the devel 
branch) but I encountered conflicting patches for libqte (normal, static and 
mt).

It seems, that 
QWSTtyKeyboardHandler::QWSTtyKeyboardHandler
moved to:
kernelkeyboard.cpp

which is not accounted for in the devfs.patch.

Cheers, Torsten



Applying patch devfs.patch
patching file configure
patching file src/kernel/qgfxlinuxfb_qws.cpp
patching file src/kernel/qkeyboard_qws.cpp
Hunk #1 FAILED at 1253.
1 out of 1 hunk FAILED -- rejects in file src/kernel/qkeyboard_qws.cpp
patching file src/kernel/qwindowsystem_qws.cpp
patching file src/kernel/qsoundqss_qws.cpp
Hunk #1 succeeded at 1086 (offset -2 lines).
Patch devfs.patch does not apply (enforce with -f)
ERROR: Task 2094 
(/home/totty/simpad/bitbake2/devel/org.openembedded.dev/package
s/qte/qte-mt_2.3.10.bb, do_patch) failed
NOTE: Tasks Summary: Attempted 374 tasks of which 0 didn't need to be rerun 
and 
1 failed.
ERROR: '/home/totty/simpad/bitbake2/devel/org.openembedded.dev/packages/qte/qte-
mt_2.3.10.bb' failed