diff --git a/helpers/DATA/firefox/patch_changes/Remove_Andoir_and_iOS_promotion.patch b/helpers/DATA/firefox/patch_changes/Remove_Android_and_iOS_promotion.patch similarity index 63% rename from helpers/DATA/firefox/patch_changes/Remove_Andoir_and_iOS_promotion.patch rename to helpers/DATA/firefox/patch_changes/Remove_Android_and_iOS_promotion.patch index c90956af5c4352e8f22f833d5e94bc00e9b8e708..74524a772e95ef0ce5fccfea3310918b6499fcec 100644 --- a/helpers/DATA/firefox/patch_changes/Remove_Andoir_and_iOS_promotion.patch +++ b/helpers/DATA/firefox/patch_changes/Remove_Android_and_iOS_promotion.patch @@ -75,3 +75,52 @@ index 2417f1a641..698c48ccc3 100644 const vpnBanner = this.doc.querySelector(".vpn-banner"); const exitIcon = vpnBanner.querySelector(".exit-icon"); +diff --git a/browser/components/protections/content/protections.html b/browser/components/protections/content/protections.html +index 1374c30f..51796498 100644 +--- a/browser/components/protections/content/protections.html ++++ b/browser/components/protections/content/protections.html +@@ -291,44 +291,6 @@ + <div id="graph-total-summary"></div> + </div> + </div> +- <div id="mobile-hanger" class="card-body hidden"> +- <div class="body-wrapper"> +- <button +- class="exit-icon" +- data-l10n-id="protections-close-button2" +- ></button> +- <div id="etp-mobile-content"> +- <img +- class="mobile-app-icon" +- src="chrome://browser/content/logos/etp-mobile.svg" +- /> +- <span> +- <h2 class="card-title" data-l10n-id="mobile-app-title"></h2> +- <p class="content"> +- <span data-l10n-id="mobile-app-card-content"></span> +- <span +- target="_blank" +- id="mobile-app-links" +- data-l10n-id="mobile-app-links" +- > +- <a +- target="_blank" +- id="android-mobile-inline-link" +- data-l10n-name="android-mobile-inline-link" +- href="" +- ></a> +- <a +- target="_blank" +- id="ios-mobile-inline-link" +- data-l10n-name="ios-mobile-inline-link" +- href="" +- ></a> +- </span> +- </p> +- </span> +- </div> +- </div> +- </div> + </div> + <!-- Markup for Monitor card. --> + <section class="card card-no-hover monitor-card hidden"> diff --git a/helpers/DATA/firefox/patch_changes/sqlite-ppc.patch b/helpers/DATA/firefox/patch_changes/sqlite-ppc.patch new file mode 100644 index 0000000000000000000000000000000000000000..8135474455ca8fea108f21b6b9de553137323d7a --- /dev/null +++ b/helpers/DATA/firefox/patch_changes/sqlite-ppc.patch @@ -0,0 +1,53 @@ +Patch-Source: https://github.com/chimera-linux/cports/blob/0b7b1b1/contrib/firefox/patches/sqlite-ppc.patch +From 67157b1aa7da0a146b7d2d5abb9237eea1f434ec Mon Sep 17 00:00:00 2001 +From: Daniel Kolesa <daniel@octaforge.org> +Date: Fri, 23 Sep 2022 02:38:29 +0200 +Subject: [PATCH] fix sqlite3 on ppc with clang + +The __ppc__ macro is always defined on clang but not gcc, which +results in sqlite mistakenly thinking that ppc64le with clang +is big endian. + +Also disable some inline assembly stuff on ppc that is never used +with gcc and probably was never tested with modern machines. +--- + third_party/sqlite3/src/sqlite3.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/third_party/sqlite3/src/sqlite3.c b/third_party/sqlite3/src/sqlite3.c +index dd3b5c5..7339893 100644 +--- a/third_party/sqlite3/src/sqlite3.c ++++ b/third_party/sqlite3/src/sqlite3.c +@@ -14589,9 +14589,9 @@ typedef INT16_TYPE LogEst; + # if defined(i386) || defined(__i386__) || defined(_M_IX86) || \ + defined(__x86_64) || defined(__x86_64__) || defined(_M_X64) || \ + defined(_M_AMD64) || defined(_M_ARM) || defined(__x86) || \ +- defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) ++ defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) || defined(__LITTLE_ENDIAN__) + # define SQLITE_BYTEORDER 1234 +-# elif defined(sparc) || defined(__ppc__) || \ ++# elif defined(sparc) || defined(__BIG_ENDIAN__) || \ + defined(__ARMEB__) || defined(__AARCH64EB__) + # define SQLITE_BYTEORDER 4321 + # else +@@ -35670,7 +35670,7 @@ SQLITE_PRIVATE int sqlite3VListNameToNum(VList *pIn, const char *zName, int nNam + return (sqlite_uint64)hi << 32 | lo; + } + +-#elif !defined(__STRICT_ANSI__) && (defined(__GNUC__) && defined(__ppc__)) ++#elif 0 + + __inline__ sqlite_uint64 sqlite3Hwtime(void){ + unsigned long long retval; +@@ -203580,9 +203580,9 @@ struct RtreeMatchArg { + # if defined(i386) || defined(__i386__) || defined(_M_IX86) || \ + defined(__x86_64) || defined(__x86_64__) || defined(_M_X64) || \ + defined(_M_AMD64) || defined(_M_ARM) || defined(__x86) || \ +- defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) ++ defined(__ARMEL__) || defined(__AARCH64EL__) || defined(_M_ARM64) || defined(__LITTLE_ENDIAN__) + # define SQLITE_BYTEORDER 1234 +-# elif defined(sparc) || defined(__ppc__) || \ ++# elif defined(sparc) || defined(__BIG_ENDIAN__) || \ + defined(__ARMEB__) || defined(__AARCH64EB__) + # define SQLITE_BYTEORDER 4321 + # else diff --git a/helpers/make-firefox b/helpers/make-firefox index bfc56249c690e46cf6bbcb1eee27e3a56c0224c6..5dbe45c7ed3e669a1a99f1a1c4cca410a65af2ce 100644 --- a/helpers/make-firefox +++ b/helpers/make-firefox @@ -19,7 +19,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -VERSION=107 +VERSION=108 EXTERNAL='deb-src http://ppa.launchpadcontent.net/mozillateam/ppa/ubuntu $UPSTREAM main' REPOKEY=9BDB3D89CE49EC21 @@ -93,7 +93,7 @@ pref("datareporting.healthreport.uploadEnabled", false); pref("datareporting.healthreport.about.reportUrl", "https://trisquel.info/legal"); pref("datareporting.healthreport.infoURL", "https://trisquel.info/legal"); EOF -# Disable health report +# Replace privacy page sed 's%https://www.mozilla.org/legal/privacy/%https://trisquel.info/legal%' -i ./browser/app/profile/firefox.js ./toolkit/content/aboutRights.xhtml # Disable telemetry pings @@ -113,6 +113,8 @@ grep -rl services.sync.telemetry.maxPayloadCount modules/ | xargs -r sed -i '/se grep -rl services.sync.telemetry.submissionInterval modules/ | xargs -r sed -i '/services.sync.telemetry.submissionInterval/s|43200|-1|' echo 'pref("dom.security.unexpected_system_load_telemetry_enabled", false);' | tee -a browser/app/profile/firefox.js echo 'pref("toolkit.telemetry.hybridContent.enabled", false);' | tee -a browser/app/profile/firefox.js +# GPC opt-out entry added on 120 (not enabled yet). +echo '//pref("privacy.globalprivacycontrol.enabled", true);' | tee -a browser/app/profile/firefox.js sed_csum 186b9d92e48f2f34f1ea51023ad83c9d7abec97bcb0b862641bcb79a93c97d9e \ d4f87d174da21573a610f6cd206a910ad5204b65459405159269293f99f2cff5 @@ -408,6 +410,7 @@ find -name aboutRights-unbranded.xhtml |xargs -r sed -i "/rights-intro-point-5/, #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|https://firefox-source-docs.mozilla.org/contributing/contribution_quickref.html|https://gitlab.trisquel.org/trisquel/package-helpers|' toolkit/content/license.html # We went too far... #sed -i 's/iceweasel, abrowser, icecat,/iceweasel, firefox, icecat,/g' debian/control.in