323352 - [BeOS] Changes in bug 322942 broke BeOS builds in nsGfxFactoryBeos

Status: RESOLVED FIXED

(Core Graveyard :: GFX: BeOS, defect)

Description

[Doug Shelton]

User-Agent:       Mozilla/5.0 (BeOS; U; BeOS BePC; en-US; rv:1.9a1) Gecko/20060110 Firefox/1.6a1
Build Identifier: Mozilla/5.0 (BeOS; U; BeOS BePC; en-US; rv:1.9a1) Gecko/20060110 Firefox/1.6a1

BeOS built successfully on 10 January.  Build now breaks in nsGfxFactoryBeOS.cpp.  Cursory review of bonsai points to 322942.

Reproducible: Always

Steps to Reproduce:
1.try to build Firefox
2.build breaks
3.

Actual Results:  
broken build (see text attachment)

Expected Results:  
working build

Comment 1

[Doug Shelton]

Attachment: console output of bustage

Comment 2

[Doug Shelton]

Attachment: proposed patch to fix beos bustage

This patch appears to have taken care of the problem, but I have been unable to complete a clean build due to problems in the security module.

Comment 3

[Stuart Parmenter]

Comment on attachment 208455 [details] [diff] [review]
proposed patch to fix beos bustage

I can check this in for you tomorrow if you want.

Comment 4

[tqh]

Comment on attachment 208455 [details] [diff] [review]
proposed patch to fix beos bustage

r=[e-mail]

Comment 5

[Doug Shelton]

(In reply to comment #3)
> (From update of attachment 208455 [details] [diff] [review] [edit])
> I can check this in for you tomorrow if you want.
> 
Please check in the patch; tqh has OK'd it.  I don't have the ability to modify CVS, so I appreciate your help!  Beyond the patch, how do we insure the four files in question are moved from gfx/src/beos/ to widget/src/beos/ in the repository?

Comment 6

[Christian :Biesinger (don't email me, ping me on IRC)]

(caused by bug 322942)

the files were already copied, see the list in that bug:
mozilla/gfx/src/beos/nsScreenBeOS.cpp mozilla/widget/src/beos/nsScreenBeOS.cpp
mozilla/gfx/src/beos/nsScreenBeOS.h mozilla/widget/src/beos/nsScreenBeOS.h
mozilla/gfx/src/beos/nsScreenManagerBeOS.cpp mozilla/widget/src/beos/nsScreenManagerBeOS.cpp
mozilla/gfx/src/beos/nsScreenManagerBeOS.h mozilla/widget/src/beos/nsScreenManagerBeOS.h

Comment 7

[Christian :Biesinger (don't email me, ping me on IRC)]

how did you create that patch? it can't be applied, not only is it missing the paths, patch also says:
patch: **** malformed patch at line 118: Index: mozilla/widget/src/beos/nsWidgetFactory.cpp

Comment 8

[Christian :Biesinger (don't email me, ping me on IRC)]

Attachment: working patch

Comment 9

[Christian :Biesinger (don't email me, ping me on IRC)]

checked in, including removal of the old files in gfx
Checking in gfx/src/beos/Makefile.in;
/cvsroot/mozilla/gfx/src/beos/Makefile.in,v  <--  Makefile.in
new revision: 1.28; previous revision: 1.27
done
Checking in gfx/src/beos/nsGfxFactoryBeOS.cpp;
/cvsroot/mozilla/gfx/src/beos/nsGfxFactoryBeOS.cpp,v  <--  nsGfxFactoryBeOS.cpp
new revision: 1.26; previous revision: 1.25
done
Removing gfx/src/beos/nsScreenBeOS.cpp;
/cvsroot/mozilla/gfx/src/beos/nsScreenBeOS.cpp,v  <--  nsScreenBeOS.cpp
new revision: delete; previous revision: 1.12
done
Removing gfx/src/beos/nsScreenBeOS.h;
/cvsroot/mozilla/gfx/src/beos/nsScreenBeOS.h,v  <--  nsScreenBeOS.h
new revision: delete; previous revision: 1.3
done
Removing gfx/src/beos/nsScreenManagerBeOS.cpp;
/cvsroot/mozilla/gfx/src/beos/nsScreenManagerBeOS.cpp,v  <--  nsScreenManagerBeOS.cpp
new revision: delete; previous revision: 1.6
done
Removing gfx/src/beos/nsScreenManagerBeOS.h;
/cvsroot/mozilla/gfx/src/beos/nsScreenManagerBeOS.h,v  <--  nsScreenManagerBeOS.h
new revision: delete; previous revision: 1.3
done

Comment 10

[Doug Shelton]

thank you for the working patch, biesi!  I was travelling over the weekend and wasn't able to clean up my own mess.  I appreciate your help!