Conflicting qte patches for Simpad

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
	

Re: Conflicting qte patches for Simpad

[Henning Heinold]

On Mon, Jul 09, 2007 at 05:24:32PM +0200, Torsten Sadowski wrote:
> 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
> 

Because linux 2.4 is unmaintained and linux 2.6 is the future devfs.patch is gone.

Please do mtn pull and mtn up.

Bye Henning

-- 
IBM Certified Specialist - eserver i5 iSeries Technical Solutions Designer V5R3

Re: Conflicting qte patches for Simpad

[Henning Heinold]

On Tue, Jul 10, 2007 at 11:19:46AM +0200, Henning Heinold wrote:
> On Mon, Jul 09, 2007 at 05:24:32PM +0200, Torsten Sadowski wrote:
> > 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
> > 
> 
> Because linux 2.4 is unmaintained and linux 2.6 is the future devfs.patch is gone.
> 
> Please do mtn pull and mtn up.
> 
> Bye Henning

Sorry,

I am wrong, I thougt Mr. psokolovsky delete it with his last commit for
qte-common_2.3.10.inc. So please delete the line
SRC_URI_append_simpad       = "file://devfs.patch;patch=1 " alone
and try again.

Bye Henning
-- 
IBM Certified Specialist - eserver i5 iSeries Technical Solutions Designer V5R3

Re: Conflicting qte patches for Simpad

[Paul Sokolovsky]

Hello Henning,

Tuesday, July 10, 2007, 2:48:40 PM, you wrote:

> On Tue, Jul 10, 2007 at 11:19:46AM +0200, Henning Heinold wrote:
>> On Mon, Jul 09, 2007 at 05:24:32PM +0200, Torsten Sadowski wrote:
>> > 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
>> > 
>> 
>> Because linux 2.4 is unmaintained and linux 2.6 is the future devfs.patch is gone.
>> 
>> Please do mtn pull and mtn up.
>> 
>> Bye Henning

> Sorry,

> I am wrong, I thougt Mr. psokolovsky delete it with his last commit for
> qte-common_2.3.10.inc. So please delete the line
> SRC_URI_append_simpad       = "file://devfs.patch;patch=1 " alone
> and try again.

  Ok, now removed in OE too.

> Bye Henning



-- 
Best regards,
 Paul                            mailto:pmiscml@gmail.com