From 1895966545bd099263aa27c7af1aa5ebd83e44cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20Guzm=C3=A1n?= Date: Fri, 22 Jul 2022 17:40:42 +0000 Subject: [PATCH] firefox: fix build for firefox 103 --- .../Remove_moreFromMozilla_Focus_and_Klar.patch | 15 ++------------- helpers/make-firefox | 7 +++++-- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/helpers/DATA/firefox/patch_changes/Remove_moreFromMozilla_Focus_and_Klar.patch b/helpers/DATA/firefox/patch_changes/Remove_moreFromMozilla_Focus_and_Klar.patch index 9bb7f02..e43c482 100644 --- a/helpers/DATA/firefox/patch_changes/Remove_moreFromMozilla_Focus_and_Klar.patch +++ b/helpers/DATA/firefox/patch_changes/Remove_moreFromMozilla_Focus_and_Klar.patch @@ -32,12 +32,11 @@ diff -Nru source_orig/browser/app/profile/firefox.js source/browser/app/profile/ diff -Nru source_orig/browser/base/content/test/static/browser_all_files_referenced.js source/browser/base/content/test/static/browser_all_files_referenced.js --- source_orig/browser/base/content/test/static/browser_all_files_referenced.js 2022-05-22 09:35:55.336673325 +0000 +++ source/browser/base/content/test/static/browser_all_files_referenced.js 2022-05-22 21:50:33.783348501 +0000 -@@ -32,9 +32,6 @@ +@@ -32,8 +32,6 @@ "chrome://activity-stream/content/data/content/assets/remote/", "chrome://browser/content/assets/moz-vpn.svg", "chrome://browser/content/assets/vpn-logo.svg", - "chrome://browser/content/assets/focus-promo.png", -- "chrome://browser/content/preferences/more-from-mozilla-qr-code-advanced.svg", - "chrome://browser/content/assets/klar-qr-code.svg", // These app marketplace icons are referenced based on the user's locale @@ -381,24 +380,14 @@ diff -Nru source_orig/browser/components/newtab/lib/PanelTestProvider.jsm source diff -Nru source_orig/browser/components/preferences/jar.mn source/browser/components/preferences/jar.mn --- source_orig/browser/components/preferences/jar.mn 2022-05-22 09:35:55.400673986 +0000 +++ source/browser/components/preferences/jar.mn 2022-05-22 21:45:51.512354083 +0000 -@@ -18,8 +18,5 @@ +@@ -18,7 +18,5 @@ content/browser/preferences/fxaPairDevice.xhtml content/browser/preferences/fxaPairDevice.js content/browser/preferences/findInPage.js - content/browser/preferences/more-from-mozilla-qr-code-simple.svg - content/browser/preferences/more-from-mozilla-qr-code-simple-cn.svg -- content/browser/preferences/more-from-mozilla-qr-code-advanced.svg content/browser/preferences/web-appearance-dark.svg content/browser/preferences/web-appearance-light.svg -diff -Nru source_orig/browser/components/preferences/more-from-mozilla-qr-code-advanced.svg source/browser/components/preferences/more-from-mozilla-qr-code-advanced.svg ---- source_orig/browser/components/preferences/more-from-mozilla-qr-code-advanced.svg 2022-05-22 09:35:55.404674027 +0000 -+++ source/browser/components/preferences/more-from-mozilla-qr-code-advanced.svg 1970-01-01 00:00:00.000000000 +0000 -@@ -1,4 +0,0 @@ -- -- -\ No newline at end of file diff -Nru source_orig/browser/components/preferences/more-from-mozilla-qr-code-simple-cn.svg source/browser/components/preferences/more-from-mozilla-qr-code-simple-cn.svg --- source_orig/browser/components/preferences/more-from-mozilla-qr-code-simple-cn.svg 2022-05-22 09:35:55.400673986 +0000 +++ source/browser/components/preferences/more-from-mozilla-qr-code-simple-cn.svg 1970-01-01 00:00:00.000000000 +0000 diff --git a/helpers/make-firefox b/helpers/make-firefox index 38352de..84a96fd 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=91 +VERSION=92 EXTERNAL='deb-src https://ppa.launchpadcontent.net/mozillateam/ppa/ubuntu $UPSTREAM main' REPOKEY=9BDB3D89CE49EC21 @@ -92,6 +92,10 @@ ac_add_options --disable-eme %%endif ARCH +cat << SIGN >> debian/config/mozconfig.in +export MOZ_REQUIRE_SIGNING= +SIGN + sed '/gmp-clearkey/d' -i ./debian/firefox.install.in # Locale packages should provide firefox-locale-$LANG @@ -244,7 +248,6 @@ sed "s/^MOZ_PKG_NAME\t.*/MOZ_PKG_NAME\t\t:= abrowser/;" debian/build/config.mk ############################################################################3 ############################################################################3 ############################################################################3 -sed "s_^Maintainer.*_Maintainer: $DEBFULLNAME <$DEBEMAIL>_g" -i debian/control.in # Branding files cp -a $DATA/branding/* browser/branding/official