Closed Bug 1177785 (SM2.35-mozilla-release-Uplift) Opened 4 years ago Closed 4 years ago

Bugs / Patches to be uplifted to mozilla-release relbranch for SeaMonkey 2.35

Categories

(SeaMonkey :: General, defect)

SeaMonkey 2.35 Branch
defect
Not set

Tracking

(Not tracked)

RESOLVED WONTFIX

People

(Reporter: philip.chee, Unassigned)

References

Details

(Keywords: meta)

User Story

The following bugs/changesets landed on mozilla-esr38+THUNDERBIRD_38_VERBRANCH and need to land on our mozilla-release relbranch:

Bug 1151345 - Firefox app menu sometimes contains only "Quit" on OS X.
(07b9ccbfb490)
Bug 1169996 - Don't lose eEditorMailMask
(8818cfba3036)
Bug 967494 - "Preference Composition/Spelling/Language is ignored, and changing spellcheck language in one composition window affects all open and new compositions"
(3c181756da20)
Bug 1140617 - Don't clear inline style when pasting image.
(f88e5322f5d3)
Bug 1154791 - Inline spell checker loses red underlines after a backspace is used - take two
  mozilla-esr38 d79fd66bfe58 + mozilla-esr38 222192907d83 (https://hg.mozilla.org/mozilla-central/rev/85187d5c5219)
Bug 756984 - Collapse the selection on the last text node on the line, skipping br and inline frames when clicking past the end of line
(2b80e0ec7f35)
Bug 1100966 - Remember all ranges for all selections when joining nodes in the editor transactions
(ebf8c3e088fc)
Bug 1153790 - mac unification doesn't work with packaged addons
http://hg.mozilla.org/releases/mozilla-esr38/rev/f743fa7d9b84
http://hg.mozilla.org/releases/mozilla-release/rev/f743fa7d9b84
  (see) Fix bug 1130854 - Package Lightning with Thunderbird - Make mac unification work - remove extra universal.mk
Bug 1140105 - Can't query for a specific font face when the selection is collapsed
(13d78cb17d8a)
Bug 1153790 - mac unification doesn't work with packaged addons
http://hg.mozilla.org/releases/mozilla-esr38/rev/f743fa7d9b84
https://hg.mozilla.org/releases/mozilla-release/rev/a5fa340c2948

Bug 1143570 - Part 1: Use an nsBlockInFlowLineIterator to determine whether a BR frame is visible or not
https://hg.mozilla.org/releases/mozilla-esr38/rev/e351b6e79cd6
No description provided.
The following bugs/changesets landed on mozilla-esr38+THUNDERBIRD_38_VERBRANCH and need to land on our mozilla-release relbranch:

Bug 1151345 - Firefox app menu sometimes contains only "Quit" on OS X.
(07b9ccbfb490)
Bug 1169996 - Don't lose eEditorMailMask
(8818cfba3036)
Bug 967494 - "Preference Composition/Spelling/Language is ignored, and changing spellcheck language in one composition window affects all open and new compositions"
(3c181756da20)
Bug 1140617 - Don't clear inline style when pasting image.
(f88e5322f5d3)
Bug 1154791 - Inline spell checker loses red underlines after a backspace is used - take two
  mozilla-esr38 d79fd66bfe58 + mozilla-esr38 222192907d83 (https://hg.mozilla.org/mozilla-central/rev/85187d5c5219)
Bug 756984 - Collapse the selection on the last text node on the line, skipping br and inline frames when clicking past the end of line
(2b80e0ec7f35)
Bug 1100966 - Remember all ranges for all selections when joining nodes in the editor transactions
(ebf8c3e088fc)
Bug 1153790 - mac unification doesn't work with packaged addons
http://hg.mozilla.org/releases/mozilla-esr38/rev/f743fa7d9b84
http://hg.mozilla.org/releases/mozilla-release/rev/f743fa7d9b84
  (see) Fix bug 1130854 - Package Lightning with Thunderbird - Make mac unification work - remove extra universal.mk
Bug 1140105 - Can't query for a specific font face when the selection is collapsed
(13d78cb17d8a)
Bug 1153790 - mac unification doesn't work with packaged addons
http://hg.mozilla.org/releases/mozilla-esr38/rev/f743fa7d9b84
https://hg.mozilla.org/releases/mozilla-release/rev/a5fa340c2948
I hope Kent also accepts bug 1143570:
Part 1 only!! - https://hg.mozilla.org/mozilla-central/rev/fafce41ffcee
Part 2 created bad regressions and was backed out in bug 1174521.
I'm missing bug 1166031 and bug 1176097 on your list, see bug 1172917.

So, is it decided to build from comm/mozilla-release rather than comm/mozilla-esr38, which has all of those patches landed already, including those for 38.1.0, i.e., 39-cycle security fixes?

The latter still sounds more attractive to me for this specific release, rather than duplicating those landings in the release repositories (and possibly missing some in the process). But anyway, up to ewong & Callek I guess.
(In reply to rsx11m from comment #3)
> I'm missing bug 1166031 and bug 1176097 on your list, see bug 1172917.
> 
> So, is it decided to build from comm/mozilla-release rather than
> comm/mozilla-esr38, which has all of those patches landed already, including
> those for 38.1.0, i.e., 39-cycle security fixes?
> 
> The latter still sounds more attractive to me for this specific release,
> rather than duplicating those landings in the release repositories (and
> possibly missing some in the process). But anyway, up to ewong & Callek I
> guess.

I *did* suggest using mozilla-esr38 but got pushback from Callek.
Hmm...
User Story: (updated)
Depends on: 1143570
Depends on: 1172917
Depends on: 1179808
Depends on: 1181977
No longer depends on: 1181977
At the last fortnightly IRC meeting we all agreed to use the mozilla-esr38 branch instead of manually trying to cherry pick stuff to land on mozilla-release. Especially now that mozilla-release is uplifted to Mozilla 39. Closing this bug as WONTFIX
Status: NEW → RESOLVED
Closed: 4 years ago
Resolution: --- → WONTFIX
No longer blocks: SM2.35
Depends on: 1186600
You need to log in before you can comment on or make changes to this bug.