790015 - Lightning/Thunderbird build is broken after Bug 789382

Status: RESOLVED FIXED

(Calendar :: Lightning Only, defect)

Description

[ojab]

/sources/comm-central/calendar/base/src/calUtils.cpp: In function ‘nsresult cal::logError(const PRUnichar*)’:
/sources/comm-central/calendar/base/src/calUtils.cpp:19:94: error: no matching function for call to ‘nsIScriptError::Init(const PRUnichar*&, NULL, NULL, int, int, nsIScriptError::<anonymous enum>, const char [9])’
/sources/comm-central/calendar/base/src/calUtils.cpp:19:94: note: candidate is:
In file included from /sources/comm-central/calendar/base/src/calUtils.cpp:5:0:
../../../mozilla/dist/include/nsIScriptError.h:72:14: note: virtual nsresult nsIScriptError::Init(const nsAString&, const nsAString&, const nsAString&, uint32_t, uint32_t, uint32_t, const char*)
../../../mozilla/dist/include/nsIScriptError.h:72:14: note:   no known conversion for argument 1 from ‘const PRUnichar* {aka const short unsigned int*}’ to ‘const nsAString&’
/sources/comm-central/calendar/base/src/calUtils.cpp: In function ‘nsresult cal::logWarning(const PRUnichar*)’:
/sources/comm-central/calendar/base/src/calUtils.cpp:27:96: error: no matching function for call to ‘nsIScriptError::Init(const PRUnichar*&, NULL, NULL, int, int, nsIScriptError::<anonymous enum>, const char [9])’
/sources/comm-central/calendar/base/src/calUtils.cpp:27:96: note: candidate is:
In file included from /sources/comm-central/calendar/base/src/calUtils.cpp:5:0:
../../../mozilla/dist/include/nsIScriptError.h:72:14: note: virtual nsresult nsIScriptError::Init(const nsAString&, const nsAString&, const nsAString&, uint32_t, uint32_t, uint32_t, const char*)
../../../mozilla/dist/include/nsIScriptError.h:72:14: note:   no known conversion for argument 1 from ‘const PRUnichar* {aka const short unsigned int*}’ to ‘const nsAString&’
make[8]: *** [calUtils.o] Error 1

Comment 1

[Daniel Holbert [:dholbert]]

Conveniently, the bustage here is limited to the file in comment 0 (calUtils)

That has the only instances of "scripterror" in comm-central's cpp files on MXR:
 https://mxr.mozilla.org/comm-central/search?string=scripterror&find=cpp%24&findi=&filter=^[^\0]*%24&hitlimit=&tree=comm-central
(ignoring /mozilla subdir which appears to be straight m-c)

Comment 2

[Daniel Holbert [:dholbert]]

Attachment: possible untested fix

For reference, here's a fix I'd spun up (hadn't attached it yet because I didn't yet have a comm-central build & couldn't test it).

Stefan: feel free to take this and run with it -- maybe you've already generated something similar yourself. :)

Comment 4

[Stefan Sitter [:ssitter]]

Attachment: bustage fix

Comment 5

[Daniel Holbert [:dholbert]]

(bustage fix looks good to me, FWIW! Thanks, and sorry for causing the bustage.)

Comment 6

[Philip Chee]

Comment on attachment 660140 [details] [diff] [review]
bustage fix

This patch allows my build to complete and no obvious errors on startup.

Comment 7

[Stefan Sitter [:ssitter]]

Comment on attachment 660140 [details] [diff] [review]
bustage fix

It seem that Philipp is not available at the moment. I therefore set r+ myself based on the positive feedback above to check in the bustage fix.

Comment 8

[Stefan Sitter [:ssitter]]

Pushed to https://hg.mozilla.org/comm-central/rev/6d5b06e82381