Closed
Bug 955261
Opened 10 years ago
Closed 10 years ago
Update to Mozilla 19
Categories
(Chat Core :: General, defect)
Chat Core
General
Tracking
(Not tracked)
RESOLVED
FIXED
1.4
People
(Reporter: aleth, Assigned: clokep)
References
()
Details
Attachments
(4 files, 3 obsolete files)
6.50 KB,
patch
|
florian
:
review+
|
Details | Diff | Splinter Review |
14.35 KB,
patch
|
florian
:
review+
|
Details | Diff | Splinter Review |
8.80 KB,
patch
|
clokep
:
review+
|
Details | Diff | Splinter Review |
736 bytes,
patch
|
clokep
:
review+
|
Details | Diff | Splinter Review |
*** Original post on bio 1828 at 2012-11-25 14:06:00 UTC *** .
Assignee | ||
Comment 1•10 years ago
|
||
*** Original post on bio 1828 as attmnt 2244 at 2013-02-23 00:47:00 UTC *** I have a build going with updating patches now, seems to be mostly done...
Assignee | ||
Updated•10 years ago
|
Assignee: nobody → clokep
Status: NEW → ASSIGNED
Assignee | ||
Comment 2•10 years ago
|
||
*** Original post on bio 1828 at 2013-03-01 03:59:26 UTC *** We need to port: Bio 773143 - Rename MOZ_ANGLE to MOZ_ANGLE_RENDERER [Port |Bio 772457 Remove compile-time option to disable ANGLE, replace it by an option to disable WebGL altogether (also disabling ANGLE)|] [1] [1] https://bugzilla.mozilla.org/show_bug.cgi?id=773143
Assignee | ||
Comment 3•10 years ago
|
||
*** Original post on bio 1828 at 2013-03-01 04:03:43 UTC *** And also: Bio 736459 - WantAllTraces should disable nsINode::Traverse, nsBaseContentList optimizations (https://bugzilla.mozilla.org/show_bug.cgi?id=736459)
Assignee | ||
Comment 4•10 years ago
|
||
*** Original post on bio 1828 at 2013-03-01 04:04:16 UTC *** (In reply to comment #3) > And also: > Bio 736459 - WantAllTraces should disable nsINode::Traverse, nsBaseContentList > optimizations (https://bugzilla.mozilla.org/show_bug.cgi?id=736459) Oops, this was totally the wrong bug, I meant: Bio 792180 - Replace NS_{UN,}LIKELY with MOZ_{UN,}LIKELY (https://bugzilla.mozilla.org/show_bug.cgi?id=792180)
Assignee | ||
Comment 5•10 years ago
|
||
*** Original post on bio 1828 as attmnt 2249 at 2013-03-01 04:15:00 UTC was without comment, so any subsequent comment numbers will be shifted ***
Attachment #8354013 -
Flags: review?(florian)
Assignee | ||
Comment 6•10 years ago
|
||
*** Original post on bio 1828 as attmnt 2250 at 2013-03-01 04:15:00 UTC was without comment, so any subsequent comment numbers will be shifted ***
Attachment #8354014 -
Flags: review?(florian)
Assignee | ||
Comment 7•10 years ago
|
||
Comment on attachment 8354008 [details] [diff] [review] Update patches *** Original change on bio 1828 attmnt 2244 at 2013-03-01 04:15:21 UTC was without comment, so any subsequent comment numbers will be shifted ***
Attachment #8354008 -
Attachment is obsolete: true
Assignee | ||
Comment 8•10 years ago
|
||
*** Original post on bio 1828 as attmnt 2251 at 2013-03-01 04:16:00 UTC was without comment, so any subsequent comment numbers will be shifted ***
Attachment #8354015 -
Flags: review?(florian)
Comment 9•10 years ago
|
||
Comment on attachment 8354013 [details] [diff] [review] Update patches and client.py *** Original change on bio 1828 attmnt 2249 at 2013-03-12 23:29:50 UTC *** >diff --git a/client.py b/client.py >-DEFAULT_MOZILLA_REV = "FIREFOX_18_0_2_RELEASE" >+DEFAULT_MOZILLA_REV = "FIREFOX_19_0_1_RELEASE" As discussed on IRC, this needs to be 19_0_2. >diff --git a/tools/patches/bonjour-and-GPL-licenses.patch b/tools/patches/bonjour-and-GPL-licenses.patch >--- a/tools/patches/bonjour-and-GPL-licenses.patch >+++ b/tools/patches/bonjour-and-GPL-licenses.patch >@@ -1,12 +1,12 @@ > diff --git a/toolkit/content/license.html b/toolkit/content/license.html >@@ -18,26 +18,29 @@ diff --git a/toolkit/content/license.htm > <li><a href="about:license#cairo">Cairo Component Licenses</a></li> > <li><a href="about:license#chromium">Chromium License</a></li> > <li><a href="about:license#dtoa">dtoa License</a></li> > <li><a href="about:license#hunspell-nl">Dutch Spellchecking Dictionary License</a></li> > <li><a href="about:license#edl">Eclipse Distribution License</a></li> > <li><a href="about:license#expat">Expat License</a></li> > <li><a href="about:license#firebug">Firebug License</a></li> > <li><a href="about:license#gfx-font-list">gfxFontList License</a></li> >-+ <li><a href="about:license#gpl">GNU General Public License</a></li> >-+ <li><a href="about:license#lgpl">GNU Lesser General Public License</a></li> > <li><a href="about:license#gears">Google Gears License</a></li> > <li><a href="about:license#gears-istumbler">Google Gears/iStumbler License</a></li> > <li><a href="about:license#vp8">Google VP8 License</a></li> >- <li><a href="about:license#growl">Growl License</a></li> >++ <li><a href="about:license#gpl">GNU General Public License</a></li> >++ <li><a href="about:license#lgpl">GNU Lesser General Public License</a></li> > <li><a href="about:license#gyp">gyp License</a></li> What's going on here? Isn't 'GNU' before 'Google' in alphabetical order? >diff --git a/tools/patches/symbolstore-no-local-hg.patch b/tools/patches/symbolstore-no-local-hg.patch >--- a/tools/patches/symbolstore-no-local-hg.patch >+++ b/tools/patches/symbolstore-no-local-hg.patch >@@ -1,24 +1,24 @@ > diff --git a/toolkit/crashreporter/tools/symbolstore.py b/toolkit/crashreporter/tools/symbolstore.py > --- a/toolkit/crashreporter/tools/symbolstore.py > +++ b/toolkit/crashreporter/tools/symbolstore.py >-@@ -253,16 +253,20 @@ class HGFileInfo(VCSFileInfo): >- hg_root = os.environ.get("SRCSRV_ROOT") >- if hg_root: >- path = hg_root >- else: >- path = read_output('hg', '-R', srcdir, >- 'showconfig', 'paths.default') >- if not path: >- print >> sys.stderr, "Failed to get HG Repo for %s" % srcdir >+@@ -129,16 +129,20 @@ class HGRepoInfo: >+ hg_root = os.environ.get("SRCSRV_ROOT") >+ if hg_root: >+ root = hg_root >+ else: >+ root = read_output('hg', '-R', path, >+ 'showconfig', 'paths.default') >+ if not root: >+ print >> sys.stderr, "Failed to get HG Repo for %s" % path > + if os.path.exists(path): > + path = read_output('hg', '-R', path, > + 'showconfig', 'paths.default') Shouldn't the indent level on these 3 lines change like in the context around them?
Attachment #8354013 -
Flags: review?(florian) → review-
Comment 10•10 years ago
|
||
Comment on attachment 8354014 [details] [diff] [review] Update configure.in *** Original change on bio 1828 attmnt 2250 at 2013-03-12 23:37:35 UTC *** >diff --git a/instantbird/installer/Makefile.in b/instantbird/installer/Makefile.in >+ifdef MOZ_ANGLE_RENDERER >+DEFINES += -DMOZ_ANGLE_RENDERER=$(MOZ_ANGLE_RENDERER) >+DEFINES += -DMOZ_D3DX9_DLL=$(MOZ_D3DX9_DLL) >+DEFINES += -DMOZ_D3DCOMPILER_DLL=$(MOZ_D3DCOMPILER_DLL) >+endif Nit: I would prefer if this used the same style as http://lxr.instantbird.org/instantbird/source/instantbird/app/Makefile.in#19 that is: DEFINES += \ -DFOO=$(FOO) \ -DBAR=$(BAR) \ $(NULL) r=me with that nit addressed, although I won't be confident in this until a nightly with it has been tested ;). I'm especially curious of the effect these new defines will have, because it seems MOZ_ANGLE wasn't defined before and a few files listed in package-manifest.in were consequently ignored.
Attachment #8354014 -
Flags: review?(florian) → review+
Comment 11•10 years ago
|
||
Comment on attachment 8354015 [details] [diff] [review] Port bug 792180 for purplexpcom *** Original change on bio 1828 attmnt 2251 at 2013-03-12 23:38:44 UTC was without comment, so any subsequent comment numbers will be shifted ***
Attachment #8354015 -
Flags: review?(florian) → review+
Assignee | ||
Comment 12•10 years ago
|
||
*** Original post on bio 1828 as attmnt 2267 at 2013-03-13 00:57:00 UTC *** (In reply to comment #8) > Comment on attachment 8354013 [details] [diff] [review] (bio-attmnt 2249) [details] > Update patches and client.py > > What's going on here? Isn't 'GNU' before 'Google' in alphabetical order? I have no idea what I was thinking...fixed now. :) > >diff --git a/tools/patches/symbolstore-no-local-hg.patch b/tools/patches/symbolstore-no-local-hg.patch > Shouldn't the indent level on these 3 lines change like in the context around > them? Good catch. I've fixed this.
Attachment #8354032 -
Flags: review?(florian)
Assignee | ||
Comment 13•10 years ago
|
||
Comment on attachment 8354013 [details] [diff] [review] Update patches and client.py *** Original change on bio 1828 attmnt 2249 at 2013-03-13 00:57:55 UTC was without comment, so any subsequent comment numbers will be shifted ***
Attachment #8354013 -
Attachment is obsolete: true
Assignee | ||
Comment 14•10 years ago
|
||
*** Original post on bio 1828 as attmnt 2268 at 2013-03-13 01:02:00 UTC *** (In reply to comment #9) > Comment on attachment 8354014 [details] [diff] [review] (bio-attmnt 2250) [details] > Update configure.in > r=me with that nit addressed, although I won't be confident in this until a > nightly with it has been tested ;). Carrying your review forward. > I'm especially curious of the effect these new defines will have, because it > seems MOZ_ANGLE wasn't defined before and a few files listed in > package-manifest.in were consequently ignored. Configure changes always scare me a bit, buildbot always seems to have just different enough of an environment for stuff to break. :(
Attachment #8354033 -
Flags: review+
Assignee | ||
Comment 15•10 years ago
|
||
Comment on attachment 8354014 [details] [diff] [review] Update configure.in *** Original change on bio 1828 attmnt 2250 at 2013-03-13 01:02:50 UTC was without comment, so any subsequent comment numbers will be shifted ***
Attachment #8354014 -
Attachment is obsolete: true
Comment 16•10 years ago
|
||
*** Original post on bio 1828 at 2013-03-13 08:46:10 UTC *** Comment on attachment 8354033 [details] [diff] [review] (bio-attmnt 2268) Update configure.in v2 >+ifdef MOZ_ANGLE_RENDERER >+DEFINES += \ >+ -DMOZ_ANGLE_RENDERER=$(MOZ_ANGLE_RENDERER) \ >+ -DMOZ_D3DX9_DLL=$(MOZ_D3DX9_DLL) \ >+ -DMOZ_D3DCOMPILER_DLL=$(MOZ_D3DCOMPILER_DLL) \ >+ $(NULL) Lining up these would be better. Tabs for the indent are welcome here (Makefiles are the exception! ;-)).
Comment 17•10 years ago
|
||
Comment on attachment 8354032 [details] [diff] [review] Update patches and client.py v2 *** Original change on bio 1828 attmnt 2267 at 2013-03-13 08:47:10 UTC was without comment, so any subsequent comment numbers will be shifted ***
Attachment #8354032 -
Flags: review?(florian) → review+
Comment 18•10 years ago
|
||
*** Original post on bio 1828 as attmnt 2275 at 2013-03-14 10:09:00 UTC *** This coding error makes clang unhappy. IIRC the nsresult type has been changed to an enum so that compilers can catch these bugs.
Attachment #8354040 -
Flags: review?(clokep)
Assignee | ||
Comment 19•10 years ago
|
||
Comment on attachment 8354040 [details] [diff] [review] Fix purpleSockets *** Original change on bio 1828 attmnt 2275 at 2013-03-14 10:17:27 UTC was without comment, so any subsequent comment numbers will be shifted ***
Attachment #8354040 -
Flags: review?(clokep) → review+
Assignee | ||
Comment 20•10 years ago
|
||
*** Original post on bio 1828 at 2013-03-14 23:26:00 UTC *** http://hg.instantbird.org/instantbird/rev/61b6e6d19eb8 http://hg.instantbird.org/instantbird/rev/540ec302efa2 http://hg.instantbird.org/instantbird/rev/00e9de638d20 http://hg.instantbird.org/instantbird/rev/22f36a37d3cd http://hg.instantbird.org/instantbird/rev/dc4adb67cf5e
Status: ASSIGNED → RESOLVED
Closed: 10 years ago
Resolution: --- → FIXED
Target Milestone: --- → 1.4
Assignee | ||
Comment 21•10 years ago
|
||
*** Original post on bio 1828 at 2013-03-15 10:25:23 UTC *** Fix build symbol bustage: http://hg.instantbird.org/instantbird/rev/1e565c643d07
You need to log in
before you can comment on or make changes to this bug.
Description
•