firefox: fix build for 135 update
This commit is contained in:
Luis Guzmán
parent
6339fc4e6c
commit
6a45eb640a
3 changed files with 177 additions and 31 deletions
|
|
@ -1,3 +1,5 @@
|
||||||
|
# WIP - Help needed
|
||||||
|
|
||||||
URL customizations requires to comprehend the scope to handle the documentation for this
|
URL customizations requires to comprehend the scope to handle the documentation for this
|
||||||
and other projects heavily customizing and rebranding Firefox like Abrowser does.
|
and other projects heavily customizing and rebranding Firefox like Abrowser does.
|
||||||
|
|
||||||
|
|
@ -42,29 +44,33 @@ index a9e8501a..02328371 100644
|
||||||
</description>
|
</description>
|
||||||
<button id="trackingProtectionExceptions"
|
<button id="trackingProtectionExceptions"
|
||||||
is="highlightable-button"
|
is="highlightable-button"
|
||||||
@@ -374,10 +374,7 @@
|
#@@ -389,9 +386,10 @@
|
||||||
<vbox id="legacyDoNotTrackBox">
|
# class="tail-with-learn-more"
|
||||||
<label>
|
# preference="privacy.donottrackheader.enabled"
|
||||||
<label class="tail-with-learn-more" data-l10n-id="do-not-track-description" id="doNotTrackDesc"></label>
|
# data-l10n-id="do-not-track-description2" />
|
||||||
|
#- <html:a is="moz-support-link"
|
||||||
|
#- id="doNotTrackLearnMoreLink"
|
||||||
|
#- support-page="how-do-i-turn-do-not-track-feature" />
|
||||||
|
#+ <html:a id="doNotTrackLearnMoreLink"
|
||||||
|
#+ href="https://trisquel.info/en/wiki/abrowser-help"
|
||||||
|
#+ data-l10n-id="do-not-track-learn-more"
|
||||||
|
#+ target="_blank"/>
|
||||||
|
# </hbox>
|
||||||
|
# </vbox>
|
||||||
|
# </groupbox>
|
||||||
|
diff --git a/browser/components/preferences/privacy.inc.xhtml b/browser/components/preferences/privacy.inc.xhtml
|
||||||
|
index 205c0e01..029b9925 100644
|
||||||
|
--- a/browser/components/preferences/privacy.inc.xhtml
|
||||||
|
+++ b/browser/components/preferences/privacy.inc.xhtml
|
||||||
|
@@ -372,10 +372,7 @@
|
||||||
|
support-page="global-privacy-control" />
|
||||||
|
</hbox>
|
||||||
|
<hbox id="doNotTrackBox" flex="1" align="center" hidden="true">
|
||||||
- <html:a is="moz-support-link"
|
- <html:a is="moz-support-link"
|
||||||
- class="learnMore"
|
- id="doNotTrackRemoval"
|
||||||
- support-page="how-do-i-turn-do-not-track-feature"
|
- support-page="how-do-i-turn-do-not-track-feature"
|
||||||
- />
|
- data-l10n-id="do-not-track-removal" />
|
||||||
+ <html:a class="learnMore" href="https://trisquel.info/en/wiki/abrowser-help" target="_blank"/>
|
+ <html:a class="learnMore" href="https://trisquel.info/en/wiki/abrowser-help" target="_blank"/>
|
||||||
</label>
|
|
||||||
<radiogroup id="doNotTrackRadioGroup" aria-labelledby="doNotTrackDesc" preference="privacy.donottrackheader.enabled">
|
|
||||||
<radio value="true" data-l10n-id="do-not-track-option-always"/>
|
|
||||||
@@ -389,9 +386,10 @@
|
|
||||||
class="tail-with-learn-more"
|
|
||||||
preference="privacy.donottrackheader.enabled"
|
|
||||||
data-l10n-id="do-not-track-description2" />
|
|
||||||
- <html:a is="moz-support-link"
|
|
||||||
- id="doNotTrackLearnMoreLink"
|
|
||||||
- support-page="how-do-i-turn-do-not-track-feature" />
|
|
||||||
+ <html:a id="doNotTrackLearnMoreLink"
|
|
||||||
+ href="https://trisquel.info/en/wiki/abrowser-help"
|
|
||||||
+ data-l10n-id="do-not-track-learn-more"
|
|
||||||
+ target="_blank"/>
|
|
||||||
</hbox>
|
</hbox>
|
||||||
</vbox>
|
</vbox>
|
||||||
</groupbox>
|
</groupbox>
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,146 @@
|
||||||
|
diff --git a/toolkit/content/aboutRights.xhtml b/toolkit/content/aboutRights.xhtml
|
||||||
|
index 324b97f4..2416a16e 100644
|
||||||
|
--- a/toolkit/content/aboutRights.xhtml
|
||||||
|
+++ b/toolkit/content/aboutRights.xhtml
|
||||||
|
@@ -61,14 +61,6 @@
|
||||||
|
data-l10n-name="mozilla-privacy-policy-link"
|
||||||
|
></a>
|
||||||
|
</li>
|
||||||
|
- <li data-l10n-id="rights-intro-point-5">
|
||||||
|
- <a
|
||||||
|
- href="about:rights#webservices"
|
||||||
|
- id="showWebServices"
|
||||||
|
- data-l10n-name="mozilla-service-terms-link"
|
||||||
|
- ></a>
|
||||||
|
- </li>
|
||||||
|
- <li data-l10n-id="rights-intro-point-6"></li>
|
||||||
|
</ul>
|
||||||
|
|
||||||
|
<div id="webservices-container">
|
||||||
|
diff --git a/toolkit/content/aboutRights-unbranded.xhtml b/toolkit/content/aboutRights-unbranded.xhtml_
|
||||||
|
index 240b1195..50469282 100644
|
||||||
|
--- a/toolkit/content/aboutRights-unbranded.xhtml
|
||||||
|
+++ b/toolkit/content/aboutRights-unbranded.xhtml
|
||||||
|
@@ -39,14 +39,6 @@
|
||||||
|
<!-- Point 2 discusses Mozilla trademarks, and isn't needed when the build is unbranded.
|
||||||
|
- Point 4 discusses privacy policy, unbranded builds get a placeholder (for the vendor to replace)
|
||||||
|
- Point 5 discusses web service terms, unbranded builds gets a placeholder (for the vendor to replace) -->
|
||||||
|
- <li data-l10n-id="rights-intro-point-4-unbranded"></li>
|
||||||
|
- <li data-l10n-id="rights-intro-point-5-unbranded">
|
||||||
|
- <a
|
||||||
|
- href="about:rights#webservices"
|
||||||
|
- id="showWebServices"
|
||||||
|
- data-l10n-name="mozilla-website-services-link"
|
||||||
|
- ></a>
|
||||||
|
- </li>
|
||||||
|
</ul>
|
||||||
|
|
||||||
|
<div id="webservices-container">
|
||||||
|
diff --git a/toolkit/locales/en-US/toolkit/about/aboutRights.ftl b/toolkit/locales/en-US/toolkit/about/aboutRights.ftl
|
||||||
|
index 517e4232..93dea417 100644
|
||||||
|
--- a/toolkit/locales/en-US/toolkit/about/aboutRights.ftl
|
||||||
|
+++ b/toolkit/locales/en-US/toolkit/about/aboutRights.ftl
|
||||||
|
@@ -30,103 +30,3 @@ rights-intro-point-4 =
|
||||||
|
{ -vendor-short-name } through { -brand-short-name } is described in the
|
||||||
|
<a data-l10n-name="mozilla-privacy-policy-link">{ -brand-short-name }
|
||||||
|
Privacy Policy</a>.
|
||||||
|
-rights-intro-point-4-unbranded =
|
||||||
|
- Any applicable privacy policies for this product should be listed here.
|
||||||
|
-rights-intro-point-5 =
|
||||||
|
- Some { -brand-short-name } features make use of web-based information
|
||||||
|
- services, however, we cannot guarantee they are 100% accurate or
|
||||||
|
- error-free. More details, including information on how to disable the
|
||||||
|
- features that use these services, can be found in the
|
||||||
|
- <a data-l10n-name="mozilla-service-terms-link">service terms</a>.
|
||||||
|
-rights-intro-point-5-unbranded =
|
||||||
|
- If this product incorporates web services, any applicable service terms for
|
||||||
|
- the service(s) should be linked to the
|
||||||
|
- <a data-l10n-name="mozilla-website-services-link"> Website Services</a>
|
||||||
|
- section.
|
||||||
|
-rights-intro-point-6 =
|
||||||
|
- In order to play back certain types of video content, { -brand-short-name }
|
||||||
|
- downloads certain content decryption modules from third parties.
|
||||||
|
-rights-webservices-header = { -brand-full-name } Web-Based Information Services
|
||||||
|
-rights-webservices =
|
||||||
|
- { -brand-full-name } uses web-based information services (“Services”) to
|
||||||
|
- provide some of the features provided for your use with this binary version
|
||||||
|
- of { -brand-short-name } under the terms described below. If you do not
|
||||||
|
- want to use one or more of the Services or the terms below are
|
||||||
|
- unacceptable, you may disable the feature or Service(s). Instructions on
|
||||||
|
- how to disable a particular feature or Service may be found
|
||||||
|
- <a data-l10n-name="mozilla-disable-service-link">here</a>. Other features
|
||||||
|
- and Services can be disabled in the application preferences.
|
||||||
|
-rights-safebrowsing =
|
||||||
|
- <strong>SafeBrowsing: </strong>Disabling the Safe Browsing feature is not
|
||||||
|
- recommended as it may result in you going to unsafe sites. If you wish to
|
||||||
|
- disable the feature completely, follow these steps:
|
||||||
|
-rights-safebrowsing-term-1 = Open the application preferences
|
||||||
|
-rights-safebrowsing-term-2 = Select the Security selection
|
||||||
|
-rights-safebrowsing-term-3 =
|
||||||
|
- Uncheck the option to “{ enableSafeBrowsing-label }”
|
||||||
|
-enableSafeBrowsing-label = Block dangerous and deceptive content
|
||||||
|
-rights-safebrowsing-term-4 = Safe Browsing is now disabled
|
||||||
|
-rights-locationawarebrowsing =
|
||||||
|
- <strong>Location Aware Browsing: </strong>is always opt-in. No location
|
||||||
|
- information is ever sent without your permission. If you wish to disable
|
||||||
|
- the feature completely, follow these steps:
|
||||||
|
-rights-locationawarebrowsing-term-1 =
|
||||||
|
- In the URL bar, type <code>about:config</code>
|
||||||
|
-rights-locationawarebrowsing-term-2 = Type geo.enabled
|
||||||
|
-rights-locationawarebrowsing-term-3 =
|
||||||
|
- Double click on the geo.enabled preference
|
||||||
|
-rights-locationawarebrowsing-term-4 = Location-Aware Browsing is now disabled
|
||||||
|
-rights-webservices-unbranded =
|
||||||
|
- An overview of the website services the product incorporates, along with
|
||||||
|
- instructions on how to disable them, if applicable, should be included
|
||||||
|
- here.
|
||||||
|
-rights-webservices-term-unbranded =
|
||||||
|
- Any applicable service terms for this product should be listed here.
|
||||||
|
-rights-webservices-term-1 =
|
||||||
|
- { -vendor-short-name } and its contributors, licensors and partners work to
|
||||||
|
- provide the most accurate and up-to-date Services. However, we cannot
|
||||||
|
- guarantee that this information is comprehensive and error-free. For
|
||||||
|
- example, the Safe Browsing Service may not identify some risky sites and
|
||||||
|
- may identify some safe sites in error and the Location Aware Service all
|
||||||
|
- locations returned by our service providers are estimates only and neither
|
||||||
|
- we nor our service providers guarantee the accuracy of the locations
|
||||||
|
- provided.
|
||||||
|
-rights-webservices-term-2 =
|
||||||
|
- { -vendor-short-name } may discontinue or change the Services at its
|
||||||
|
- discretion.
|
||||||
|
-rights-webservices-term-3 =
|
||||||
|
- You are welcome to use these Services with the accompanying version of
|
||||||
|
- { -brand-short-name }, and { -vendor-short-name } grants you its rights to
|
||||||
|
- do so. { -vendor-short-name } and its licensors reserve all other rights in
|
||||||
|
- the Services. These terms are not intended to limit any rights granted
|
||||||
|
- under open source licenses applicable to { -brand-short-name } and to
|
||||||
|
- corresponding source code versions of { -brand-short-name }.
|
||||||
|
-rights-webservices-term-4 =
|
||||||
|
- <strong>The Services are provided “as-is.” { -vendor-short-name }, its
|
||||||
|
- contributors, licensors, and distributors, disclaim all warranties, whether
|
||||||
|
- express or implied, including without limitation, warranties that the
|
||||||
|
- Services are merchantable and fit for your particular purposes. You bear
|
||||||
|
- the entire risk as to selecting the Services for your purposes and as to
|
||||||
|
- the quality and performance of the Services. Some jurisdictions do not
|
||||||
|
- allow the exclusion or limitation of implied warranties, so this disclaimer
|
||||||
|
- may not apply to you.</strong>
|
||||||
|
-rights-webservices-term-5 =
|
||||||
|
- <strong>Except as required by law, { -vendor-short-name }, its
|
||||||
|
- contributors, licensors, and distributors will not be liable for any
|
||||||
|
- indirect, special, incidental, consequential, punitive, or exemplary
|
||||||
|
- damages arising out of or in any way relating to the use of
|
||||||
|
- { -brand-short-name } and the Services. The collective liability under
|
||||||
|
- these terms will not exceed $500 (five hundred dollars). Some jurisdictions
|
||||||
|
- do not allow the exclusion or limitation of certain damages, so this
|
||||||
|
- exclusion and limitation may not apply to you.</strong>
|
||||||
|
-rights-webservices-term-6 =
|
||||||
|
- { -vendor-short-name } may update these terms as necessary from time to
|
||||||
|
- time. These terms may not be modified or canceled without
|
||||||
|
- { -vendor-short-name }’s written agreement.
|
||||||
|
-rights-webservices-term-7 =
|
||||||
|
- These terms are governed by the laws of the state of California, U.S.A.,
|
||||||
|
- excluding its conflict of law provisions. If any portion of these terms is
|
||||||
|
- held to be invalid or unenforceable, the remaining portions will remain in
|
||||||
|
- full force and effect. In the event of a conflict between a translated
|
||||||
|
- version of these terms and the English language version, the English
|
||||||
|
- language version shall control.
|
||||||
|
|
@ -19,7 +19,7 @@
|
||||||
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
#
|
#
|
||||||
|
|
||||||
VERSION=119
|
VERSION=120
|
||||||
EXTERNAL='deb-src http://ppa.launchpadcontent.net/mozillateam/ppa/ubuntu $UPSTREAM main'
|
EXTERNAL='deb-src http://ppa.launchpadcontent.net/mozillateam/ppa/ubuntu $UPSTREAM main'
|
||||||
REPOKEY=9BDB3D89CE49EC21
|
REPOKEY=9BDB3D89CE49EC21
|
||||||
|
|
||||||
|
|
@ -322,15 +322,9 @@ echo ".warning{display: none!important; } .addon[notification=warning]{backgroun
|
||||||
## Hide extra links in about box
|
## Hide extra links in about box
|
||||||
#find -wholename '*/brand.dtd' |xargs /bin/sed 's/trademarkInfo.part1.*/trademarkInfo.part1 "">/' -i
|
#find -wholename '*/brand.dtd' |xargs /bin/sed 's/trademarkInfo.part1.*/trademarkInfo.part1 "">/' -i
|
||||||
|
|
||||||
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 -r sed -i "s/^$STRING.*/$STRING = /"
|
|
||||||
done
|
|
||||||
##Remove invalid policy for trisquel.
|
##Remove invalid policy for trisquel.
|
||||||
find -name aboutRights.ftl | xargs -r sed -i '/rights-intro-point-5/,$d'
|
# see more at DATA/firefox/patch_changes/008_aboutRights_removal_fix.patch
|
||||||
find -name aboutRights.xhtml |xargs -r sed -i "/rights-intro-point-5/,/<\/li>/d"
|
|
||||||
find -name aboutRights.xhtml |xargs -r sed -i "/rights-intro-point-6/,/<\/li>/d"
|
|
||||||
find -name aboutRights-unbranded.xhtml |xargs -r sed -i "/rights-intro-point-5/,/<\/li>/d"
|
|
||||||
#EO about: mods.
|
#EO about: mods.
|
||||||
|
|
||||||
sed -i 's|<a href="http://www.mozilla.org/">Mozilla Project</a>|<a href="http://www.trisquel.info/">Trisquel Project</a>|g' browser/base/content/overrides/app-license.html
|
sed -i 's|<a href="http://www.mozilla.org/">Mozilla Project</a>|<a href="http://www.trisquel.info/">Trisquel Project</a>|g' browser/base/content/overrides/app-license.html
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue