955262 - Update to Mozilla 20

Status: RESOLVED FIXED

(Chat Core :: General, defect)

Description

[aleth [:aleth]]

*** Original post on bio 1829 at 2012-11-25 14:07:00 UTC ***

.

Comment 1

[Patrick Cloke [:clokep]]

Attachment: Update patches

*** Original post on bio 1829 as attmnt 2353 at 2013-04-13 15:37:00 UTC ***

I'm building with this now, if it works fine I'll request review. (All the patches applied OK except for the Bonjour license one, which I updated, and the use clang on OS X one, which was already applied upstream.)

Comment 2

[Patrick Cloke [:clokep]]

*** Original post on bio 1829 at 2013-04-15 01:24:33 UTC ***

More changes:
- Prefix the constants in imICommandsService (CONTEXT_ALL seems to be defined on Windows)
- Adapted purpleDNS.cpp for http://hg.mozilla.org/mozilla-central/rev/7f5fad93ef78
- Need to add ByteCountReceived and ByteCountSend to purpleSockets.cpp
- Changes to trayToolkit.cpp for http://hg.mozilla.org/mozilla-central/rev/57427d474c9a

Comment 3

[Patrick Cloke [:clokep]]

Attachment: Changes to compile

*** Original post on bio 1829 as attmnt 2359 at 2013-04-15 02:37:00 UTC ***

These are the changes necessary to compile and get a build to work. libpurple accounts don't seem to connect properly with these changes though. I'm hoping Florian has some idea why.

Comment 4

[Patrick Cloke [:clokep]]

Attachment: Port configure changes

*** Original post on bio 1829 as attmnt 2360 at 2013-04-15 02:47:00 UTC ***

This patch ports configure.in (and friends) changes:
https://bugzilla.mozilla.org/show_bug.cgi?id=807488 / http://hg.mozilla.org/releases/comm-release/rev/0e87bd250f40
https://bugzilla.mozilla.org/show_bug.cgi?id=808399 / http://hg.mozilla.org/releases/comm-release/rev/7465c559c0a5
https://bugzilla.mozilla.org/show_bug.cgi?id=810707 / http://hg.mozilla.org/releases/comm-release/rev/2d2b781f42eb
https://bugzilla.mozilla.org/show_bug.cgi?id=813526 / http://hg.mozilla.org/releases/comm-release/rev/0228cef8fb83

We probably have some other stuff to port for these files, but that's bug 955017 (bio 1587), this is just the changes from Mozilla 19/20 (and they seemed likely to avoid issues, so I ported them!) Note that this patch is based on top of the kill wince patch (bug 954994 (bio 1563)), so I can't promise these will apply cleanly without that being checked in first.

Comment 5

[Patrick Cloke [:clokep]]

Comment on attachment 8354120 [details] [diff] [review]
Update patches

*** Original change on bio 1829 attmnt 2353 at 2013-04-15 02:48:41 UTC was without comment, so any subsequent comment numbers will be shifted ***

Comment 6

[Florian Quèze [:florian]]

Comment on attachment 8354120 [details] [diff] [review]
Update patches

*** Original change on bio 1829 attmnt 2353 at 2013-04-15 23:51:43 UTC was without comment, so any subsequent comment numbers will be shifted ***

Comment 7

[Florian Quèze [:florian]]

Comment on attachment 8354127 [details] [diff] [review]
Port configure changes

*** Original change on bio 1829 attmnt 2360 at 2013-04-15 23:55:11 UTC was without comment, so any subsequent comment numbers will be shifted ***

Comment 8

[Florian Quèze [:florian]]

Attachment: Fix purpleDNS.cpp

*** Original post on bio 1829 as attmnt 2372 at 2013-04-16 21:45:00 UTC was without comment, so any subsequent comment numbers will be shifted ***

Comment 9

[Florian Quèze [:florian]]

Attachment: Fix purpleDNS.cpp v2

*** Original post on bio 1829 as attmnt 2373 at 2013-04-16 22:48:00 UTC ***

For some obscure reason, the |using namespace| line doesn't work when I do an universal build.

Comment 10

[Florian Quèze [:florian]]

Comment on attachment 8354139 [details] [diff] [review]
Fix purpleDNS.cpp

*** Original change on bio 1829 attmnt 2372 at 2013-04-16 22:48:05 UTC was without comment, so any subsequent comment numbers will be shifted ***

Comment 11

[Patrick Cloke [:clokep]]

Comment on attachment 8354140 [details] [diff] [review]
Fix purpleDNS.cpp v2

*** Original change on bio 1829 attmnt 2373 at 2013-04-16 23:08:12 UTC ***

Seems to work on Windows!

Comment 12

[Patrick Cloke [:clokep]]

Attachment: Changes to compile v2

*** Original post on bio 1829 as attmnt 2374 at 2013-04-16 23:10:00 UTC ***

This removes the changes I had for purpleDNS.cpp so it applies cleanly.

Comment 13

[Patrick Cloke [:clokep]]

Comment on attachment 8354126 [details] [diff] [review]
Changes to compile

*** Original change on bio 1829 attmnt 2359 at 2013-04-16 23:10:11 UTC was without comment, so any subsequent comment numbers will be shifted ***

Comment 14

[Florian Quèze [:florian]]

Comment on attachment 8354141 [details] [diff] [review]
Changes to compile v2

*** Original change on bio 1829 attmnt 2374 at 2013-04-16 23:13:15 UTC was without comment, so any subsequent comment numbers will be shifted ***

Comment 15

[Patrick Cloke [:clokep]]

*** Original post on bio 1829 at 2013-04-16 23:24:17 UTC ***

Checked in as
http://hg.instantbird.org/instantbird/rev/8fa11e4d1382
http://hg.instantbird.org/instantbird/rev/bd9c56918ab7
http://hg.instantbird.org/instantbird/rev/fe0accda6346
http://hg.instantbird.org/instantbird/rev/e7dbfbeccdec
http://hg.instantbird.org/instantbird/rev/6aafce752027
http://hg.instantbird.org/instantbird/rev/db4c03fe1ac8
http://hg.instantbird.org/instantbird/rev/4ed98830694b