From 05320ef1857473528b9caa7d4d7260a66d3b52e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20Guzm=C3=A1n?= Date: Mon, 26 Aug 2024 04:12:05 +0000 Subject: [PATCH] firefox: 129.0.2 ; apply last patch before migrate to search-config-v2 --- .../DATA/firefox/tmp_favicons/ddg-html.ico | Bin 0 -> 2799 bytes helpers/DATA/firefox/tmp_favicons/ddg.ico | Bin 0 -> 2799 bytes helpers/DATA/firefox/tmp_favicons/ecosia.ico | Bin 0 -> 5430 bytes helpers/DATA/firefox/tmp_favicons/qwant.ico | Bin 0 -> 5430 bytes .../DATA/firefox/tmp_favicons/wikipedia.ico | Bin 0 -> 884 bytes ...re_favicons_on_old_search-engine_bar.patch | 153 ++++++++++++++++++ helpers/make-firefox | 32 +++- 7 files changed, 179 insertions(+), 6 deletions(-) create mode 100644 helpers/DATA/firefox/tmp_favicons/ddg-html.ico create mode 100644 helpers/DATA/firefox/tmp_favicons/ddg.ico create mode 100644 helpers/DATA/firefox/tmp_favicons/ecosia.ico create mode 100644 helpers/DATA/firefox/tmp_favicons/qwant.ico create mode 100644 helpers/DATA/firefox/tmp_favicons/wikipedia.ico create mode 100644 helpers/DATA/firefox/tmp_restore_favicons_on_old_search-engine_bar.patch diff --git a/helpers/DATA/firefox/tmp_favicons/ddg-html.ico b/helpers/DATA/firefox/tmp_favicons/ddg-html.ico new file mode 100644 index 0000000000000000000000000000000000000000..3ad20825c107dd0f0b544f840f3755d44cba8719 GIT binary patch literal 2799 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 BObGx0 literal 0 HcmV?d00001 diff --git a/helpers/DATA/firefox/tmp_favicons/ddg.ico b/helpers/DATA/firefox/tmp_favicons/ddg.ico new file mode 100644 index 0000000000000000000000000000000000000000..3ad20825c107dd0f0b544f840f3755d44cba8719 GIT binary patch literal 2799 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 BObGx0 literal 0 HcmV?d00001 diff --git a/helpers/DATA/firefox/tmp_favicons/ecosia.ico b/helpers/DATA/firefox/tmp_favicons/ecosia.ico new file mode 100644 index 0000000000000000000000000000000000000000..cc72d09d6d174c7054ab9590cf7fb8b28bbaf7fe GIT binary patch literal 5430 zcmc&&F>6#o5MB?#1T2D$km{;nBlr)rNs-1%P=A1$pP}ilP;6om5squLQxL_%s94B@ zSXe|G3z5TsxzoItduak;oo{dFxp|r0cYD4U4~E@0yEEVH%)FU>r_>46Qgd^P#5D&O!Z7o^Tv$vH z&6CPQ#_?65H$vXnKziV3QU2Z6_j>F1pdi;yE5k7o*{fGl5@kvh<)Ym#at{35lqyXHqj*_)Fa=ojO%+Ij7FyiS$1`prVr_?3DGvu zz9q~PvqpQc*QY0zKg{!aiuu;Ok_V|jP@0^LETTgE=?%y%Xe)#-g z;_dPIQg>18Tje_FKEq~@4-+XLXm7`}U)PKeyE<+h2K1f~54kGZ+yMSQFxdwCev8>y7I58_Q5s@zqa@9Ki3~yfA>N$kj~FJ?;8XCmt$+{ zFM2>#44S~_{$qO3@%P`nd=H{taMu@u+Rsn-YVQ3!+C2Cq*-$gSc>i+ZaHJm9cK@V% zb=mKHeje@p`-lyaUm|&x_iwhr-Ur24L}K#0Hu3jIVZ-=)6FKR{oC|0vxa&e@%`=lU*Nd-e*mP{W@7*V literal 0 HcmV?d00001 diff --git a/helpers/DATA/firefox/tmp_favicons/qwant.ico b/helpers/DATA/firefox/tmp_favicons/qwant.ico new file mode 100644 index 0000000000000000000000000000000000000000..d43d1d5aa63d57734c88dca8a89c47091a354dd3 GIT binary patch literal 5430 zcmc&&drXyO82{vc2L*vB;edds$wj#-f?T};g4|J|)GRQK%B(aMB`>)Y#nj9$Yqc)6 z)k^=UZ2psTwRKs!)s}PBGHg?8Ewu}vPru)L{5a>pcMgZ+l(RkizVn{S>!(WPjb*v=*796=6ZG*z#nQ8Xk-pFVS>XJ8 zV6jwBHHo{shj@5+h&IYyny1H0AJ*+-Hp%6#2H+IQhWW`7H#S%blcLo7)`~Pa_4r)K zWut?I7uJ8?won=};$*bHuiQC0K<*k7DB(f=(mHE`T-a47VynO9ENpVMt5FtZ#z{o5 zzjW1Q$PZg8Ea;=}qOfd+^)I$L1*B^o1NY&>wpaG-g3pKN*C9{U;tNQ8qcUBF~n$9t$}C z`4jV$t)84aMSAEXtTA@}ey&kg8^KovfQTMaIEz^kE1nc5IMrubislf-yNDc5Gu1zxN(oEZ?=4 z%X=;P@@P*)ZNG)&aaUtc^_3+#3c6NW;fV>Db~;50?fhwGs}BkVJhsV*}(0- zjo7+O-LM0(X>)z;c0Y-I@mAwsx33?uU5_=~zh8G$tNh!PJzko#;|I~=tnt!Wn<2fH z+GK5G*RiP+a=?-M^2FQIQ%1SD8xm_o^_BJM z(=~I9bGv=N7|X#t37vaU1O7lh{suijT6CDghz}2zq&r4SLPQ8CSP^SVC%XPll|98#MF;l7b<(R_gk5t zq+EnBjqRbTn=jFkaoDdw?V4XV*2&Yj15|I_aL`lgHa2>K=dqOqsy`vW=+MBS?-9YhvRu0Rf9em=A#=P!r6aE5s|-85FkALX_?R}9d1kYAxI=M~;N-lafa zAH;IzjegxA4uE|XHshSZdQ9EvKh^?Qb5I|02WK9}GG*WlwXxzp5Bwc6oPD}dYNnaQ+skZM%0eOzbBz9-PuAnM!b!M4n5l90rtv8c z_>kWo^l>TBlW|2X_C35GI_}JbNO>LkmvJx*Z0CAF;>U(i!9rq^Q@U5@#c^Y0ei zlVcASn&ZNmJ8H2pv4_`x)276*wr&3!Y-Qo?%sa71cK$HWKqEJQjr9CE!t?iL{yi{4 HA7cLx@5l?_ literal 0 HcmV?d00001 diff --git a/helpers/DATA/firefox/tmp_favicons/wikipedia.ico b/helpers/DATA/firefox/tmp_favicons/wikipedia.ico new file mode 100644 index 0000000000000000000000000000000000000000..4314071e24c026048339d5b466f4929db1f9ffc0 GIT binary patch literal 884 zcmZQzU}RuoP*4y6(ku+`7#SGU7#J7?1R(qbAYX)ufuS?N&z+Y`iVG;k>*?VV1f&%} zn1c;S7FSh$VPIg~>gnPb64Cm0`q{!G3OuczYPu`fLLW%2ILLZ|S@i;w?+&5+D;w38 z$QTtJ>A&$NZqDI%JnE7!AAeM-wx2QcZtwo{*4_IV|FIspepYTzeB*6K8NrX+a^K96 zzP9hZkBg5>PlqoLgT?bRE=M#~*&5XJHqQCHA^dq+(1L5XR90?{JDS=muc5%rZHv}pBDBvV)-FNtoIs=1&%$cvOF0Hw@mvtuf z1Wy&1xcB>ITc&wIQb~EC2Z9_Gl6%g+{GEN#GJW}cri__ug}-VkBqiUdV?0ohs@7oE zQ=FHjv9`&^y4r7b^3mlCk6!E()fHWHS@7?c9ZQ#RI=H;q8^7(zD&>^9&v(A*QEl*8 ze%5Svw4~RyI~#VrRBSkrE_$J1vzTyeiqbxo1>Ij*1tvOkOy^`=(0RHd?rA;8h0`|0 z+sxLqu{6AVP${MG+-6V0lP`M{S%VnT_f<$ae78~Z`@L(w*89JkOy@HxWL4jr#rs$L zu9S^FlB{QXxSR7x(mcFOSB(v4o4^+o&Qcx3Q&^>bP0l+c7FwgrIF0^rz||NK7@7~ATg*tY0BI@z%6uz`SU zz0W&^=PX&xr#T!w)Tea+5YW8zgH3U*_QbgB2Jf1y9~-I9*gv&pYvT5khq&0jn7-(L z#(Qgmie1E2_38hQB>YZfUvaFkWvf_d=)=1G%nWX{gOUG(|M z9R?C@jSLn%&VE^IS8hFLB^veGrgd57gE@zv7M*PHTP_^8KK$Bai=_Scr;A+AGjwBm z@cHMNt5bq_6a!ptY|B090IgDh A!2kdN literal 0 HcmV?d00001 diff --git a/helpers/DATA/firefox/tmp_restore_favicons_on_old_search-engine_bar.patch b/helpers/DATA/firefox/tmp_restore_favicons_on_old_search-engine_bar.patch new file mode 100644 index 0000000..cf5f9fe --- /dev/null +++ b/helpers/DATA/firefox/tmp_restore_favicons_on_old_search-engine_bar.patch @@ -0,0 +1,153 @@ +diff --git a/browser/components/search/extensions/ddg/manifest.json b/browser/components/search/extensions/ddg/manifest.json +index 104eee64..62c546b4 100644 +--- a/browser/components/search/extensions/ddg/manifest.json ++++ b/browser/components/search/extensions/ddg/manifest.json +@@ -2,19 +2,24 @@ + "name": "DuckDuckGo", + "description": "Search DuckDuckGo", + "manifest_version": 2, +- "version": "1.5", ++ "version": "1.4", + "browser_specific_settings": { + "gecko": { + "id": "ddg@search.mozilla.org" + } + }, + "hidden": true, ++ "icons": { ++ "16": "favicon.ico" ++ }, ++ "web_accessible_resources": ["favicon.ico"], + "chrome_settings_overrides": { + "search_provider": { + "keyword": ["@duckduckgo", "@ddg"], + "name": "DuckDuckGo", + "search_url": "https://duckduckgo.com/", +- "search_url_get_params": "t=ffab&q={searchTerms}", ++ "search_form": "https://duckduckgo.com/", ++ "search_url_get_params": "q={searchTerms}", + "suggest_url": "https://ac.duckduckgo.com/ac/", + "suggest_url_get_params": "q={searchTerms}&type=list" + } +diff --git a/browser/components/search/extensions/ddg-html/manifest.json b/browser/components/search/extensions/ddg-html/manifest.json +index b2deff22..0639b068 100644 +--- a/browser/components/search/extensions/ddg-html/manifest.json ++++ b/browser/components/search/extensions/ddg-html/manifest.json +@@ -2,19 +2,24 @@ + "name": "DuckDuckGo (HTML)", + "description": "Search DuckDuckGo (HTML)", + "manifest_version": 2, +- "version": "1.5", ++ "version": "1.4", + "browser_specific_settings": { + "gecko": { + "id": "ddg-html@search.mozilla.org" + } + }, + "hidden": true, ++ "icons": { ++ "16": "favicon.ico" ++ }, ++ "web_accessible_resources": ["favicon.ico"], + "chrome_settings_overrides": { + "search_provider": { + "keyword": ["@duckduckgo", "@ddg"], + "name": "DuckDuckGo (HTML)", + "search_url": "https://html.duckduckgo.com/html/", +- "search_url_get_params": "t=ffab&q={searchTerms}", ++ "search_form": "https://html.duckduckgo.com/html/", ++ "search_url_get_params": "q={searchTerms}", + "suggest_url": "https://ac.duckduckgo.com/ac/", + "suggest_url_get_params": "q={searchTerms}&type=list" + } +diff --git a/browser/components/search/extensions/ecosia/manifest.json b/browser/components/search/extensions/ecosia/manifest.json +index b5312409..74fc9aff 100644 +--- a/browser/components/search/extensions/ecosia/manifest.json ++++ b/browser/components/search/extensions/ecosia/manifest.json +@@ -2,17 +2,22 @@ + "name": "Ecosia", + "description": "Search Ecosia", + "manifest_version": 2, +- "version": "1.3", ++ "version": "1.2", + "browser_specific_settings": { + "gecko": { + "id": "ecosia@search.mozilla.org" + } + }, + "hidden": true, ++ "icons": { ++ "16": "favicon.ico" ++ }, ++ "web_accessible_resources": ["favicon.ico"], + "chrome_settings_overrides": { + "search_provider": { + "name": "Ecosia", + "search_url": "https://www.ecosia.org/search", ++ "search_form": "https://www.ecosia.org/", + "search_url_get_params": "tt=mzl&q={searchTerms}", + "suggest_url": "https://ac.ecosia.org/autocomplete", + "suggest_url_get_params": "type=list&q={searchTerms}" +diff --git a/browser/components/search/extensions/qwant/manifest.json b/browser/components/search/extensions/qwant/manifest.json +index 66338257..cceb5994 100644 +--- a/browser/components/search/extensions/qwant/manifest.json ++++ b/browser/components/search/extensions/qwant/manifest.json +@@ -1,13 +1,17 @@ + { + "name": "Qwant", + "manifest_version": 2, +- "version": "1.5", ++ "version": "1.4", + "browser_specific_settings": { + "gecko": { + "id": "qwant@search.mozilla.org" + } + }, + "hidden": true, ++ "icons": { ++ "16": "favicon.ico" ++ }, ++ "web_accessible_resources": ["favicon.ico"], + "chrome_settings_overrides": { + "search_provider": { + "keyword": "@qwant", +@@ -15,7 +19,8 @@ + "search_url": "https://www.qwant.com/", + "search_url_get_params": "client=brz-moz&q={searchTerms}", + "suggest_url": "https://api.qwant.com/api/suggest/", +- "suggest_url_get_params": "client=opensearch&q={searchTerms}" ++ "suggest_url_get_params": "client=opensearch&q={searchTerms}", ++ "search_form": "https://www.qwant.com/" + } + } + } +diff --git a/browser/components/search/extensions/wikipedia/manifest.json b/browser/components/search/extensions/wikipedia/manifest.json +index 03e00b69..696d98fa 100644 +--- a/browser/components/search/extensions/wikipedia/manifest.json ++++ b/browser/components/search/extensions/wikipedia/manifest.json +@@ -2,7 +2,7 @@ + "name": "__MSG_extensionName__", + "description": "__MSG_extensionDescription__", + "manifest_version": 2, +- "version": "1.4", ++ "version": "1.3", + "browser_specific_settings": { + "gecko": { + "id": "wikipedia@search.mozilla.org" +@@ -10,11 +10,16 @@ + }, + "hidden": true, + "default_locale": "en", ++ "icons": { ++ "16": "favicon.ico" ++ }, ++ "web_accessible_resources": ["favicon.ico"], + "chrome_settings_overrides": { + "search_provider": { + "keyword": "@wikipedia", + "name": "__MSG_extensionName__", + "search_url": "__MSG_searchUrl__", ++ "search_form": "__MSG_searchForm__", + "suggest_url": "__MSG_suggestUrl__", + "search_url_get_params": "__MSG_searchUrlGetParams__" + } diff --git a/helpers/make-firefox b/helpers/make-firefox index ea67ce1..2b3d2cd 100644 --- a/helpers/make-firefox +++ b/helpers/make-firefox @@ -19,12 +19,15 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -VERSION=112 +VERSION=113 EXTERNAL='deb-src http://ppa.launchpadcontent.net/mozillateam/ppa/ubuntu $UPSTREAM main' REPOKEY=9BDB3D89CE49EC21 . ./config +#SHA HASHES UPDATES +GLEAN_CONF_RS_INITIAL=$(sha256sum third_party/rust/glean/src/configuration.rs|awk '{print$1}') + rm debian/control # Disable remote settings antifeature. @@ -44,8 +47,8 @@ sed '/stories_endpoint/s/getpocket.cdn.mozilla.net/127.0.0.1/' -i $ActivityStrea sed '/stories_referrer/s/http.*/",/' -i $ActivityStream sed '/topics_endpoint/s/getpocket.cdn.mozilla.net/127.0.0.1/' -i $ActivityStream sed 's/preffedRegions.includes.geo. .. ..locales .. locales.includes.locale./false/' -i $ActivityStream -sed 's/Ubuntu, //' -i browser/components/newtab/css/activity-stream*.css -echo "#header-asrouter-container{display: none!important;}" >> browser/components/newtab/css/activity-stream-linux.css +#sed 's/Ubuntu, //' -i browser/components/newtab/css/activity-stream*.css +#echo "#header-asrouter-container{display: none!important;}" >> browser/components/newtab/css/activity-stream-linux.css #Disable «Sponsored tiles on the New Tab page» - firefox 92+94 sed '/"showSponsoredTopSites"/,/value/s/value: true/value: false/' -i $ActivityStream sed -i '/activity-stream.showSponsored/s|true|false|g' browser/app/profile/firefox.js @@ -110,10 +113,13 @@ echo 'pref("dom.security.unexpected_system_load_telemetry_enabled", false);' | t 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 +# Disable translataion popup +grep -rl browser.translations.automaticallyPopup modules/ | xargs -r sed -i '/browser.translations.automaticallyPopup/s|true|false|' # Update third_party/rust/glean/src/configuration.rs sha256sum at third_party/rust/glean/.cargo-checksum.json -sed_csum 27075b12236021c54d0c99427bcbd417933ca02545275604d3c13f32ca25af13 \ - f354c756cb723a386263a3ad4669a1d5cc743379c7c620b14f894f505cf83500 +GLEAN_CONF_RS_MODIFIED=$(sha256sum third_party/rust/glean/src/configuration.rs|awk '{print$1}') +sed_csum $GLEAN_CONF_RS_INITIAL \ + $GLEAN_CONF_RS_MODIFIED # Remove Google API key and calls sed '/Google API/,/google-api-keyfile/ d' debian/config/mozconfig.in -i @@ -277,7 +283,6 @@ cp browser/components/search/extensions/ddg browser/components/search/extensions sed 's|/duckduckgo.com/|/html.duckduckgo.com/html/|' -i browser/components/search/extensions/ddg-html/manifest.json sed 's|DuckDuckGo|DuckDuckGo (HTML)|' -i browser/components/search/extensions/ddg-html/manifest.json sed 's|ddg@|ddg-html@|' -i browser/components/search/extensions/ddg-html/manifest.json -patch_p1 $DATA/rollback_ddg_firefox_partnership_codes.patch # disable ads, disable redirect #sed '/search/s|q=|k1=-1\&kd=-1\&ko=1\&q=|' -i browser/components/search/extensions/ddg/manifest.json @@ -291,6 +296,13 @@ echo "Customizing search engines..." python3 $DATA/process-json-files.py . browser/components/extensions/schemas/ # Disable new search config 'til new one gets figured out (ref: https://hg.mozilla.org/mozilla-central/rev/bad743156b30) patch_Rp1 $DATA/firefox_permanently_enable_new_search_engine_config.patch +# Restore favicons on old search config. +patch_p1 $DATA/tmp_restore_favicons_on_old_search-engine_bar.patch +for i in ddg-html ddg ecosia qwant wikipedia +do + echo "> tmp restore of $i favicon" + cp $DATA/tmp_favicons/$i.ico browser/components/search/extensions/$i/favicon.ico +done cat << EOF > debian/distribution.ini [Global] @@ -351,6 +363,7 @@ s|Sign in to Firefox|Sign in to Sync|; s|Search addons.mozilla.org|Search|g; s|firefox.settings.services.mozilla.com|127.0.0.1|g; s|this-firefox|this-abrowser|g; +s|firefox-help|abrowser-help|g; " echo "Running batch replace operation" @@ -466,8 +479,15 @@ find browser/branding/ -name about-logo-private@2x.png | xargs -n1 cp $DATA/debu find browser/branding/ -name PrivateBrowsing_70.png | xargs -n1 cp $DATA/debug_brand/PrivateBrowsing_70.png find browser/branding/ -name PrivateBrowsing_150.png | xargs -n1 cp $DATA/debug_brand/PrivateBrowsing_150.png +# Replace/remove brand name on used view(s) to avoid branding issues. +sed -i '/firefoxview-brand-name/s|Firefox View|Abrowser View|' toolkit/locales/en-US/toolkit/branding/brandings.ftl +sed -i 's|= Firefox |= |' toolkit/locales/en-US/toolkit/branding/brandings.ftl + # Replace addons placeholder for the gnuzilla mozzarella. +OLD_WEB_DEV_URL="https://addons.mozilla.org/firefox/collections/mozilla/webdeveloper/" +WEB_DEV_URL="https://gnuzilla.gnu.org/mozzarella/category.php?id=web-development" find l10n/ -name aboutAddons.ftl | xargs -r sed -i '/.placeholder/s|addons.mozilla.org|gnuzilla.gnu.org|g' +sed -i "s|$OLD_WEB_DEV_URL|$WEB_DEV_URL|" devtools/client/menus.js #Fixes by patch on source, see DATA/firefox/patches for more info. for patch in $(ls -v ${DATA}/patch_changes/*.patch)