Commit 249a341a by Ruben Rodriguez

Abrowser: changes for v65

parent 6d22dac4
......@@ -246,3 +246,5 @@ pref("dom.push.enabled",false);
pref("services.settings.server", "");
pref("extensions.blocklist.url", "");
// Disable recommended extensions
pref("browser.newtabpage.activity-stream.asrouter.userprefs.cfr", false);
......@@ -22,6 +22,8 @@ VERSION=60
. ./config
patch -p1 < debian/patches/partially-revert-google-search-update.patch
patch -p1 < debian/patches/no-region-overrides-for-google-search.patch
rm debian/control
......@@ -97,12 +99,10 @@ find debian/searchplugins |grep amazon| xargs -i /bin/sed '/canoniccom/d;' -i {}
find |grep -e duckduckgo.xml -e ddg.xml | xargs -i /bin/sed 's/canonical/trisquel/' -i {}
# Make DuckDuckGo the default engine
rm debian/patches/no-region-overrides-for-google-search.patch
sed /no-region-overrides-for-google-search/d -i debian/patches/series
sed '/searchDefault/s/"Google",/"DuckDuckGo",/g' -i browser/components/search/searchplugins/list.json
sed 's/google/tempgoogletemp/g' -i browser/components/search/searchplugins/list.json
sed 's/ddg/google/g' -i browser/components/search/searchplugins/list.json
sed 's/tempgoogletemp/ddg/g' -i browser/components/search/searchplugins/list.json
rm debian/patches/no-region-overrides-for-google-search.patch debian/patches/partially-revert-google-search-update.patch
sed '/no-region-overrides-for-google-search/d; /partially-revert-google-search-update/d' -i debian/patches/series
sed '/searchDefault/s/: \".*\"/: "DuckDuckGo"/g' -i browser/components/search/searchplugins/list.json
sed '/visibleDefaultEngines/{n; s/"ddg",//; s/\"/"ddg", "/}' -i browser/components/search/searchplugins/list.json
# contact link
#sed 's_https://input.mozilla.org/feedback_https://trisquel.info/contact_' -i browser/base/content/utilityOverlay.js
......@@ -224,7 +224,7 @@ echo "#plugindeprecation-notice { display: none !important; }" >> toolkit/mozap
# Hide warnings on unsigned extensions
echo ".warning{display: none!important; } .addon[notification=warning]{background-image: none!important;}" >> toolkit/mozapps/extensions/content/extensions.css
# Hide extra links in about box
sed '/releaseNotes.link/d; /helpus/d' -i ./browser/base/content/aboutDialog.xul
sed '/releaseNotes.link/d; /label.helpus/d' -i ./browser/base/content/aboutDialog.xul
find -wholename '*/brand.dtd' |xargs /bin/sed 's/trademarkInfo.part1.*/trademarkInfo.part1 "">/' -i
......@@ -257,6 +257,51 @@ sed s/_temp_/AbrowserProfileMigrator/ -i browser/components/migration/moz.build
# js settings
cat $DATA/settings.js >> debian/vendor-abrowser.js
#################
# Android stuff #
#################
# Settings
cat << EOF >> mobile/android/confvars.sh
# Abrowser settings
MOZ_APP_BASENAME=Abrowser
MOZ_APP_VENDOR=Trisquel
MOZ_PAY=0
MOZ_SERVICES_HEALTHREPORT=0
MOZ_SERVICES_HEALTHREPORTER=0
MOZ_SERVICES_METRICS=0
MOZ_DATA_REPORTING=0
MOZ_DEVICES=0
MOZ_ANDROID_GOOGLE_PLAY_SERVICES=0
MOZ_TELEMETRY_REPORTING=0
MOZ_ADDON_SIGNING=0
EOF
sed '/SENDERID/d' -i mobile/android/app/mobile.js
# Fix locale
cat << EOF >> mobile/locales/en-US/chrome/region.properties
browser.search.defaultenginename=DuckDuckGo
browser.search.order.1=DuckDuckGo
browser.search.order.2=Google
browser.search.order.3=Yahoo
browser.suggestedsites.restricted_mozilla.url=https://www.trisquel.info
browser.suggestedsites.webmaker.title=GNU Project
browser.suggestedsites.webmaker.url=https://www.gnu.org
EOF
sed -i '/aboutPage.logoTrademark/d' \
mobile/android/locales/en-US/chrome/about.dtd
echo -e '\n<!ENTITY aboutPage.logoTrademark "">' >> \
mobile/android/locales/en-US/chrome/about.dtd
# Branding
rm mobile/android/branding/{official,unofficial,beta,nightly} -rf
cp -a $DATA/android/branding/ mobile/android/branding/official
cp $DATA/android/mobile.ico mobile/android/app/
cp $DATA/android/images/* mobile/android/themes/core/images/
cp -a $DATA/android/res/main/* mobile/android/app/src/main/res/
# Postinst script to manage profile migration and system links
echo '
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment