Hi Maxim, Maxim Cournoyer <[email protected]> writes:
> The settings patches needed adjusting because of changes introduced in > <https://bugzilla.mozilla.org/show_bug.cgi?id=1893068>. > > * makeicecat: Update FFMINOR and SOURCEBALL_CHECKSUM. > Update patching for moved files on no longer existing patterns. > Do not set MOZ_APP_VENDOR/MOZ_APP_UA_NAME/MOZ_APP_PROFILE, as confvars, which > now > fails the build. Delete obsolete variables, or those already set to > the correct value in browser/moz.configure. > Do not patch (and break) translation data. > * data/patches/icecat-preferences.patch: Adjust for changes. > * data/patches/hide-firefox-view-button.patch: Update patch. > * data/patches/hide-submit-feedback-menu-item.patch: Likewise. > * data/patches/icecat-about-dialog.patch: Likewise. > * data/patches/moz-configure-changes.patch: Likewise. Set > MOZILLA_OFFICIAL to False by default, which disables telemetry. > * tools/process-json-files.py (SearchConfig) > (SearchConfigOverrides): Delete classes. > (processors): De-register them. > * data/patches/fix-install.patch: New file. > --- > Fixes the remaining issues: > > - Broken parameters page > - No event on 'IceCat Settings' menu > - Odd contextual menu Thank you very much, Maxim, for working to resolve these issues. This is a tremendous help. > One thing to note: the sync button is back, because setting > MOZ_SERVICES_SYNC to False breaks too many things. Yes, I've reached the same conclusion: that MOZ_SERVICES_SYNC will need to be enabled at compile time, at least for now. I might apply some additional patches to help compensate for this change. > In Guix a > policies.json file with 'DisableFirefoxAccounts: true' in it ensures > it's disabled; it could be nice if gnuzilla added such a policies.json > file in the install targets. Would you like to propose a patch to do this? Alternatively, at least in the short term, I might look into how to hard-disable this functionality in the source code. I'm a bit worried that the 'policies.json' approach might not be reliable, though perhaps that's due to my own ignorance. I want to make sure that sync is disabled by default regardless of the details of how IceCat is packaged. > +--- a/browser/base/content/aboutDialog.css 2025-08-26 21:26:43.618669160 > +0900 > ++++ b/browser/base/content/aboutDialog.css 2025-08-26 21:31:54.207067616 > +0900 > +@@ -32,10 +32,9 @@ > #rightBox { > background-image: url("chrome://branding/content/about-wordmark.svg"); > background-repeat: no-repeat; > @@ -19,6 +19,9 @@ > padding-top: 38px; > - margin-top: 20px; > + margin-top: 60px; > - } > - > + /* We don't want this box to contribute arbitrarily to the intrinsic size > of > + * the dialog, so set the width to a reasonable size, but let it flex to > take > + * all available space. */ > +--- a/browser/base/content/aboutDialog.css > ++++ b/browser/base/content/aboutDialog.css > #rightBox:-moz-locale-dir(rtl) { As I mentioned in my earlier email, the three lines above, which are the final three lines of 'icecat-about-dialog.patch' after your commit is applied, are extraneous garbage and should be removed. They duplicate the patch file header for "browser/base/content/aboutDialog.css", which had already been given earlier in the patch (see the top lines of the quoted excerpt above), and the duplicate file header is then followed by a single line of context, without the "@@" line with line numbers which should always precede every hunk, and with no actual changes. I repeat, these are useless garbage lines (although admittedly harmless) at the end of the patch. You casually dismissed this feedback before. Please just look carefully at the end of 'icecat-about-dialog.patch' after your commit is applied, and keep looking as long as needed until you understand what I'm saying. > diff --git a/data/patches/icecat-preferences.patch > b/data/patches/icecat-preferences.patch > index f8f00cd..5b3b24f 100644 > --- a/data/patches/icecat-preferences.patch > +++ b/data/patches/icecat-preferences.patch [...] Your changes to 'icecat-preferences.patch' are excellent, thank you! > diff --git a/makeicecat b/makeicecat > index fc0bb76..d7b75b2 100755 > --- a/makeicecat > +++ b/makeicecat [...] > @@ -606,15 +604,6 @@ apply_branding() > > # Custom legal about pages > find l10n -wholename '*/brand.ftl' | xargs /bin/sed 's/^trademarkInfo = > .*/trademarkInfo = The IceCat logo is Copyright 2008-2015 Free Software > Foundation, released under the terms of the GNU Lesser General Public > License, version 3 or any later version./' -i > - local string > - for string in rights-intro-point-2 rights-intro-point-3 > rights-intro-point-4 rights-intro-point-5 rights-intro-point-6 > rights-webservices rights-safebrowsing > - do > - find -name aboutRights.ftl | xargs sed -i "s/^${string}.*/${string} > = /" > - done > - for string in helpus community-2 community-exp > - do > - find -wholename '*/browser/aboutDialog.ftl' | xargs sed -i > "s/^${string}.*/${string} = /" > - done > cp "${DATADIR}"/aboutRights.xhtml toolkit/content/aboutRights.xhtml > cp "${DATADIR}"/aboutRights.xhtml > toolkit/content/aboutRights-unbranded.xhtml > sed -i 's|<a href="http://www\.mozilla\.org/";>Mozilla Project</a>|<a > href="http://www.gnu.org/";>GNU Project</a>|g' > browser/base/content/overrides/app-license.html You wrote earlier that these removals were needed to avoid breakage in the localization tool. However, the "About IceCat" dialog now includes the following text: "IceCat is designed by GNU, a global community working together to keep the Web open, public and accessible to all." These claims are false, so we'll need to remove this text. I'll look into it. Thanks again for this excellent work, Maxim! Warm regards, Mark
