diff options
Diffstat (limited to 'scripts/prep-librewolf-dpkg.sh')
| -rwxr-xr-x | scripts/prep-librewolf-dpkg.sh | 503 |
1 files changed, 2 insertions, 501 deletions
diff --git a/scripts/prep-librewolf-dpkg.sh b/scripts/prep-librewolf-dpkg.sh index a1bc032..8477d0d 100755 --- a/scripts/prep-librewolf-dpkg.sh +++ b/scripts/prep-librewolf-dpkg.sh @@ -201,8 +201,8 @@ else awk -F'/' '{print "librewolf/"$NF}' "${git_source_dir}"/source/assets/patches.txt | \ sed -r -e 's@$@ -p1@' -e '/vpn-ad/d' >> "${debian_dir}/patches/series" #echo "librewolf/webrender_ffi.patch -p1" >> "${debian_dir}/patches/series" - # added 126.0 ; just defuzzing this patch - test -n "" && patch -p1 "${debian_dir}/patches/librewolf/encoding_rs.patch" < "${scripts_dir}/126.0_defuzz-encoding_rs.patch" + # added 128.0, just to defuzz this patch + test -n "1" && cp -pf "${scripts_dir}/128.0_disable-pocket.patch" "${debian_dir}/patches/librewolf/disable-pocket.patch" # added 120.0.1; just defuzzing this patch test -n "1" && patch -p1 "${debian_dir}/patches/librewolf/rust-gentoo-musl.patch" <<'EOF' --- a/librewolf/rust-gentoo-musl.patch 2023-12-05 09:05:23.029244795 -0500 @@ -221,505 +221,6 @@ else \ No newline at end of file + rustc_target = find_candidate(candidates) EOF - # added 115.0.2; just defuzzing this patch - test -n "" && patch -p1 "${debian_dir}/patches/librewolf/firefox-view.patch" <<'EOF' ---- a/patches/librewolf/firefox-view.patch 2023-07-13 15:01:06.444375138 -0400 -+++ b/patches/librewolf/firefox-view.patch 2023-07-13 15:36:54.116273640 -0400 -@@ -15,8 +15,10 @@ - # The tab pickup feature is hidden if Firefox Sync is disabled. It can also - # be forced to always be disabled by setting `librewolf.firefoxView.hideTabPickup` - # to `true`. ----- a/browser/base/content/navigator-toolbox.inc.xhtml --+++ b/browser/base/content/navigator-toolbox.inc.xhtml -+Index: librewolf_115.0.2/browser/base/content/navigator-toolbox.inc.xhtml -+=================================================================== -+--- librewolf_115.0.2.orig/browser/base/content/navigator-toolbox.inc.xhtml -++++ librewolf_115.0.2/browser/base/content/navigator-toolbox.inc.xhtml - @@ -41,16 +41,6 @@ - <hbox flex="1" align="end" class="toolbar-items"> - <toolbartabstop/> -@@ -33,8 +35,8 @@ - - - <tabs id="tabbrowser-tabs" - is="tabbrowser-tabs" -- flex="1" --@@ -707,6 +697,16 @@ -+ aria-multiselectable="true" -+@@ -723,6 +713,16 @@ - closemenu="none" - cui-areatype="toolbar" - data-l10n-id="navbar-library"/> -@@ -51,9 +53,11 @@ - </html:template> - </toolbox> - </box> ----- a/browser/components/customizableui/CustomizableUI.sys.mjs --+++ b/browser/components/customizableui/CustomizableUI.sys.mjs --@@ -289,7 +289,6 @@ var CustomizableUIInternal = { -+Index: librewolf_115.0.2/browser/components/customizableui/CustomizableUI.sys.mjs -+=================================================================== -+--- librewolf_115.0.2.orig/browser/components/customizableui/CustomizableUI.sys.mjs -++++ librewolf_115.0.2/browser/components/customizableui/CustomizableUI.sys.mjs -+@@ -282,7 +282,6 @@ var CustomizableUIInternal = { - { - type: CustomizableUI.TYPE_TOOLBAR, - defaultPlacements: [ -@@ -61,7 +65,7 @@ - "tabbrowser-tabs", - "new-tab-button", - "alltabs-button", --@@ -620,18 +619,6 @@ var CustomizableUIInternal = { -+@@ -611,18 +610,6 @@ var CustomizableUIInternal = { - } - } - -@@ -80,8 +84,10 @@ - // Unified Extensions addon button migration, which puts any browser action - // buttons in the overflow menu into the addons panel instead. - if (currentVersion < 19) { ----- a/browser/components/firefoxview/firefoxview.html --+++ b/browser/components/firefoxview/firefoxview.html -+Index: librewolf_115.0.2/browser/components/firefoxview/firefoxview.html -+=================================================================== -+--- librewolf_115.0.2.orig/browser/components/firefoxview/firefoxview.html -++++ librewolf_115.0.2/browser/components/firefoxview/firefoxview.html - @@ -62,6 +62,7 @@ - is="tab-pickup-container" - id="tab-pickup-container" -@@ -90,9 +96,11 @@ - > - <summary class="page-section-header"> - <span ----- a/browser/components/firefoxview/firefoxview.mjs --+++ b/browser/components/firefoxview/firefoxview.mjs --@@ -41,7 +41,26 @@ const launchFeatureTour = () => { -+Index: librewolf_115.0.2/browser/components/firefoxview/firefoxview.mjs -+=================================================================== -+--- librewolf_115.0.2.orig/browser/components/firefoxview/firefoxview.mjs -++++ librewolf_115.0.2/browser/components/firefoxview/firefoxview.mjs -+@@ -16,7 +16,26 @@ const launchFeatureTour = () => { - callout.showFeatureCallout(); - }; - -@@ -119,13 +127,14 @@ - Services.telemetry.setEventRecordingEnabled("firefoxview", true); - Services.telemetry.recordEvent("firefoxview", "entered", "firefoxview", null); - document.getElementById("recently-closed-tabs-container").onLoad(); ----- a/browser/components/newtab/lib/OnboardingMessageProvider.jsm --+++ b/browser/components/newtab/lib/OnboardingMessageProvider.jsm --@@ -92,57 +92,6 @@ const BASE_MESSAGES = () => [ -- }, -+Index: librewolf_115.0.2/browser/components/newtab/lib/OnboardingMessageProvider.jsm -+=================================================================== -+--- librewolf_115.0.2.orig/browser/components/newtab/lib/OnboardingMessageProvider.jsm -++++ librewolf_115.0.2/browser/components/newtab/lib/OnboardingMessageProvider.jsm -+@@ -78,57 +78,6 @@ const BASE_MESSAGES = () => [ - trigger: { id: "protectionsPanelOpen" }, - }, --- { -+ { - - id: "CFR_FIREFOX_VIEW", - - groups: ["cfr"], - - template: "cfr_doorhanger", -@@ -176,6 +185,7 @@ - - // Avoid breaking existing tests that close tabs for now. - - targeting: `!inMr2022Holdback && fxViewButtonAreaType != null && (currentDate|date - profileAgeCreated) / 86400000 >= 2 && tabsClosedCount >= 3 && 'browser.firefox-view.view-count'|preferenceValue == 0 && !'browser.newtabpage.activity-stream.asrouter.providers.cfr'|preferenceIsUserSet`, - - }, -- { -+- { - id: "FX_MR_106_UPGRADE", - template: "spotlight", -+ targeting: "true", -EOF - # added 115.0.2, updated 117.0; just defuzzing this patch - test -n "" && patch -p1 "${debian_dir}/patches/librewolf/stop-undesired-requests.patch" <<EOF ---- a/patches/librewolf/stop-undesired-requests.patch 2023-07-13 15:01:06.444375138 -0400 -+++ b/patches/librewolf/stop-undesired-requests.patch 2023-07-13 15:35:17.271195985 -0400 -@@ -1,8 +1,6 @@ --diff --git a/browser/components/newtab/data/content/activity-stream.bundle.js b/browser/components/newtab/data/content/activity-stream.bundle.js --index cb7c26e..b1a56e9 100644 - --- a/browser/components/newtab/data/content/activity-stream.bundle.js - +++ b/browser/components/newtab/data/content/activity-stream.bundle.js --@@ -1576,7 +1576,7 @@ class ASRouterAdminInner extends (external_React_default()).PureComponent { -+@@ -1787,7 +1787,7 @@ class ASRouterAdminInner extends (extern - label = /*#__PURE__*/external_React_default().createElement("span", null, "remote settings (", /*#__PURE__*/external_React_default().createElement("a", { - className: "providerUrl", - target: "_blank", -@@ -11,11 +9,9 @@ - rel: "noopener noreferrer" - }, "nimbus-desktop-experiments"), ")"); - } --diff --git a/services/settings/Utils.jsm b/services/settings/Utils.jsm --index 23d6bf1..4affc89 100644 - --- a/services/settings/Utils.sys.mjs - +++ b/services/settings/Utils.sys.mjs --@@ -51,6 +51,9 @@ ChromeUtils.defineLazyGetter(lazy, "isRunningTests", () => { -+@@ -51,6 +51,9 @@ ChromeUtils.defineLazyGetter(lazy, "isRu - // Overriding the server URL is normally disabled on Beta and Release channels, - // except under some conditions. - ChromeUtils.defineLazyGetter(lazy, "allowServerURLOverride", () => { -@@ -25,11 +21,9 @@ - if (!AppConstants.RELEASE_OR_BETA) { - // Always allow to override the server URL on Nightly/DevEdition. - return true; --diff --git a/toolkit/components/search/SearchUtils.sys.mjs b/toolkit/components/search/SearchUtils.sys.mjs --index a3100fa..c7bf03b 100644 - --- a/toolkit/components/search/SearchUtils.sys.mjs - +++ b/toolkit/components/search/SearchUtils.sys.mjs --@@ -157,9 +157,9 @@ var SearchUtils = { -+@@ -152,9 +152,9 @@ export var SearchUtils = { - - ENGINES_URLS: { - "prod-main": -@@ -39,5 +33,5 @@ - - "https://firefox.settings.services.mozilla.com/v1/buckets/main-preview/collections/search-config/records", - + "https://%.invalid", - "stage-main": -- "https://settings.stage.mozaws.net/v1/buckets/main/collections/search-config/records", -+ "https://firefox.settings.services.allizom.org/v1/buckets/main/collections/search-config/records", - "stage-preview": -EOF - # added 114.0, updated 123.0.1 - test -n "" && cat <<'EOF' > "${debian_dir}/patches/librewolf/hide-passwordmgr.patch" ---- a/browser/base/content/browser.js -+++ b/browser/base/content/browser.js -@@ -1807,6 +1807,13 @@ var gBrowserInit = { - )?.removeAttribute("key"); - } - -+ if (Services.prefs.getBoolPref("librewolf.hidePasswdmgr", false)) { -+ PanelMultiView.getViewNode( -+ document, -+ "appMenu-passwords-button" -+ )?.remove(); -+ } -+ - this._loadHandled = true; - }, - ---- a/browser/components/preferences/privacy.js -+++ b/browser/components/preferences/privacy.js -@@ -1203,6 +1203,10 @@ var gPrivacyPane = { - - this.initWebAuthn(); - -+ if (Services.prefs.getBoolPref("librewolf.hidePasswdmgr", false)) { -+ document.getElementById("passwordsGroup")?.remove(); -+ } -+ - // Notify observers that the UI is now ready - Services.obs.notifyObservers(window, "privacy-pane-loaded"); - }, -EOF - - # added 112.0.1, updated 117.0. Just for de-fuzzing librewolf patches - test -n "" && patch -p1 "${debian_dir}/patches/librewolf/firefox-view.patch" <<'EOF' -diff --git a/patches/ui-patches/firefox-view.patch b/patches/ui-patches/firefox-view.patch -index b32a6bf..07fd0ed 100644 ---- a/patches/ui-patches/firefox-view.patch -+++ b/patches/ui-patches/firefox-view.patch -@@ -15,10 +15,8 @@ - # The tab pickup feature is hidden if Firefox Sync is disabled. It can also - # be forced to always be disabled by setting `librewolf.firefoxView.hideTabPickup` - # to `true`. --Index: librewolf_115.0.2/browser/base/content/navigator-toolbox.inc.xhtml --=================================================================== ----- librewolf_115.0.2.orig/browser/base/content/navigator-toolbox.inc.xhtml --+++ librewolf_115.0.2/browser/base/content/navigator-toolbox.inc.xhtml -+--- a/browser/base/content/navigator-toolbox.inc.xhtml -++++ b/browser/base/content/navigator-toolbox.inc.xhtml - @@ -41,16 +41,6 @@ - <hbox flex="1" align="end" class="toolbar-items"> - <toolbartabstop/> -@@ -36,7 +34,7 @@ - <tabs id="tabbrowser-tabs" - is="tabbrowser-tabs" - aria-multiselectable="true" --@@ -723,6 +713,16 @@ -+@@ -714,6 +704,16 @@ - closemenu="none" - cui-areatype="toolbar" - data-l10n-id="navbar-library"/> -@@ -53,11 +51,9 @@ - </html:template> - </toolbox> - </box> --Index: librewolf_115.0.2/browser/components/customizableui/CustomizableUI.sys.mjs --=================================================================== ----- librewolf_115.0.2.orig/browser/components/customizableui/CustomizableUI.sys.mjs --+++ librewolf_115.0.2/browser/components/customizableui/CustomizableUI.sys.mjs --@@ -282,7 +282,6 @@ var CustomizableUIInternal = { -+--- a/browser/components/customizableui/CustomizableUI.sys.mjs -++++ b/browser/components/customizableui/CustomizableUI.sys.mjs -+@@ -279,7 +279,6 @@ var CustomizableUIInternal = { - { - type: CustomizableUI.TYPE_TOOLBAR, - defaultPlacements: [ -@@ -65,7 +61,7 @@ - "tabbrowser-tabs", - "new-tab-button", - "alltabs-button", --@@ -611,18 +610,6 @@ var CustomizableUIInternal = { -+@@ -608,18 +607,6 @@ var CustomizableUIInternal = { - } - } - -@@ -84,10 +80,8 @@ - // Unified Extensions addon button migration, which puts any browser action - // buttons in the overflow menu into the addons panel instead. - if (currentVersion < 19) { --Index: librewolf_115.0.2/browser/components/firefoxview/firefoxview.html --=================================================================== ----- librewolf_115.0.2.orig/browser/components/firefoxview/firefoxview.html --+++ librewolf_115.0.2/browser/components/firefoxview/firefoxview.html -+--- a/browser/components/firefoxview/firefoxview.html -++++ b/browser/components/firefoxview/firefoxview.html - @@ -62,6 +62,7 @@ - is="tab-pickup-container" - id="tab-pickup-container" -@@ -96,13 +90,11 @@ - > - <summary class="page-section-header"> - <span --Index: librewolf_115.0.2/browser/components/firefoxview/firefoxview.mjs --=================================================================== ----- librewolf_115.0.2.orig/browser/components/firefoxview/firefoxview.mjs --+++ librewolf_115.0.2/browser/components/firefoxview/firefoxview.mjs --@@ -16,7 +16,26 @@ const launchFeatureTour = () => { -- callout.showFeatureCallout(); -- }; -+--- a/browser/components/firefoxview/firefoxview.mjs -++++ b/browser/components/firefoxview/firefoxview.mjs -+@@ -2,7 +2,26 @@ -+ * License, v. 2.0. If a copy of the MPL was not distributed with this -+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - - +function onPrefChange() { - + document.getElementById("tab-pickup-container").hidden = -@@ -127,10 +119,8 @@ - Services.telemetry.setEventRecordingEnabled("firefoxview", true); - Services.telemetry.recordEvent("firefoxview", "entered", "firefoxview", null); - document.getElementById("recently-closed-tabs-container").onLoad(); --Index: librewolf_115.0.2/browser/components/newtab/lib/OnboardingMessageProvider.jsm --=================================================================== ----- librewolf_115.0.2.orig/browser/components/newtab/lib/OnboardingMessageProvider.jsm --+++ librewolf_115.0.2/browser/components/newtab/lib/OnboardingMessageProvider.jsm -+--- a/browser/components/newtab/lib/OnboardingMessageProvider.jsm -++++ b/browser/components/newtab/lib/OnboardingMessageProvider.jsm - @@ -78,57 +78,6 @@ const BASE_MESSAGES = () => [ - trigger: { id: "protectionsPanelOpen" }, - }, -EOF - # added 111.0, updated 128.0.1 - test -n "" && cat <<'EOF' > "${debian_dir}/patches/librewolf/disable-pocket.patch" ---- debian/patches/librewolf/disable-pocket.patch 2023-08-30 11:35:20.150917106 -0400 -+++ librewolf_128.0/debian/patches/librewolf/disable-pocket.patch 2024-07-16 11:24:38.940187876 -0400 -@@ -1,32 +1,26 @@ --diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js --index 43c84c3..4b4aad2 100644 - --- a/browser/base/content/browser.js - +++ b/browser/base/content/browser.js --@@ -5478,7 +5478,6 @@ var XULBrowserWindow = { -+@@ -3630,7 +3630,6 @@ var XULBrowserWindow = { - - SafeBrowsingNotificationBox.onLocationChange(aLocationURI); - - - SaveToPocket.onLocationChange(window); - - let originalURI; -- if ( --diff --git a/browser/components/BrowserGlue.jsm b/browser/components/BrowserGlue.sys.mjs --index b2479db..7670f08 100644 -+ if (aRequest instanceof Ci.nsIChannel) { - --- a/browser/components/BrowserGlue.sys.mjs - +++ b/browser/components/BrowserGlue.sys.mjs --@@ -1274,7 +1274,6 @@ BrowserGlue.prototype = { -+@@ -1500,7 +1500,6 @@ BrowserGlue.prototype = { - lazy.Normandy.init(); - } - - - lazy.SaveToPocket.init(); - -- AboutHomeStartupCache.init(); -+ lazy.ResetPBMPanel.init(); - --diff --git a/browser/components/moz.build b/browser/components/moz.build --index 3b2126e..32b7831 100644 - --- a/browser/components/moz.build - +++ b/browser/components/moz.build --@@ -44,7 +44,6 @@ DIRS += [ -+@@ -49,7 +49,6 @@ DIRS += [ - "originattributes", - "pagedata", - "places", -EOF - # added 109.0 to patch for debian 109.0 until defuzz-109.0 gets merged - test -n "" && patch -p1 "${debian_dir}/patches/librewolf/disable-data-reporting-at-compile-time.patch" <<'EOF' -diff --git a/patches/disable-data-reporting-at-compile-time.patch b/patches/disable-data-reporting-at-compile-time.patch -index 3702402..f4a4315 100644 ---- a/patches/disable-data-reporting-at-compile-time.patch -+++ b/patches/disable-data-reporting-at-compile-time.patch -@@ -1,5 +1,3 @@ --diff --git a/browser/moz.configure b/browser/moz.configure --index 8653bcb..935af40 100644 - --- a/browser/moz.configure - +++ b/browser/moz.configure - @@ -5,11 +5,11 @@ -@@ -14,5 +12,5 @@ index 8653bcb..935af40 100644 - -imply_option("MOZ_NORMANDY", True) - +imply_option("MOZ_NORMANDY", False) - -- with only_when(target_is_linux & compile_environment): -+ 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 "" && 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 |