Now that bug 368091 is in, Sm can port the Firefox changes there to build a copy of license.html containing the MoFo EULA line (lost in the toolkit move), pack it in your SeaMonkey app jar, and add a chrome override to make that file show for about:license instead of the (now-generic) toolkit file. The Fx changes should be fairly easy to port; I won't have time to get to this myself until after Cm1.6 ships, but since you're now no longer shipping the wrong EULA line, hopefully porting this is not as urgent.
Created attachment 316649 [details] [diff] [review] Fix, v1 This was a breeze to fix :) Some notes: 1) I stuck this in suite/common since a license seemed like a file that would be common to the whole suite. 2) Every project/module I've worked in so far seems to have slightly different rules for where they stick certain hunks in a Makefile in relation to other hunks, so if you prefer something somewhere else, I'm happy to change things around (plus I wasn't sure of the best way to handle the DEFINES plus the existing comment). 3) The wacky $(abs_srcdir) stuff there is to prevent Sun boxen from breaking since $(srcdir) apparently confused them when I did this in Firefox. 4) I've only tested this (and only have access to) a Mac, but it's a straight port of the Firefox bits, so unless you have more exotic platforms with other strange Makefile variable behaviors, it should work fine. The suggestion from #SeaMonkey was that this is mostly cross-module and UI, so ask for r+sr=neil.
Comment on attachment 316649 [details] [diff] [review] Fix, v1 Thanks for doing this! >+# the following files are suite-specific overrides of generic Core files: >+* content/communicator/license.html (/toolkit/content/license.html) >+% override chrome://global/content/license.html chrome://communicator/content/license.html We're trying to keep the file list in order, so license.html would go in presumably just before nsContextMenu.js while the override goes just after the package in which the override appears. See suite/locales/jar.mn for example. Also I think it would be helpful to point out in the comment that the app licence gets substituted in (and possibly in the Makefile as well). (If only the licence had been in xhtml, then it would have been much easier to substitute stuff in...)
Neil, do these comments look OK? In suite/common/jar.mn: >+# the following file is a suite-specific override of the generic license.html, using suite/common/app-license.html as input: >+* content/communicator/license.html (/toolkit/content/license.html) Should that wrap? It's shorter than most of the lines at the top of the file, but I don't know what the rules are for jar.mn files. In suite/common/Makefile.in: > # DEFINES for preprocessing >+# Use suite/common/app-license.html as input when generating >+# chrome://content/communicator/license.html to override >+# chrome://global/content/license.html (about:license) >+DEFINES += -DAPP_EULA_BLOCK=$(abs_srcdir)/app-license.html Are you guys in any sort of "needs approval" phase, or can I just land this once you're happy with the comments?
(In reply to comment #3) > Should that wrap? No, in I don't think so, it's out of character for jar.mn files ;-) > Are you guys in any sort of "needs approval" phase, or can I just land this > once you're happy with the comments? Land away!
Checking in suite/common/jar.mn; /cvsroot/mozilla/suite/common/jar.mn,v <-- jar.mn new revision: 1.47; previous revision: 1.46 done Checking in suite/common/Makefile.in; /cvsroot/mozilla/suite/common/Makefile.in,v <-- Makefile.in new revision: 1.6; previous revision: 1.5 done RCS file: /cvsroot/mozilla/suite/common/app-license.html,v done Checking in suite/common/app-license.html; /cvsroot/mozilla/suite/common/app-license.html,v <-- app-license.html initial revision: 1.1 done Enjoy your good old Foundation EULA line again :)
Status: ASSIGNED → RESOLVED
Last Resolved: 10 years ago
Resolution: --- → FIXED
You need to log in before you can comment on or make changes to this bug.