diff options
| -rwxr-xr-x | scripts/prep-librewolf-dpkg.sh | 147 |
1 files changed, 147 insertions, 0 deletions
diff --git a/scripts/prep-librewolf-dpkg.sh b/scripts/prep-librewolf-dpkg.sh index 30551b3..ed37853 100755 --- a/scripts/prep-librewolf-dpkg.sh +++ b/scripts/prep-librewolf-dpkg.sh @@ -219,6 +219,153 @@ index 3702402..f4a4315 100644 + with only_when(target_has_linux_kernel & compile_environment): option(env="MOZ_NO_PIE_COMPAT", help="Enable non-PIE wrapper") EOF + # added 109.0 to patch for debian 109.0 until defuzz-109.0 gets merged + test -n "1" && patch -p1 "${debian_dir}/patches/librewolf/librewolf-pref-pane.patch" <<'EOF' +diff --git a/patches/librewolf-pref-pane.patch b/patches/librewolf-pref-pane.patch +index b1ed478..4fcf94b 100644 +--- a/patches/librewolf-pref-pane.patch ++++ b/patches/librewolf-pref-pane.patch +@@ -23,8 +23,6 @@ fix xorigin pref init and handling + create mode 100644 browser/themes/shared/preferences/category-librewolf.svg + create mode 100644 browser/themes/shared/preferences/librewolf.css + +-diff --git a/browser/components/preferences/jar.mn b/browser/components/preferences/jar.mn +-index 2131a15ceef7..0b97dc14b42e 100644 + --- a/browser/components/preferences/jar.mn + +++ b/browser/components/preferences/jar.mn + @@ -11,6 +11,7 @@ browser.jar: +@@ -35,9 +33,6 @@ index 2131a15ceef7..0b97dc14b42e 100644 + content/browser/preferences/containers.js + content/browser/preferences/sync.js + content/browser/preferences/experimental.js +-diff --git a/browser/components/preferences/librewolf.inc.xhtml b/browser/components/preferences/librewolf.inc.xhtml +-new file mode 100644 +-index 000000000000..c2dfea6d0858 + --- /dev/null + +++ b/browser/components/preferences/librewolf.inc.xhtml + @@ -0,0 +1,254 @@ +@@ -295,9 +290,6 @@ index 000000000000..c2dfea6d0858 + +</groupbox> + + + +</html:template> +-diff --git a/browser/components/preferences/librewolf.js b/browser/components/preferences/librewolf.js +-new file mode 100644 +-index 000000000000..c8cbb075d59b + --- /dev/null + +++ b/browser/components/preferences/librewolf.js + @@ -0,0 +1,287 @@ +@@ -588,8 +580,6 @@ index 000000000000..c8cbb075d59b + + } + + }); + +}); +-diff --git a/browser/components/preferences/preferences.js b/browser/components/preferences/preferences.js +-index 19dda7cf39eb..f5e67b637b49 100644 + --- a/browser/components/preferences/preferences.js + +++ b/browser/components/preferences/preferences.js + @@ -8,6 +8,7 @@ +@@ -600,7 +590,7 @@ index 19dda7cf39eb..f5e67b637b49 100644 + /* import-globals-from sync.js */ + /* import-globals-from experimental.js */ + /* import-globals-from moreFromMozilla.js */ +-@@ -196,6 +197,7 @@ function init_all() { ++@@ -197,6 +198,7 @@ function init_all() { + register_module("paneHome", gHomePane); + register_module("paneSearch", gSearchPane); + register_module("panePrivacy", gPrivacyPane); +@@ -608,8 +598,6 @@ index 19dda7cf39eb..f5e67b637b49 100644 + register_module("paneContainers", gContainersPane); + if (Services.prefs.getBoolPref("browser.preferences.experimental")) { + // Set hidden based on previous load's hidden value. +-diff --git a/browser/components/preferences/preferences.xhtml b/browser/components/preferences/preferences.xhtml +-index 6ee14eec9b2e..a0d768dce307 100644 + --- a/browser/components/preferences/preferences.xhtml + +++ b/browser/components/preferences/preferences.xhtml + @@ -13,6 +13,7 @@ +@@ -620,7 +608,7 @@ index 6ee14eec9b2e..a0d768dce307 100644 + + <!DOCTYPE html> + +-@@ -129,6 +130,17 @@ ++@@ -130,6 +131,17 @@ + <label class="category-name" flex="1" data-l10n-id="pane-privacy-title"></label> + </richlistitem> + +@@ -638,7 +626,7 @@ index 6ee14eec9b2e..a0d768dce307 100644 + <richlistitem id="category-sync" + class="category" + hidden="true" +-@@ -207,6 +219,7 @@ ++@@ -208,6 +220,7 @@ + #include home.inc.xhtml + #include search.inc.xhtml + #include privacy.inc.xhtml +@@ -646,11 +634,9 @@ index 6ee14eec9b2e..a0d768dce307 100644 + #include containers.inc.xhtml + #include sync.inc.xhtml + #include experimental.inc.xhtml +-diff --git a/browser/locales/en-US/browser/preferences/preferences.ftl b/browser/locales/en-US/browser/preferences/preferences.ftl +-index a1e414697e71..8eeb594ca17d 100644 + --- a/browser/locales/en-US/browser/preferences/preferences.ftl + +++ b/browser/locales/en-US/browser/preferences/preferences.ftl +-@@ -1420,3 +1420,98 @@ httpsonly-radio-disabled = ++@@ -1432,3 +1432,98 @@ httpsonly-radio-disabled = + desktop-folder-name = Desktop + downloads-folder-name = Downloads + choose-download-folder-title = Choose Download Folder: +@@ -749,8 +735,6 @@ index a1e414697e71..8eeb594ca17d 100644 + +librewolf-footer = Useful links + +librewolf-config-link = All advanced settings (about:config) + +librewolf-open-profile = Open user profile directory +-diff --git a/browser/themes/shared/jar.inc.mn b/browser/themes/shared/jar.inc.mn +-index 146764d56081..52326c00bdfe 100644 + --- a/browser/themes/shared/jar.inc.mn + +++ b/browser/themes/shared/jar.inc.mn + @@ -108,6 +108,7 @@ +@@ -767,11 +751,8 @@ index 146764d56081..52326c00bdfe 100644 + skin/classic/browser/preferences/siteDataSettings.css (../shared/preferences/siteDataSettings.css) + + skin/classic/browser/preferences/librewolf.css (../shared/preferences/librewolf.css) + skin/classic/browser/spotlight.css (../shared/spotlight.css) +- skin/classic/browser/upgradeDialog/abstract.png (../shared/upgradeDialog/abstract.png) +- skin/classic/browser/upgradeDialog/cheers.png (../shared/upgradeDialog/cheers.png) +-diff --git a/browser/themes/shared/preferences/category-librewolf.svg b/browser/themes/shared/preferences/category-librewolf.svg +-new file mode 100644 +-index 000000000000..8ebf2ebe19a9 ++ skin/classic/browser/fxa/fxa-spinner.svg (../shared/fxa/fxa-spinner.svg) ++ skin/classic/browser/fxa/sync-illustration.svg (../shared/fxa/sync-illustration.svg) + --- /dev/null + +++ b/browser/themes/shared/preferences/category-librewolf.svg + @@ -0,0 +1,96 @@ +@@ -871,9 +852,6 @@ index 000000000000..8ebf2ebe19a9 + + </g> + +</svg> + + +-diff --git a/browser/themes/shared/preferences/librewolf.css b/browser/themes/shared/preferences/librewolf.css +-new file mode 100644 +-index 000000000000..12f926ab7018 + --- /dev/null + +++ b/browser/themes/shared/preferences/librewolf.css + @@ -0,0 +1,23 @@ +@@ -900,11 +878,9 @@ index 000000000000..12f926ab7018 + + -moz-context-properties: fill, fill-opacity; + + fill: currentColor; + +} +-diff --git a/browser/themes/shared/preferences/preferences.css b/browser/themes/shared/preferences/preferences.css +-index 1968b68a1245..d0da141868e2 100644 + --- a/browser/themes/shared/preferences/preferences.css + +++ b/browser/themes/shared/preferences/preferences.css +-@@ -206,6 +206,10 @@ checkbox { ++@@ -211,6 +211,10 @@ checkbox { + list-style-image: url("chrome://browser/skin/preferences/category-privacy-security.svg"); + } + +@@ -915,6 +891,3 @@ index 1968b68a1245..d0da141868e2 100644 + #category-sync > .category-icon { + list-style-image: url("chrome://browser/skin/preferences/category-sync.svg"); + } +--- +-2.37.3 +- +EOF # added 101.0.1 # ref: https://raw.githubusercontent.com/canonical/firefox-snap/5622734942524846fb0eb7108918c8cd8557fde3/patches/fix-ftbfs-newer-cbindgen.patch # ref: https://bugzilla.mozilla.org/show_bug.cgi?id=1773630 |