From 1fb5aad1796596e6c875bfaf1eed71324a7d64df Mon Sep 17 00:00:00 2001 From: "B. Stack" Date: Wed, 25 May 2022 16:23:01 -0400 Subject: lw 100.0.2 dpkg rc1 --- librewolf/debian/bgstack15-librewolf-prefs.js | 121 ----------- librewolf/debian/browser.install.in | 3 +- librewolf/debian/browser.links.in | 1 - librewolf/debian/browser.mozconfig.in | 4 +- librewolf/debian/changelog | 38 +++- librewolf/debian/control | 10 +- librewolf/debian/control.in | 4 +- librewolf/debian/librewolf.dsc | 4 +- librewolf/debian/librewolf_settings/README.md | 10 +- .../librewolf_settings/distribution/policies.json | 2 +- .../debian/librewolf_settings/docs/Changelog.md | 93 +++++++- librewolf/debian/librewolf_settings/librewolf.cfg | 23 +- ...-preferences-directory-for-applications-p.patch | 6 +- ...-sessionstore-data-to-keep-windows-out-of.patch | 16 +- .../debian-hacks/Relax-MSRV-to-1.56.0.patch | 32 +-- ...illa-Location-Service-key-when-the-Google.patch | 4 +- ...reference-files-to-set-locked-prefs-with-.patch | 2 +- ...-Add-webrtc-configs-for-arm-and-ppc64-lin.patch | 60 +++--- ...-part-1-Work-around-a-GCC-issue-with-gene.patch | 235 --------------------- .../debian/patches/librewolf/aboutLogos.patch | 17 ++ .../patches/librewolf/bootstrap-without-vcs.patch | 125 +++++++++++ .../patches/librewolf/bootstrap-without-vcs2.patch | 69 ------ .../debian/patches/librewolf/context-menu.patch | 25 +-- librewolf/debian/patches/librewolf/handlers.patch | 232 ++++++++++++++++++++ .../patches/librewolf/hide-default-browser.patch | 8 +- .../patches/librewolf/hide-passwordmgr.patch | 29 +++ .../patches/librewolf/librewolf-pref-pane.patch | 180 +++++++++++----- .../patches/librewolf/lw-logo-devtools.patch | 37 ++++ .../debian/patches/librewolf/pref-naming.patch | 14 +- .../debian/patches/librewolf/remap-links.patch | 156 ++++++++++++++ .../patches/librewolf/remove_addons.patch.orig | 0 .../patches/librewolf/remove_addons.patch.rej | 12 ++ .../librewolf/stop-undesired-requests.patch | 40 ++-- .../librewolf/website-appearance-ui-rfp.patch | 52 +++++ ...S-Fix-FTBFS-on-Hurd-because-of-MAXPATHLEN.patch | 2 +- ...-disable-extensions-in-system-directories.patch | 2 +- .../patches/prefs/Set-DPI-to-system-settings.patch | 26 +-- librewolf/debian/patches/series | 11 +- librewolf/debian/rules | 2 +- librewolf/debian/source/include-binaries | 3 + librewolf/debian/uBlock0@raymondhill.net.xpi | Bin 2961920 -> 3021270 bytes 41 files changed, 1061 insertions(+), 649 deletions(-) delete mode 100644 librewolf/debian/bgstack15-librewolf-prefs.js delete mode 100644 librewolf/debian/patches/fixes/Bug-1756347-part-1-Work-around-a-GCC-issue-with-gene.patch create mode 100644 librewolf/debian/patches/librewolf/aboutLogos.patch create mode 100644 librewolf/debian/patches/librewolf/bootstrap-without-vcs.patch delete mode 100644 librewolf/debian/patches/librewolf/bootstrap-without-vcs2.patch create mode 100644 librewolf/debian/patches/librewolf/handlers.patch create mode 100644 librewolf/debian/patches/librewolf/hide-passwordmgr.patch create mode 100644 librewolf/debian/patches/librewolf/lw-logo-devtools.patch create mode 100644 librewolf/debian/patches/librewolf/remap-links.patch create mode 100644 librewolf/debian/patches/librewolf/remove_addons.patch.orig create mode 100644 librewolf/debian/patches/librewolf/remove_addons.patch.rej create mode 100644 librewolf/debian/patches/librewolf/website-appearance-ui-rfp.patch (limited to 'librewolf/debian') diff --git a/librewolf/debian/bgstack15-librewolf-prefs.js b/librewolf/debian/bgstack15-librewolf-prefs.js deleted file mode 100644 index cf38fb2..0000000 --- a/librewolf/debian/bgstack15-librewolf-prefs.js +++ /dev/null @@ -1,121 +0,0 @@ -// file: /usr/lib/librewolf/browser/defaults/preferences/bgstack15-newmoon-prefs.js -// deployed with librewolf (stackrpms) package (rpm or dpkg) built by bgstack15 -// last modified 2022-01-08 -// reference: -// https://support.mozilla.org/en-US/kb/customizing-firefox-using-autoconfig -// vm2 librewolf user profile prefs.js -pref("browser.allTabs.previews", false); -pref("browser.backspace_action", 0); -pref("browser.ctrlTab.previews", false); -pref("browser.ctrlTab.recentlyUsedOrder", false); -pref("browser.ctrlTab.migrated", true); -pref("browser.engagement.ctrlTab.has-used", true); -pref("browser.uidensity", 1); -pref("browser.download.useDownloadDir", true); -pref("browser.newtabpage.activity-stream.migrationExpired", true); -pref("browser.newtabpage.activity-stream.prerender", false); -pref("browser.newtabpage.activity-stream.showSearch", false); -pref("browser.newtabpage.activity-stream.showTopSites", false); -pref("browser.newtabpage.directory.ping", "http://127.0.0.1:9999/"); -pref("browser.newtabpage.directory.source", "http://127.0.0.1:9999/"); -pref("browser.newtabpage.enabled", false); -pref("browser.newtabpage.enhanced", false); -pref("browser.newtab.choice", 1); -pref("browser.newtabpage.storageVersion", 1); -pref("browser.newtabpage.directory.ping", "http://127.0.0.1:9999/"); -pref("browser.newtabpage.directory.source", "http://127.0.0.1:9999/"); -pref("browser.search.update", false); -pref("browser.sessionstore.restore_on_demand", false); -pref("browser.startup.page", 3); -pref("browser.tabs.closeWindowWithLastTab", false); -// These two have to stay undefined in Firefox 77+ in order for the drop-down for autocompletion to still work. -//pref("browser.urlbar.disableExtendForTests", true); -//pref("browser.urlbar.maxRichResults", 0); -pref("browser.urlbar.trimURLs", false); -pref("browser.urlbar.update1", false); -pref("browser.xul.error_pages.enabled", false); -pref("camera.control.face_detection.enabled", false); -pref("canvas.filters.enabled", false); -pref("canvas.focusring.enabled", false); -pref("canvas.path.enabled", false); -pref("captivedetect.canonicalURL", "http://127.0.0.1:9980"); -pref("devtools.devedition.promo.url", "http://127.0.0.1:9999/"); -pref("dom.event.clipboardevents.enabled", false); -pref("experiments.manifest.uri", "http://127.0.0.1:9999/"); -pref("extensions.enabledAddons", "%7B972ce4c6-7e08-4474-a285-3208198ce6fd%7D:28.3.0"); -pref("extensions.blocklist.detailsURL", "http://127.0.0.1:9999/"); -pref("extensions.blocklist.itemURL", "http://127.0.0.1:9999/"); -pref("extensions.pocket.api", "localhost:9999"); -pref("extensions.pocket.site", "localhost:9999"); -pref("extensions.shownSelectionUI", true); -pref("extensions.update.autoUpdateDefault", false); -pref("general.warnOnAboutConfig", false); -pref("media.videocontrols.picture-in-picture.allow-multiple", false); -pref("media.videocontrols.picture-in-picture.enabled", false); -pref("media.videocontrols.picture-in-picture.video-toggle.has-used", true); -pref("network.automatic-ntlm-auth.trusted-uris", ".ipa.smith122.com"); -pref("network.cookie.prefsMigrated", true); -pref("network.http.spdy.enabled", false); -pref("network.negotiate-auth.trusted-uris", ".ipa.smith122.com"); -pref("network.stricttransportsecurity.preloadlist", false); -pref("privacy.sanitize.migrateFx3Prefs", true); -pref("pref.privacy.disable_button.cookie_exceptions", false); -pref("pref.privacy.disable_button.view_passwords", false); -pref("privacy.annotate_channels.strict_list.enabled", true); -pref("privacy.donottrackheader.enabled", true); -pref("privacy.partition.network_state.ocsp_cache", true); -pref("privacy.purge_trackers.date_in_cookie_database", "0"); -pref("privacy.purge_trackers.last_purge", "1641399136538"); -pref("privacy.resistFingerprinting", false); -pref("privacy.resistFingerprinting.autoDeclineNoUserInputCanvasPrompts", false); -pref("privacy.sanitize.pending", "[{\"id\":\"newtab-container\",\"itemsToClear\":[],\"options\":{}}]"); -pref("privacy.sanitize.sanitizeOnShutdown", false); -pref("privacy.trackingprotection.enabled", true); -pref("privacy.trackingprotection.socialtracking.enabled", true); -pref("reader.parse-on-load.enabled", false); -pref("security.cert_pinning.enforcement_level", 0); -pref("services.sync.declinedEngines", ""); -pref("services.sync.serverURL", "http://127.0.0.1:9999/"); -pref("services.sync.tabs.lastSync", "0"); -pref("services.sync.tabs.lastSyncLocal", "0"); -pref("signon.autofillForms", true); -pref("signon.importedFromSqlite", true); -pref("signon.rememberSignons", true); -pref("startup.homepage_welcome_url", "http://127.0.0.1:9999/"); -pref("browser.startup.homepage", "https://start.duckduckgo.com/"); -pref("startup.homepage_override_url", ""); -pref("toolkit.telemetry.reportingpolicy.firstRun", false); -pref("xpinstall.whitelist.add", ""); -// Control DNS over HTTPS (DoH) and Trusted Recursive Resolver (TRR). -// More about DoH: https://github.com/bambenek/block-doh -// https://blog.nightly.mozilla.org/2018/06/01/improving-dns-privacy-in-firefox/ -// https://support.mozilla.org/en-US/kb/configuring-networks-disable-dns-over-https -// https://wiki.mozilla.org/Trusted_Recursive_Resolver -// 0: Off by default, 1: Firefox chooses faster, 2: TRR default w/DNS fallback, -// 3: TRR only mode, 4: Use DNS and shadow TRR for timings, 5: Disabled. -pref("network.trr.mode", 0); -pref("extensions.pocket.enabled", false); -pref("extensions.pocket.api", "http://localhost:9980"); -pref("extensions.pocket.site", "http://localhost:9980"); -// show menu -pref("ui.key.menuAccessKeyFocuses", false); -pref("browser.uiCustomization.state", "{\"placements\":{\"widget-overflow-fixed-list\":[],\"nav-bar\":[\"back-button\",\"forward-button\",\"stop-reload-button\",\"urlbar-container\",\"save-to-pocket-button\",\"downloads-button\",\"fxa-toolbar-menu-button\",\"ublock0_raymondhill_net-browser-action\"],\"toolbar-menubar\":[\"menubar-items\"],\"TabsToolbar\":[\"tabbrowser-tabs\",\"new-tab-button\",\"alltabs-button\"],\"PersonalToolbar\":[\"personal-bookmarks\"]},\"seen\":[\"developer-button\",\"ublock0_raymondhill_net-browser-action\"],\"dirtyAreaCache\":[\"nav-bar\",\"PersonalToolbar\",\"toolbar-menubar\",\"TabsToolbar\"],\"currentVersion\":17,\"newElementCount\":3}"); -pref("bgstack15-librewolf-prefs.js.version", "20220108.140650"); -pref("browser.startup.page", 3); -pref("privacy.userContext.enabled", false); -pref("browser.download.useDownloadDir", true); -pref("media.videocontrols.picture-in-picture.video-toggle.enabled", false); -pref("browser.urlbar.placeholderName", "DuckDuckGo"); -pref("browser.urlbar.placeholderName.private", "DuckDuckGo"); -pref("browser.formfill.enable", true); -pref("dom.security.https_only_mode", false); -pref("network.cookie.lifetimePolicy", 0); -pref("places.history.enabled", true); -pref("privacy.sanitize.pending", "[{\"id\":\"newtab-container\",\"itemsToClear\":[],\"options\":{}},{\"id\":\"newtab-container\",\"itemsToClear\":[],\"options\":{}}]"); -pref("privacy.sanitize.sanitizeOnShutdown", false); -pref("signon.autofillForms", true); -pref("signon.rememberSignons", true); -pref("browser.toolbars.bookmarks.visibility", "always"); -pref("browser.compactmode.show", true); -pref("extensions.webextensions.ExtensionStorageIDB.migrated.uBlock0@raymondhill.net", true); -pref("extensions.webextensions.uuids", "{\"formautofill@mozilla.org\":\"932d9ca1-4ab4-4176-908a-775a8c5c232b\",\"pictureinpicture@mozilla.org\":\"d20931db-dda1-4902-85fd-c324857cc611\",\"proxy-failover@mozilla.com\":\"9511d4e1-5bce-4214-90ba-cf9004a1896a\",\"screenshots@mozilla.org\":\"74a504ec-3b68-40db-b8de-213e87ec1f0d\",\"default-theme@mozilla.org\":\"e2607c67-dc48-4ce0-99c9-9422500c5397\",\"addons-search-detection@mozilla.com\":\"00ce34b6-f943-4060-970e-7ab093b1263f\",\"wikipedia@search.mozilla.org\":\"fd8e14ab-a33d-4393-8023-6a8a34382417\",\"ddg@search.mozilla.org\":\"e810f6e1-24e9-4e11-9a36-3be0691aef77\",\"uBlock0@raymondhill.net\":\"44aaf03a-52f1-402c-9300-d41904ab3746\"}"); diff --git a/librewolf/debian/browser.install.in b/librewolf/debian/browser.install.in index f77a234..d2b7944 100644 --- a/librewolf/debian/browser.install.in +++ b/librewolf/debian/browser.install.in @@ -75,9 +75,8 @@ usr/lib/@browser@/fonts/TwemojiMozilla.ttf usr/lib/@browser@/pingsender debian/@browser@-symbolic.svg usr/share/icons/hicolor/symbolic/apps - debian/librewolf_settings/@browser@.cfg usr/share/@browser@ debian/librewolf_settings/defaults/pref/local-settings.js usr/share/@browser@/defaults/pref debian/librewolf_settings/distribution/policies.json usr/share/@browser@/distribution -debian/bgstack15-librewolf-prefs.js usr/lib/@browser@/defaults/pref debian/uBlock0@raymondhill.net.xpi usr/lib/@browser@/browser/extensions +debian/bgstack15-librewolf-prefs.js usr/lib/@browser@/defaults/pref diff --git a/librewolf/debian/browser.links.in b/librewolf/debian/browser.links.in index f75bb6b..04ad826 100644 --- a/librewolf/debian/browser.links.in +++ b/librewolf/debian/browser.links.in @@ -11,7 +11,6 @@ /usr/share/@browser@/browser/defaults /usr/lib/@browser@/browser/defaults - /usr/share/distribution/policies.json usr/lib/@browser@/distribution/policies.json /usr/share/@browser@/defaults/pref/local-settings.js usr/lib/@browser@/defaults/pref/local-settings.js /usr/share/@browser@/@browser@.cfg /usr/lib/@browser@/@browser@.cfg diff --git a/librewolf/debian/browser.mozconfig.in b/librewolf/debian/browser.mozconfig.in index 22ba73f..e240c73 100644 --- a/librewolf/debian/browser.mozconfig.in +++ b/librewolf/debian/browser.mozconfig.in @@ -67,8 +67,6 @@ mk_add_options MOZ_TELEMETRY_REPORTING=0 #export RANLIB=llvm-ranlib-11 ac_add_options --enable-optimize -# Devuan style +# Stackrpms style ac_add_options --disable-dbus -ac_add_options --disable-pulseaudio -ac_add_options --enable-alsa ac_add_options --disable-necko-wifi diff --git a/librewolf/debian/changelog b/librewolf/debian/changelog index 561a836..bf3a220 100644 --- a/librewolf/debian/changelog +++ b/librewolf/debian/changelog @@ -1,14 +1,42 @@ -librewolf (98.0-2+stackrpms) obs; urgency=low +librewolf (100.0.2-1+stackrpms) obs; urgency=low - * Fork to librewolf release + * Custom build for myself - -- B. Stack Wed, 30 Mar 2022 13:55:33 -0400 + -- B. Stack Wed, 25 May 2022 16:16:08 -0400 -librewolf (98.0-2) unstable; urgency=low +librewolf (100.0.2-1) unstable; urgency=low * Fork to librewolf release - -- B. Stack Tue, 22 Mar 2022 19:01:42 -0400 + -- B. Stack Mon, 23 May 2022 12:23:10 -0400 + +firefox (100.0.2-1) unstable; urgency=medium + + * New upstream release. + * Fixes for mfsa2022-19, also known as CVE-2022-1802 and CVE-2022-1529. + + -- Mike Hommey Sat, 21 May 2022 07:32:04 +0900 + +firefox (100.0-1) unstable; urgency=medium + + * New upstream release. + * Fixes for mfsa2022-16, also known as: + CVE-2022-29914, CVE-2022-29909, CVE-2022-29916, CVE-2022-29911, + CVE-2022-29912, CVE-2022-29915, CVE-2022-29917, CVE-2022-29918. + + -- Mike Hommey Wed, 04 May 2022 08:48:41 +0900 + +firefox (99.0-1) unstable; urgency=medium + + * New upstream release. + * Fixes for mfsa2022-13, also known as: + CVE-2022-1097, CVE-2022-28281, CVE-2022-28282, CVE-2022-28283, + CVE-2022-28284, CVE-2022-28285, CVE-2022-28286, CVE-2022-28287, + CVE-2022-24713, CVE-2022-28289, CVE-2022-28288. + + * debian/control*: Bump nss build dependency. + + -- Mike Hommey Wed, 06 Apr 2022 09:04:22 +0900 firefox (98.0-2) unstable; urgency=medium diff --git a/librewolf/debian/control b/librewolf/debian/control index 22a5093..d5c07de 100644 --- a/librewolf/debian/control +++ b/librewolf/debian/control @@ -18,11 +18,12 @@ Build-Depends: autotools-dev, python3 (>= 3.6), dpkg-dev, libnspr4-dev (>= 2:4.32~), - libnss3-dev (>= 2:3.75~), + libnss3-dev (>= 2:3.76~), libvpx-dev (>= 1.8.0), libdbus-glib-1-dev, libffi-dev, libevent-dev, + libpulse-dev, libasound2-dev, libjack-dev, yasm, nasm (>= 2.14) [amd64 i386], @@ -57,14 +58,15 @@ Depends: ${shlibs:Depends}, procps, debianutils (>= 1.16), libnspr4 (>= 2:4.32~), - libnss3 (>= 2:3.75~) -Recommends: libavcodec58 | libavcodec-extra58 | libavcodec57 | libavcodec-extra57 | libavcodec56 | libavcodec-extra56 | libavcodec55 | libavcodec-extra55 | libavcodec54 | libavcodec-extra54 | libavcodec53 | libavcodec-extra53 + libnss3 (>= 2:3.76~) +Recommends: libavcodec59 | libavcodec-extra59 | libavcodec58 | libavcodec-extra58 | libavcodec57 | libavcodec-extra57 | libavcodec56 | libavcodec-extra56 | libavcodec55 | libavcodec-extra55 | libavcodec54 | libavcodec-extra54 | libavcodec53 | libavcodec-extra53 Suggests: fonts-stix | otf-stix, fonts-lmodern, libgssapi-krb5-2 | libkrb53, libcanberra0, + pulseaudio Provides: www-browser, gnome-www-browser -Description: LibreWolf for Stackrpms +Description: LibreWolf variant of Mozilla Firefox web browser LibreWolf is a build of Firefox that seeks to protect user privacy, security, and freedom. diff --git a/librewolf/debian/control.in b/librewolf/debian/control.in index 7c45bab..0a7ed78 100644 --- a/librewolf/debian/control.in +++ b/librewolf/debian/control.in @@ -24,7 +24,7 @@ Build-Depends: autotools-dev, libnspr4-dev (>= 2:@NSPR_VERSION@~), %endif %if USE_SYSTEM_NSS -%define NSS_VERSION 3.75 +%define NSS_VERSION 3.76 libnss3-dev (>= 2:@NSS_VERSION@~), %endif %if USE_SYSTEM_VPX @@ -37,6 +37,7 @@ Build-Depends: autotools-dev, %if USE_SYSTEM_LIBEVENT libevent-dev, %endif + libpulse-dev, libasound2-dev, yasm, %if DIST == stretch @@ -106,6 +107,7 @@ Suggests: fonts-stix | otf-stix, fonts-lmodern, libgssapi-krb5-2 | libkrb53, libcanberra0, + pulseaudio %if TRANSITION Conflicts: iceweasel (<< 45) %endif diff --git a/librewolf/debian/librewolf.dsc b/librewolf/debian/librewolf.dsc index c5ab7c2..7adaaf5 100644 --- a/librewolf/debian/librewolf.dsc +++ b/librewolf/debian/librewolf.dsc @@ -2,12 +2,12 @@ Format: 3.0 (quilt) Source: librewolf Binary: librewolf Architecture: any all -Version: 98.0-2+stackrpms +Version: 100.0.2-1+stackrpms Maintainer: B. Stack XSBC-Original-Maintainer: Maintainers of Mozilla-related packages Standards-Version: 3.9.8.0 Build-Depends: autotools-dev, debhelper (>= 9.20160114), libx11-dev, libx11-xcb-dev, libxt-dev, libgtk-3-dev, libglib2.0-dev, libdrm-dev, libstartup-notification0-dev, libjpeg-dev, zlib1g-dev, libreadline-dev, python3 (>= 3.6), dpkg-dev, libnspr4-dev (>= 2:4.32~), libnss3-dev (>= 2:3.72~), libvpx-dev (>= 1.8.0), libdbus-glib-1-dev, libffi-dev, libevent-dev, libasound2-dev, libjack-dev, yasm, nasm (>= 2.14) [amd64 i386], rustc (>= 1.53), cargo (>= 0.54), llvm-dev, libclang-dev, clang, cbindgen (>= 0.19.0), nodejs (>= 10), zip, unzip, locales, xvfb, xfonts-base, xauth, ttf-bitstream-vera, fonts-freefont-ttf, fonts-dejima-mincho, iso-codes -Build-Conflicts: graphicsmagick-imagemagick-compat, libhildonmime-dev, liboss4-salsa-dev, libosso-dev +Build-Conflicts: graphicsmagick-imagemagick-compat, libhildonmime-dev, liboss4-salsa-dev, libosso-dev, libpulse-dev Package-List: librewolf deb web optional arch=any Files: diff --git a/librewolf/debian/librewolf_settings/README.md b/librewolf/debian/librewolf_settings/README.md index 0b0edee..f0ed372 100755 --- a/librewolf/debian/librewolf_settings/README.md +++ b/librewolf/debian/librewolf_settings/README.md @@ -8,11 +8,13 @@ we encourage users to find **their own setup** and to use our default configurat - [website](https://librewolf.net/): read the docs. - [faq](https://librewolf.net/docs/faq/): for any question you might have, and to help you creating your own pref file. - [all releases](https://gitlab.com/librewolf-community/browser). -- [issue tracker](https://gitlab.com/librewolf-community/settings/-/issues). issues that have the `provide info` label need user input or they will be quarantined after a week, and closed after ten days. +- [issue tracker](https://gitlab.com/librewolf-community/settings/-/issues). + - if you ignore the pre-requisites and the template the issues might be closed. + - issues that have the `provide info` label need user input or they will be quarantined after a week, and closed after ten days. - find us on [gitter](https://gitter.im/librewolf-community/librewolf) / [matrix](https://matrix.to/#/#librewolf:matrix.org) / [reddit](https://www.reddit.com/r/LibreWolf/) / [lemmy](https://lemmy.ml/c/librewolf). ## Notes and thanks - this repository benefits from the knowledge and research provided by [arkenfox](https://github.com/arkenfox), so special thanks to the project. -we do not use arkenfox's user.js but we try to keep up with it, and we also consider it a great resource for users who want to find their own setup. -- some of the older prefs in this project were taken from [pyllyukko](https://github.com/pyllyukko/user.js/) and many more were investigated on [bugzilla](https://bugzilla.mozilla.org/home); -- thanks to the whole LibreWolf community and to all the contributors of this repo. \ No newline at end of file +we do not use arkenfox's `user.js` but we try to keep up with it, and we also consider it a great resource for users who want to find their own setup. +- many thanks to the firefox team and to the people working on [bugzilla](https://bugzilla.mozilla.org/home); +- thanks to the whole LibreWolf community and to all the contributors of this repo. diff --git a/librewolf/debian/librewolf_settings/distribution/policies.json b/librewolf/debian/librewolf_settings/distribution/policies.json index 50a0eb2..b726d3e 100644 --- a/librewolf/debian/librewolf_settings/distribution/policies.json +++ b/librewolf/debian/librewolf_settings/distribution/policies.json @@ -29,7 +29,7 @@ }, "Extensions": { "Install": [ - "https://addons.cdn.mozilla.net/user-media/addons/607454/ublock_origin-1.41.8-an+fx.xpi" + "https://addons.mozilla.org/firefox/downloads/file/3933192/ublock_origin-1.42.4-an+fx.xpi" ], "Uninstall": [ "google@search.mozilla.org", diff --git a/librewolf/debian/librewolf_settings/docs/Changelog.md b/librewolf/debian/librewolf_settings/docs/Changelog.md index 1b1b657..b3a325c 100644 --- a/librewolf/debian/librewolf_settings/docs/Changelog.md +++ b/librewolf/debian/librewolf_settings/docs/Changelog.md @@ -1,9 +1,98 @@ This changelog will be used from now on to document changes in a precise manner, with a list of changes for each setting version. Setting versions are documented using the pref `librewolf.cfg.version`, available in about:config. +# 6.4 + +**target commit**: eea09ca07333dc166213fa9c873e4916d979e97f + +**base librewolf version**: 100.x + +**References**: +- hide Firefox Focus promo in private tabs. +- double checking revoked certificates with both CRL and OCSP allows to detect false positives and it is also [the default](https://hg.mozilla.org/mozilla-central/rev/a6ba7b4ee17). +- [clearOnShutdown prefs now respect exceptions](https://github.com/arkenfox/user.js/issues/1441) so we can tick all boxes in that UI as well. + +#### Added preferences +``` +lockPref("browser.promo.focus.enabled", false); +defaultPref("privacy.clearOnShutdown.offlineApps", true); +``` + +#### Changed preferences +``` +defaultPref("security.pki.crlite_mode", 3); // prev 2 +``` + +#### Removed preferences +``` +defaultPref("privacy.clearOnShutdown.cookies", false); +``` + +# 6.3 + +**target commit**: e84fc950bfd7c3542cb974e9d545b9b8e18c010d + +**base librewolf version**: 99.x + +**References**: +- Fixes the uBlock Origin installation URL + +# 6.2 + +**target commit**: ac95f5195ed82ca6bcec48acf9d1241e3c683b25 + +**base librewolf version**: 99.x + +**References**: +- vpn pref was set to the wrong value by mistake. +- offscreencanvas cannot be read back using JS, plus it is being tracked upstream. see [this comment](https://github.com/arkenfox/user.js/issues/1418#issuecomment-1093390017), which solves doubts from 6.1 changelog. + +#### Removed preferences +``` +defaultPref("gfx.offscreencanvas.domain-enabled", false); +``` + +#### Changed preferences +``` +lockPref("browser.vpn_promo.enabled", false); +``` + +# 6.1 + +**target commit**: 465257e5993893cd7896ef1533d37e245f206fb9 + +**base librewolf version**: 99.x + +**References**: +- csp pref has been deprecated. +- quicksuggest prefs are redundant as it has a master switch. the master switch is now force applied on each restart of the browser. +- do not whitelist offscreencanvas for now, we need to first check how it is tied to the "normal" canvas. + +**Notes**: using the vpn pref should allow us to get rid of one patch. + +#### Added preferences +``` +lockPref("browser.vpn_promo.enabled", true); +defaultPref("gfx.offscreencanvas.domain-enabled", false); +``` + +#### Removed preferences +``` +lockPref("security.csp.enable", true); // enforce csp, default +lockPref("browser.urlbar.suggest.quicksuggest.nonsponsored", false); +lockPref("browser.urlbar.suggest.quicksuggest.sponsored", false); +lockPref("browser.urlbar.quicksuggest.dataCollection.enabled", false); // default +lockPref("browser.urlbar.quicksuggest.scenario", "history"); +``` + +#### Changed preferences +``` +pref("browser.urlbar.quicksuggest.enabled", false); +``` + # 6.0 -**target commit**: +**target commit**: 0822d491d2b377b5cd7f0429cee5aa916538fa50 **base librewolf version**: 98.x @@ -612,4 +701,4 @@ lockPref("privacy.override_rfp_for_color_scheme", false); **base librewolf version**: 89.x This is the initial release from which we start tagging and versioning settings. For previous changes see -[here](https://gitlab.com/librewolf-community/settings/-/blob/master/docs/changelog-legacy.md). \ No newline at end of file +[here](https://gitlab.com/librewolf-community/settings/-/blob/master/docs/changelog-legacy.md). diff --git a/librewolf/debian/librewolf_settings/librewolf.cfg b/librewolf/debian/librewolf_settings/librewolf.cfg index 8525c82..8f07322 100755 --- a/librewolf/debian/librewolf_settings/librewolf.cfg +++ b/librewolf/debian/librewolf_settings/librewolf.cfg @@ -6,7 +6,7 @@ * * WARNING: please make sure the first line of this file is empty. this is a known bug. */ -defaultPref("librewolf.cfg.version", "6.0"); +defaultPref("librewolf.cfg.version", "6.4"); /** INDEX @@ -54,7 +54,7 @@ defaultPref("network.cookie.thirdparty.nonsecureSessionOnly", true); * we disable it but cookies and site data are still cleared per session unless exceptions are set. * all the cleaning prefs true by default except for siteSetting and offlineApps, which is what we want. */ -defaultPref("privacy.clearOnShutdown.cookies", false); +defaultPref("privacy.clearOnShutdown.offlineApps", true); defaultPref("privacy.sanitize.sanitizeOnShutdown", true); defaultPref("privacy.sanitize.timeSpan", 0); @@ -208,10 +208,10 @@ defaultPref("security.ssl.treat_unsafe_negotiation_as_broken", true); * our strategy with revocation is to perform all possible checks with CRL, but when a cert * cannot be checked with it we use OCSP stapled with hard-fail, to still keep privacy and * increase security. - * switching to crlite mode 3 (v99+) would allow us to detect false positive with OCSP. + * crlite is in mode 3 by default, which allows us to detect false positive with OCSP. */ defaultPref("security.remote_settings.crlite_filters.enabled", true); -defaultPref("security.pki.crlite_mode", 2); // mode 2 means enforce CRL checks +defaultPref("security.pki.crlite_mode", 3); // default defaultPref("security.OCSP.enabled", 1); // default defaultPref("security.OCSP.require", true); // set to hard-fail @@ -255,7 +255,6 @@ lockPref("browser.safebrowsing.provider.google4.dataSharing.enabled", false); lockPref("browser.safebrowsing.provider.google4.dataSharingURL", ""); /** [SECTION] OTHERS */ -lockPref("security.csp.enable", true); // enforce csp, default defaultPref("network.IDN_show_punycode", true); // use punycode in idn to prevent spoofing defaultPref("pdfjs.enableScripting", false); // disable js scripting in the built-in pdf reader @@ -301,15 +300,11 @@ defaultPref("browser.search.suggest.enabled", false); defaultPref("browser.search.update", false); defaultPref("browser.urlbar.trimURLs", false); /** - * quicksuggest is a feature of firefox that shows sponsored suggestions. we disable it in full - * but the list could and should be trimmed at some point. the scenario controls the opt-in, while - * the second pref disables the feature and hides it from the ui. + * the pref disables the whole feature and hide it from the ui + * (as noted in https://bugzilla.mozilla.org/show_bug.cgi?id=1755057). + * this also includes the best match feature, as it is part of firefox suggest. */ -lockPref("browser.urlbar.quicksuggest.scenario", "history"); -lockPref("browser.urlbar.quicksuggest.enabled", false); -lockPref("browser.urlbar.suggest.quicksuggest.nonsponsored", false); -lockPref("browser.urlbar.suggest.quicksuggest.sponsored", false); -lockPref("browser.urlbar.quicksuggest.dataCollection.enabled", false); // default +pref("browser.urlbar.quicksuggest.enabled", false); /** [SECTION] DOWNLOADS * user interaction should always be required for downloads, as a way to enhance security by asking @@ -476,6 +471,8 @@ defaultPref("browser.contentblocking.report.monitor.enabled", false); lockPref("browser.contentblocking.report.hide_vpn_banner", true); lockPref("browser.contentblocking.report.vpn.enabled", false); lockPref("browser.contentblocking.report.show_mobile_app", false); +lockPref("browser.vpn_promo.enabled", false); +lockPref("browser.promo.focus.enabled", false); // ...about:addons recommendations sections and more defaultPref("extensions.htmlaboutaddons.recommendations.enabled", false); defaultPref("extensions.getAddons.showPane", false); diff --git a/librewolf/debian/patches/debian-hacks/Add-another-preferences-directory-for-applications-p.patch b/librewolf/debian/patches/debian-hacks/Add-another-preferences-directory-for-applications-p.patch index 07e1119..7206ab5 100644 --- a/librewolf/debian/patches/debian-hacks/Add-another-preferences-directory-for-applications-p.patch +++ b/librewolf/debian/patches/debian-hacks/Add-another-preferences-directory-for-applications-p.patch @@ -13,10 +13,10 @@ to disable the "set as default browser" dialog. 1 file changed, 2 insertions(+) diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp -index a9d291b..c4a37fe 100644 +index f0e449c..89b07ad 100644 --- a/toolkit/xre/nsXREDirProvider.cpp +++ b/toolkit/xre/nsXREDirProvider.cpp -@@ -802,6 +802,7 @@ static const char* const kAppendPrefDir[] = {"defaults", "preferences", +@@ -768,6 +768,7 @@ static const char* const kAppendPrefDir[] = {"defaults", "preferences", static const char* const kAppendBackgroundTasksPrefDir[] = { "defaults", "backgroundtasks", nullptr}; #endif @@ -24,7 +24,7 @@ index a9d291b..c4a37fe 100644 nsresult nsXREDirProvider::GetFilesInternal(const char* aProperty, nsISimpleEnumerator** aResult) { -@@ -818,6 +819,7 @@ nsresult nsXREDirProvider::GetFilesInternal(const char* aProperty, +@@ -784,6 +785,7 @@ nsresult nsXREDirProvider::GetFilesInternal(const char* aProperty, LoadDirIntoArray(mXULAppDir, kAppendBackgroundTasksPrefDir, directories); } #endif diff --git a/librewolf/debian/patches/debian-hacks/Avoid-wrong-sessionstore-data-to-keep-windows-out-of.patch b/librewolf/debian/patches/debian-hacks/Avoid-wrong-sessionstore-data-to-keep-windows-out-of.patch index 094cb02..11b65a0 100644 --- a/librewolf/debian/patches/debian-hacks/Avoid-wrong-sessionstore-data-to-keep-windows-out-of.patch +++ b/librewolf/debian/patches/debian-hacks/Avoid-wrong-sessionstore-data-to-keep-windows-out-of.patch @@ -12,19 +12,19 @@ Closes: #552426, #553453 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/browser/components/sessionstore/SessionStore.jsm b/browser/components/sessionstore/SessionStore.jsm -index 79366e4..0891d87 100644 +index 650a597..de13b8a 100644 --- a/browser/components/sessionstore/SessionStore.jsm +++ b/browser/components/sessionstore/SessionStore.jsm -@@ -4923,7 +4923,7 @@ var SessionStoreInternal = { - !isNaN(aTop) && - (aLeft != win_("screenX") || aTop != win_("screenY")) - ) { -- aWindow.moveTo(aLeft, aTop); -+ aWindow.moveTo((aLeft < -aWidth) ? 0 : aLeft, (aTop < -aHeight) ? 0 : aTop); +@@ -5012,7 +5012,7 @@ var SessionStoreInternal = { + // _getWindowDimension. + let desktopToCssScale = + aWindow.desktopToDeviceScale / aWindow.devicePixelRatio; +- aWindow.moveTo(aLeft * desktopToCssScale, aTop * desktopToCssScale); ++ aWindow.moveTo((aLeft < -aWidth) ? 0 : aLeft * desktopToCssScale, (aTop < -aHeight) ? 0 : aTop * desktopToCssScale); } if ( aWidth && -@@ -4952,9 +4952,8 @@ var SessionStoreInternal = { +@@ -5041,9 +5041,8 @@ var SessionStoreInternal = { case "minimized": if (aSizeModeBeforeMinimized == "maximized") { aWindow.maximize(); diff --git a/librewolf/debian/patches/debian-hacks/Relax-MSRV-to-1.56.0.patch b/librewolf/debian/patches/debian-hacks/Relax-MSRV-to-1.56.0.patch index d8d60c4..46b1035 100644 --- a/librewolf/debian/patches/debian-hacks/Relax-MSRV-to-1.56.0.patch +++ b/librewolf/debian/patches/debian-hacks/Relax-MSRV-to-1.56.0.patch @@ -21,7 +21,7 @@ Subject: Relax MSRV to 1.56.0 create mode 100644 third_party/rust/audioipc2-client/build.rs diff --git a/Cargo.lock b/Cargo.lock -index c90fafe..91370ed 100644 +index 391b904..77c1d86 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -297,6 +297,7 @@ dependencies = [ @@ -32,7 +32,7 @@ index c90fafe..91370ed 100644 ] [[package]] -@@ -4874,6 +4875,7 @@ dependencies = [ +@@ -4925,6 +4926,7 @@ dependencies = [ "precomputed-hash", "rayon", "regex", @@ -54,12 +54,12 @@ index ce3652d..c8a966b 100644 RUSTC_BOOTSTRAP := $(RUSTC_BOOTSTRAP),encoding_rs,packed_simd endif diff --git a/python/mozboot/mozboot/util.py b/python/mozboot/mozboot/util.py -index 484ff52..b3990f6 100644 +index 1d6d546..fdbf48f 100644 --- a/python/mozboot/mozboot/util.py +++ b/python/mozboot/mozboot/util.py -@@ -12,7 +12,7 @@ from mach.site import PythonVirtualenv - from mach.util import get_state_dir - +@@ -23,7 +23,7 @@ if sys.version_info < (3,): + else: + from urllib.request import urlopen -MINIMUM_RUST_VERSION = "1.57.0" +MINIMUM_RUST_VERSION = "1.56.0" @@ -121,10 +121,10 @@ index ee156cf..7048ea0 100644 } diff --git a/servo/components/style/stylist.rs b/servo/components/style/stylist.rs -index 9d5e38d..c72d46f 100644 +index 02610fe..63e2209 100644 --- a/servo/components/style/stylist.rs +++ b/servo/components/style/stylist.rs -@@ -1747,7 +1747,7 @@ impl ExtraStyleData { +@@ -1730,7 +1730,7 @@ impl ExtraStyleData { // TODO: Handle pseudo-classes self.pages.named.try_reserve(page_rule.selectors.0.len())?; for name in page_rule.selectors.as_slice() { @@ -134,21 +134,21 @@ index 9d5e38d..c72d46f 100644 vec.push(PageRuleData{layer, rule: rule.clone()}); } diff --git a/third_party/rust/audioipc2-client/.cargo-checksum.json b/third_party/rust/audioipc2-client/.cargo-checksum.json -index 85789ad..3365cd7 100644 +index 6c0cbc0..f033549 100644 --- a/third_party/rust/audioipc2-client/.cargo-checksum.json +++ b/third_party/rust/audioipc2-client/.cargo-checksum.json @@ -1 +1 @@ --{"files":{"Cargo.toml":"4304d6695b5ae83a67ec50eeb7c8b05f0292b31bf6d93bfec629492116cb05fd","cbindgen.toml":"fb6abe1671497f432a06e40b1db7ed7cd2cceecbd9a2382193ad7534e8855e34","src/context.rs":"060680f87d406cef1f6f94cfae991ae59b5f3a13253e15481716a1a4224682ee","src/lib.rs":"c4a6797734489280f6b97dd72c9e51a7bd7be4104592eece3929e29d45cbca4a","src/send_recv.rs":"450bdb1d8a346634c0237f2081b424d11e2c19ad81670009303f8a03b3bfb196","src/stream.rs":"8f2f33b75b78fb1ef8ebb7b14bbb81dbb0f046f9e91b6110a3c49e424690bb8b"},"package":null} +-{"files":{"Cargo.toml":"722e0313d4de90477ae34dbb95ae7eeff27622329c5689bb4ce6bcd2006c6263","cbindgen.toml":"fb6abe1671497f432a06e40b1db7ed7cd2cceecbd9a2382193ad7534e8855e34","src/context.rs":"33231853817615e01fd1a0f67f69a176d19119bbebb7dc417e96ed88dd3a8d34","src/lib.rs":"c4a6797734489280f6b97dd72c9e51a7bd7be4104592eece3929e29d45cbca4a","src/send_recv.rs":"064a657c845762be1dbcbbfc18b3f8a51582eb540def8d2ceecf200184ad4f7a","src/stream.rs":"a6c07796e6fe704cfa6baf8b904e7ffe874d3c884d44d4ed307e668dec25452b"},"package":null} \ No newline at end of file -+{"files":{"Cargo.toml":"fcf7b1d8c3f72ecac29ebe859e7ea5e216168aad149fad0284a81015bd88c329","build.rs":"91de386f621a91eb125484980f352d52549826c27d1ddff53ce6e3835c79e61d","cbindgen.toml":"fb6abe1671497f432a06e40b1db7ed7cd2cceecbd9a2382193ad7534e8855e34","src/context.rs":"060680f87d406cef1f6f94cfae991ae59b5f3a13253e15481716a1a4224682ee","src/lib.rs":"78c7060e55536cbff4681a300e73c7fa0ff52953caa668c84035d2e975b6871d","src/send_recv.rs":"450bdb1d8a346634c0237f2081b424d11e2c19ad81670009303f8a03b3bfb196","src/stream.rs":"8f2f33b75b78fb1ef8ebb7b14bbb81dbb0f046f9e91b6110a3c49e424690bb8b"},"package":null} ++{"files":{"Cargo.toml":"bdde450635daff287c6a94115c801ccc274766f455dd1606dbdf595158668d4f","build.rs":"91de386f621a91eb125484980f352d52549826c27d1ddff53ce6e3835c79e61d","cbindgen.toml":"fb6abe1671497f432a06e40b1db7ed7cd2cceecbd9a2382193ad7534e8855e34","src/context.rs":"33231853817615e01fd1a0f67f69a176d19119bbebb7dc417e96ed88dd3a8d34","src/lib.rs":"78c7060e55536cbff4681a300e73c7fa0ff52953caa668c84035d2e975b6871d","src/send_recv.rs":"064a657c845762be1dbcbbfc18b3f8a51582eb540def8d2ceecf200184ad4f7a","src/stream.rs":"a6c07796e6fe704cfa6baf8b904e7ffe874d3c884d44d4ed307e668dec25452b"},"package":null} diff --git a/third_party/rust/audioipc2-client/Cargo.toml b/third_party/rust/audioipc2-client/Cargo.toml -index 94afedb..b0a63ea 100644 +index fe71197..ddab501 100644 --- a/third_party/rust/audioipc2-client/Cargo.toml +++ b/third_party/rust/audioipc2-client/Cargo.toml -@@ -14,3 +14,6 @@ audio_thread_priority = "0.23.4" - audioipc = { package = "audioipc2", path="../audioipc" } - cubeb-backend = "0.9" - log = "0.4" +@@ -18,3 +18,6 @@ log = "0.4" + version = "0.26.0" + default_features = false + features = ["winapi"] + +[build-dependencies] +rustc_version = "0.2" diff --git a/librewolf/debian/patches/debian-hacks/Use-the-Mozilla-Location-Service-key-when-the-Google.patch b/librewolf/debian/patches/debian-hacks/Use-the-Mozilla-Location-Service-key-when-the-Google.patch index 1732338..62ee664 100644 --- a/librewolf/debian/patches/debian-hacks/Use-the-Mozilla-Location-Service-key-when-the-Google.patch +++ b/librewolf/debian/patches/debian-hacks/Use-the-Mozilla-Location-Service-key-when-the-Google.patch @@ -7,10 +7,10 @@ Subject: Use the Mozilla Location Service key when the Google Key is not there 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js -index 37dd370..de83075 100644 +index 261e46f..6443cf1 100644 --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js -@@ -3725,7 +3725,7 @@ pref("network.psl.onUpdate_notify", false); +@@ -3701,7 +3701,7 @@ pref("network.psl.onUpdate_notify", false); // All the Geolocation preferences are here. // diff --git a/librewolf/debian/patches/fixes/Allow-.js-preference-files-to-set-locked-prefs-with-.patch b/librewolf/debian/patches/fixes/Allow-.js-preference-files-to-set-locked-prefs-with-.patch index c06839f..a474a5b 100644 --- a/librewolf/debian/patches/fixes/Allow-.js-preference-files-to-set-locked-prefs-with-.patch +++ b/librewolf/debian/patches/fixes/Allow-.js-preference-files-to-set-locked-prefs-with-.patch @@ -7,7 +7,7 @@ Subject: Allow .js preference files to set locked prefs with lockPref() 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/modules/libpref/parser/src/lib.rs b/modules/libpref/parser/src/lib.rs -index bce98c0..da33195 100644 +index bce98c0..da33195a 100644 --- a/modules/libpref/parser/src/lib.rs +++ b/modules/libpref/parser/src/lib.rs @@ -11,8 +11,9 @@ diff --git a/librewolf/debian/patches/fixes/Bug-1738845-Add-webrtc-configs-for-arm-and-ppc64-lin.patch b/librewolf/debian/patches/fixes/Bug-1738845-Add-webrtc-configs-for-arm-and-ppc64-lin.patch index 302d130..b700cce 100644 --- a/librewolf/debian/patches/fixes/Bug-1738845-Add-webrtc-configs-for-arm-and-ppc64-lin.patch +++ b/librewolf/debian/patches/fixes/Bug-1738845-Add-webrtc-configs-for-arm-and-ppc64-lin.patch @@ -121407,7 +121407,7 @@ index 0000000..bb14be3 \ No newline at end of file diff --git a/dom/media/webrtc/third_party_build/gn-configs/x64_True_arm_linux.mozconfig b/dom/media/webrtc/third_party_build/gn-configs/x64_True_arm_linux.mozconfig new file mode 100644 -index 0000000..0f162f5 +index 0000000..0f162f57 --- /dev/null +++ b/dom/media/webrtc/third_party_build/gn-configs/x64_True_arm_linux.mozconfig @@ -0,0 +1,4 @@ @@ -151627,7 +151627,7 @@ index 58f0062..b9556dc 100644 Library("audio_encoder_multiopus_gn") diff --git a/third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_config_gn/moz.build b/third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_config_gn/moz.build -index a8f5c61..8426e0f 100644 +index a8f5c61..8426e0f5 100644 --- a/third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_config_gn/moz.build +++ b/third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_config_gn/moz.build @@ -83,7 +83,6 @@ if CONFIG["OS_TARGET"] == "Linux": @@ -152158,7 +152158,7 @@ index bb55b07..6c7ab10 100644 Library("callfactory_api_gn") diff --git a/third_party/libwebrtc/api/crypto/frame_decryptor_interface_gn/moz.build b/third_party/libwebrtc/api/crypto/frame_decryptor_interface_gn/moz.build -index fe4a347..9ca8a02 100644 +index fe4a347c..9ca8a02 100644 --- a/third_party/libwebrtc/api/crypto/frame_decryptor_interface_gn/moz.build +++ b/third_party/libwebrtc/api/crypto/frame_decryptor_interface_gn/moz.build @@ -74,7 +74,6 @@ if CONFIG["OS_TARGET"] == "Linux": @@ -153304,7 +153304,7 @@ index 1a5b0bf..b00f466 100644 Library("network_state_predictor_api_gn") diff --git a/third_party/libwebrtc/api/numerics/numerics_gn/moz.build b/third_party/libwebrtc/api/numerics/numerics_gn/moz.build -index fa11b29..b5e327c 100644 +index fa11b290a..b5e327c 100644 --- a/third_party/libwebrtc/api/numerics/numerics_gn/moz.build +++ b/third_party/libwebrtc/api/numerics/numerics_gn/moz.build @@ -78,7 +78,6 @@ if CONFIG["OS_TARGET"] == "Linux": @@ -153658,7 +153658,7 @@ index 01b92ce..de87a29 100644 Library("rtc_error_gn") diff --git a/third_party/libwebrtc/api/rtc_event_log/rtc_event_log_gn/moz.build b/third_party/libwebrtc/api/rtc_event_log/rtc_event_log_gn/moz.build -index 62dec01..c747f7b 100644 +index 62dec010..c747f7b 100644 --- a/third_party/libwebrtc/api/rtc_event_log/rtc_event_log_gn/moz.build +++ b/third_party/libwebrtc/api/rtc_event_log/rtc_event_log_gn/moz.build @@ -79,7 +79,6 @@ if CONFIG["OS_TARGET"] == "Linux": @@ -154369,7 +154369,7 @@ index 691d7ed..02e2b71 100644 Library("task_queue_gn") diff --git a/third_party/libwebrtc/api/transport/bitrate_settings_gn/moz.build b/third_party/libwebrtc/api/transport/bitrate_settings_gn/moz.build -index 3513f9c..2e670ab 100644 +index 3513f9c2..2e670ab 100644 --- a/third_party/libwebrtc/api/transport/bitrate_settings_gn/moz.build +++ b/third_party/libwebrtc/api/transport/bitrate_settings_gn/moz.build @@ -74,7 +74,6 @@ if CONFIG["OS_TARGET"] == "Linux": @@ -155263,7 +155263,7 @@ index 14b9742..9257173 100644 Library("data_size_gn") diff --git a/third_party/libwebrtc/api/units/frequency_gn/moz.build b/third_party/libwebrtc/api/units/frequency_gn/moz.build -index 79fcff4..5a54b58 100644 +index 79fcff48..5a54b58 100644 --- a/third_party/libwebrtc/api/units/frequency_gn/moz.build +++ b/third_party/libwebrtc/api/units/frequency_gn/moz.build @@ -78,7 +78,6 @@ if CONFIG["OS_TARGET"] == "Linux": @@ -155533,7 +155533,7 @@ index 23aa0ba..83f104b 100644 Library("timestamp_gn") diff --git a/third_party/libwebrtc/api/video/builtin_video_bitrate_allocator_factory_gn/moz.build b/third_party/libwebrtc/api/video/builtin_video_bitrate_allocator_factory_gn/moz.build -index 0ecc793..c0cbd77 100644 +index 0ecc793..c0cbd775 100644 --- a/third_party/libwebrtc/api/video/builtin_video_bitrate_allocator_factory_gn/moz.build +++ b/third_party/libwebrtc/api/video/builtin_video_bitrate_allocator_factory_gn/moz.build @@ -79,7 +79,6 @@ if CONFIG["OS_TARGET"] == "Linux": @@ -157051,7 +157051,7 @@ index 57a39cf..3528c34 100644 Library("video_stream_encoder_create_gn") diff --git a/third_party/libwebrtc/api/video/video_stream_encoder_gn/moz.build b/third_party/libwebrtc/api/video/video_stream_encoder_gn/moz.build -index e5e9a7c..7114a4a 100644 +index e5e9a7c0..7114a4a 100644 --- a/third_party/libwebrtc/api/video/video_stream_encoder_gn/moz.build +++ b/third_party/libwebrtc/api/video/video_stream_encoder_gn/moz.build @@ -74,7 +74,6 @@ if CONFIG["OS_TARGET"] == "Linux": @@ -157405,7 +157405,7 @@ index bd29841..ee6547d 100644 Library("builtin_video_encoder_factory_gn") diff --git a/third_party/libwebrtc/api/video_codecs/rtc_software_fallback_wrappers_gn/moz.build b/third_party/libwebrtc/api/video_codecs/rtc_software_fallback_wrappers_gn/moz.build -index 90afc61..fe91abb 100644 +index 90afc61c..fe91abb 100644 --- a/third_party/libwebrtc/api/video_codecs/rtc_software_fallback_wrappers_gn/moz.build +++ b/third_party/libwebrtc/api/video_codecs/rtc_software_fallback_wrappers_gn/moz.build @@ -80,7 +80,6 @@ if CONFIG["OS_TARGET"] == "Linux": @@ -158302,7 +158302,7 @@ index 8cb24f9..e7ede49 100644 Library("call_gn") diff --git a/third_party/libwebrtc/call/call_interfaces_gn/moz.build b/third_party/libwebrtc/call/call_interfaces_gn/moz.build -index 4f07c8b..f9aa9e3 100644 +index 4f07c8b7..f9aa9e3 100644 --- a/third_party/libwebrtc/call/call_interfaces_gn/moz.build +++ b/third_party/libwebrtc/call/call_interfaces_gn/moz.build @@ -84,7 +84,6 @@ if CONFIG["OS_TARGET"] == "Linux": @@ -158662,7 +158662,7 @@ index 5c1f19a..89009b7 100644 Library("rtp_receiver_gn") diff --git a/third_party/libwebrtc/call/rtp_sender_gn/moz.build b/third_party/libwebrtc/call/rtp_sender_gn/moz.build -index 1d14b03..0ad5b6d 100644 +index 1d14b03..0ad5b6d1 100644 --- a/third_party/libwebrtc/call/rtp_sender_gn/moz.build +++ b/third_party/libwebrtc/call/rtp_sender_gn/moz.build @@ -81,7 +81,6 @@ if CONFIG["OS_TARGET"] == "Linux": @@ -159019,7 +159019,7 @@ index 926361a..12f7e80 100644 Library("video_stream_api_gn") diff --git a/third_party/libwebrtc/common_audio/common_audio_c_arm_asm_gn/moz.build b/third_party/libwebrtc/common_audio/common_audio_c_arm_asm_gn/moz.build -index 7adcbbf..01a3edc 100644 +index 7adcbbf3..01a3edc 100644 --- a/third_party/libwebrtc/common_audio/common_audio_c_arm_asm_gn/moz.build +++ b/third_party/libwebrtc/common_audio/common_audio_c_arm_asm_gn/moz.build @@ -70,7 +70,6 @@ if CONFIG["OS_TARGET"] == "Linux": @@ -159406,7 +159406,7 @@ index e499c12..5c5f4ba 100644 Library("common_audio_gn") diff --git a/third_party/libwebrtc/common_audio/common_audio_neon_c_gn/moz.build b/third_party/libwebrtc/common_audio/common_audio_neon_c_gn/moz.build -index 36ffd6a..3a73dc2 100644 +index 36ffd6ad..3a73dc20 100644 --- a/third_party/libwebrtc/common_audio/common_audio_neon_c_gn/moz.build +++ b/third_party/libwebrtc/common_audio/common_audio_neon_c_gn/moz.build @@ -73,14 +73,12 @@ if CONFIG["OS_TARGET"] == "Darwin": @@ -162143,7 +162143,7 @@ index b389938..4fd2f62 100644 Library("audio_network_adaptor_gn") diff --git a/third_party/libwebrtc/modules/audio_coding/default_neteq_factory_gn/moz.build b/third_party/libwebrtc/modules/audio_coding/default_neteq_factory_gn/moz.build -index df061c6..62c3c16 100644 +index df061c6..62c3c16d 100644 --- a/third_party/libwebrtc/modules/audio_coding/default_neteq_factory_gn/moz.build +++ b/third_party/libwebrtc/modules/audio_coding/default_neteq_factory_gn/moz.build @@ -78,7 +78,6 @@ if CONFIG["OS_TARGET"] == "Linux": @@ -162323,7 +162323,7 @@ index e0f07f2..8cff22c 100644 Library("g711_c_gn") diff --git a/third_party/libwebrtc/modules/audio_coding/g711_gn/moz.build b/third_party/libwebrtc/modules/audio_coding/g711_gn/moz.build -index 3716ec4..d1088db 100644 +index 3716ec4..d1088dba 100644 --- a/third_party/libwebrtc/modules/audio_coding/g711_gn/moz.build +++ b/third_party/libwebrtc/modules/audio_coding/g711_gn/moz.build @@ -79,7 +79,6 @@ if CONFIG["OS_TARGET"] == "Linux": @@ -162503,7 +162503,7 @@ index 8910ce7..d5a2030 100644 Library("g722_c_gn") diff --git a/third_party/libwebrtc/modules/audio_coding/g722_gn/moz.build b/third_party/libwebrtc/modules/audio_coding/g722_gn/moz.build -index 71d1053..31dda4e 100644 +index 71d1053..31dda4e6c 100644 --- a/third_party/libwebrtc/modules/audio_coding/g722_gn/moz.build +++ b/third_party/libwebrtc/modules/audio_coding/g722_gn/moz.build @@ -79,7 +79,6 @@ if CONFIG["OS_TARGET"] == "Linux": @@ -163321,7 +163321,7 @@ index 67f8362..c607ac8 100644 Library("isac_gn") diff --git a/third_party/libwebrtc/modules/audio_coding/isac_neon_gn/moz.build b/third_party/libwebrtc/modules/audio_coding/isac_neon_gn/moz.build -index 3798420..a8ee826 100644 +index 3798420..a8ee826f 100644 --- a/third_party/libwebrtc/modules/audio_coding/isac_neon_gn/moz.build +++ b/third_party/libwebrtc/modules/audio_coding/isac_neon_gn/moz.build @@ -14,12 +14,7 @@ COMPILE_FLAGS["OS_INCLUDES"] = [] @@ -164491,7 +164491,7 @@ index 8e1e8c6..99fe511 100644 Library("audio_device_buffer_gn") diff --git a/third_party/libwebrtc/modules/audio_device/audio_device_default_gn/moz.build b/third_party/libwebrtc/modules/audio_device/audio_device_default_gn/moz.build -index a079f00..c949f26 100644 +index a079f00..c949f260 100644 --- a/third_party/libwebrtc/modules/audio_device/audio_device_default_gn/moz.build +++ b/third_party/libwebrtc/modules/audio_device/audio_device_default_gn/moz.build @@ -74,7 +74,6 @@ if CONFIG["OS_TARGET"] == "Linux": @@ -165112,7 +165112,7 @@ index b1898d5..950331d 100644 Library("adaptive_fir_filter_erl_gn") diff --git a/third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_gn/moz.build b/third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_gn/moz.build -index 249c41b..793a944 100644 +index 249c41b..793a944d 100644 --- a/third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_gn/moz.build +++ b/third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_gn/moz.build @@ -74,7 +74,6 @@ if CONFIG["OS_TARGET"] == "Linux": @@ -165637,7 +165637,7 @@ index 33c5ef2..03f2b1d 100644 Library("matched_filter_gn") diff --git a/third_party/libwebrtc/modules/audio_processing/aec3/render_buffer_gn/moz.build b/third_party/libwebrtc/modules/audio_processing/aec3/render_buffer_gn/moz.build -index a2685d2..7a83f11 100644 +index a2685d26..7a83f11 100644 --- a/third_party/libwebrtc/modules/audio_processing/aec3/render_buffer_gn/moz.build +++ b/third_party/libwebrtc/modules/audio_processing/aec3/render_buffer_gn/moz.build @@ -74,7 +74,6 @@ if CONFIG["OS_TARGET"] == "Linux": @@ -171310,7 +171310,7 @@ index 60e216f..875ba0f 100644 Library("fft_gn") diff --git a/third_party/libwebrtc/modules/third_party/g711/g711_3p_gn/moz.build b/third_party/libwebrtc/modules/third_party/g711/g711_3p_gn/moz.build -index 4004c61..67610e7 100644 +index 4004c613..67610e7 100644 --- a/third_party/libwebrtc/modules/third_party/g711/g711_3p_gn/moz.build +++ b/third_party/libwebrtc/modules/third_party/g711/g711_3p_gn/moz.build @@ -74,7 +74,6 @@ if CONFIG["OS_TARGET"] == "Linux": @@ -173291,7 +173291,7 @@ index 4b0b804..90c9ddb 100644 Library("webrtc_vp9_helpers_gn") diff --git a/third_party/libwebrtc/modules/video_processing/denoiser_filter_gn/moz.build b/third_party/libwebrtc/modules/video_processing/denoiser_filter_gn/moz.build -index 7407051..d31e40d 100644 +index 7407051e..d31e40d 100644 --- a/third_party/libwebrtc/modules/video_processing/denoiser_filter_gn/moz.build +++ b/third_party/libwebrtc/modules/video_processing/denoiser_filter_gn/moz.build @@ -70,7 +70,6 @@ if CONFIG["OS_TARGET"] == "Linux": @@ -173598,7 +173598,7 @@ index 1131355..01086f1 100644 "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn", "/third_party/libwebrtc/modules/video_processing/video_processing_sse2_gn" diff --git a/third_party/libwebrtc/rtc_base/atomicops_gn/moz.build b/third_party/libwebrtc/rtc_base/atomicops_gn/moz.build -index e81ee45..970aa26 100644 +index e81ee452..970aa26 100644 --- a/third_party/libwebrtc/rtc_base/atomicops_gn/moz.build +++ b/third_party/libwebrtc/rtc_base/atomicops_gn/moz.build @@ -70,7 +70,6 @@ if CONFIG["OS_TARGET"] == "Linux": @@ -173685,7 +173685,7 @@ index e81ee45..970aa26 100644 Library("atomicops_gn") diff --git a/third_party/libwebrtc/rtc_base/audio_format_to_string_gn/moz.build b/third_party/libwebrtc/rtc_base/audio_format_to_string_gn/moz.build -index 1562c0c..460d0d5 100644 +index 1562c0c1..460d0d5 100644 --- a/third_party/libwebrtc/rtc_base/audio_format_to_string_gn/moz.build +++ b/third_party/libwebrtc/rtc_base/audio_format_to_string_gn/moz.build @@ -78,7 +78,6 @@ if CONFIG["OS_TARGET"] == "Linux": @@ -177429,7 +177429,7 @@ index 5f14995..81e19e5 100644 Library("rw_lock_wrapper_gn") diff --git a/third_party/libwebrtc/rtc_base/synchronization/sequence_checker_gn/moz.build b/third_party/libwebrtc/rtc_base/synchronization/sequence_checker_gn/moz.build -index 5ec0cff..40a1809 100644 +index 5ec0cff6..40a1809 100644 --- a/third_party/libwebrtc/rtc_base/synchronization/sequence_checker_gn/moz.build +++ b/third_party/libwebrtc/rtc_base/synchronization/sequence_checker_gn/moz.build @@ -78,7 +78,6 @@ if CONFIG["OS_TARGET"] == "Linux": @@ -178905,7 +178905,7 @@ index a3c1b2d..fbbd5da 100644 Library("sigslot_gn") diff --git a/third_party/libwebrtc/rtc_base/thread_checker_gn/moz.build b/third_party/libwebrtc/rtc_base/thread_checker_gn/moz.build -index eb1c598..cbe6e31 100644 +index eb1c598..cbe6e316 100644 --- a/third_party/libwebrtc/rtc_base/thread_checker_gn/moz.build +++ b/third_party/libwebrtc/rtc_base/thread_checker_gn/moz.build @@ -74,7 +74,6 @@ if CONFIG["OS_TARGET"] == "Linux": @@ -179346,7 +179346,7 @@ index 5d22a05..45e5410 100644 Library("unit_base_gn") diff --git a/third_party/libwebrtc/rtc_base/weak_ptr_gn/moz.build b/third_party/libwebrtc/rtc_base/weak_ptr_gn/moz.build -index a9a520b..b1e60d9 100644 +index a9a520b..b1e60d90 100644 --- a/third_party/libwebrtc/rtc_base/weak_ptr_gn/moz.build +++ b/third_party/libwebrtc/rtc_base/weak_ptr_gn/moz.build @@ -78,7 +78,6 @@ if CONFIG["OS_TARGET"] == "Linux": @@ -180418,7 +180418,7 @@ index fa970ef..ecf69a0 100644 Library("flat_hash_map_gn") diff --git a/third_party/libwebrtc/third_party/abseil-cpp/absl/container/inlined_vector_gn/moz.build b/third_party/libwebrtc/third_party/abseil-cpp/absl/container/inlined_vector_gn/moz.build -index a75033f..7a353bc 100644 +index a75033fa..7a353bc 100644 --- a/third_party/libwebrtc/third_party/abseil-cpp/absl/container/inlined_vector_gn/moz.build +++ b/third_party/libwebrtc/third_party/abseil-cpp/absl/container/inlined_vector_gn/moz.build @@ -53,7 +53,6 @@ if CONFIG["OS_TARGET"] == "Linux": @@ -181105,7 +181105,7 @@ index 41cd799..c97aec9 100644 Library("span_gn") diff --git a/third_party/libwebrtc/third_party/abseil-cpp/absl/types/variant_gn/moz.build b/third_party/libwebrtc/third_party/abseil-cpp/absl/types/variant_gn/moz.build -index bb22317..879e032 100644 +index bb22317..879e032f 100644 --- a/third_party/libwebrtc/third_party/abseil-cpp/absl/types/variant_gn/moz.build +++ b/third_party/libwebrtc/third_party/abseil-cpp/absl/types/variant_gn/moz.build @@ -53,7 +53,6 @@ if CONFIG["OS_TARGET"] == "Linux": diff --git a/librewolf/debian/patches/fixes/Bug-1756347-part-1-Work-around-a-GCC-issue-with-gene.patch b/librewolf/debian/patches/fixes/Bug-1756347-part-1-Work-around-a-GCC-issue-with-gene.patch deleted file mode 100644 index 52daa27..0000000 --- a/librewolf/debian/patches/fixes/Bug-1756347-part-1-Work-around-a-GCC-issue-with-gene.patch +++ /dev/null @@ -1,235 +0,0 @@ -From: Jan de Mooij -Date: Mon, 28 Feb 2022 14:50:25 +0000 -Subject: Bug 1756347 part 1 - Work around a GCC issue with generated atomics. - r=lth - -Use MOZ_NEVER_INLINE for GCC x86-32. It seems to run out of byte registers when -inlining these functions. - -Differential Revision: https://phabricator.services.mozilla.com/D139703 ---- - js/src/jit/GenerateAtomicOperations.py | 52 +++++++++++++++----------- - 1 file changed, 30 insertions(+), 22 deletions(-) - -diff --git a/js/src/jit/GenerateAtomicOperations.py b/js/src/jit/GenerateAtomicOperations.py -index dbde8d8..08dd562 100644 ---- a/js/src/jit/GenerateAtomicOperations.py -+++ b/js/src/jit/GenerateAtomicOperations.py -@@ -10,6 +10,7 @@ import buildconfig - - is_64bit = "JS_64BIT" in buildconfig.defines - cpu_arch = buildconfig.substs["CPU_ARCH"] -+is_gcc = buildconfig.substs["CC_TYPE"] == "gcc" - - - def fmt_insn(s): -@@ -19,21 +20,21 @@ def fmt_insn(s): - def gen_seqcst(fun_name): - if cpu_arch in ("x86", "x86_64"): - return r""" -- inline void %(fun_name)s() { -+ INLINE_ATTR void %(fun_name)s() { - asm volatile ("mfence\n\t" ::: "memory"); - }""" % { - "fun_name": fun_name, - } - if cpu_arch == "aarch64": - return r""" -- inline void %(fun_name)s() { -+ INLINE_ATTR void %(fun_name)s() { - asm volatile ("dmb ish\n\t" ::: "memory"); - }""" % { - "fun_name": fun_name, - } - if cpu_arch == "arm": - return r""" -- inline void %(fun_name)s() { -+ INLINE_ATTR void %(fun_name)s() { - asm volatile ("dmb sy\n\t" ::: "memory"); - }""" % { - "fun_name": fun_name, -@@ -63,7 +64,7 @@ def gen_load(fun_name, cpp_type, size, barrier): - if barrier: - insns += fmt_insn("mfence") - return """ -- inline %(cpp_type)s %(fun_name)s(const %(cpp_type)s* arg) { -+ INLINE_ATTR %(cpp_type)s %(fun_name)s(const %(cpp_type)s* arg) { - %(cpp_type)s res; - asm volatile (%(insns)s - : [res] "=r" (res) -@@ -91,7 +92,7 @@ def gen_load(fun_name, cpp_type, size, barrier): - if barrier: - insns += fmt_insn("dmb ish") - return """ -- inline %(cpp_type)s %(fun_name)s(const %(cpp_type)s* arg) { -+ INLINE_ATTR %(cpp_type)s %(fun_name)s(const %(cpp_type)s* arg) { - %(cpp_type)s res; - asm volatile (%(insns)s - : [res] "=r" (res) -@@ -117,7 +118,7 @@ def gen_load(fun_name, cpp_type, size, barrier): - if barrier: - insns += fmt_insn("dmb sy") - return """ -- inline %(cpp_type)s %(fun_name)s(const %(cpp_type)s* arg) { -+ INLINE_ATTR %(cpp_type)s %(fun_name)s(const %(cpp_type)s* arg) { - %(cpp_type)s res; - asm volatile (%(insns)s - : [res] "=r" (res) -@@ -154,7 +155,7 @@ def gen_store(fun_name, cpp_type, size, barrier): - if barrier: - insns += fmt_insn("mfence") - return """ -- inline void %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) { -+ INLINE_ATTR void %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) { - asm volatile (%(insns)s - : - : [addr] "r" (addr), [val] "r"(val) -@@ -180,7 +181,7 @@ def gen_store(fun_name, cpp_type, size, barrier): - if barrier: - insns += fmt_insn("dmb ish") - return """ -- inline void %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) { -+ INLINE_ATTR void %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) { - asm volatile (%(insns)s - : - : [addr] "r" (addr), [val] "r"(val) -@@ -204,7 +205,7 @@ def gen_store(fun_name, cpp_type, size, barrier): - if barrier: - insns += fmt_insn("dmb sy") - return """ -- inline void %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) { -+ INLINE_ATTR void %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) { - asm volatile (%(insns)s - : - : [addr] "r" (addr), [val] "r"(val) -@@ -235,7 +236,7 @@ def gen_exchange(fun_name, cpp_type, size): - assert size == 64 - insns += fmt_insn("xchgq %[val], (%[addr])") - return """ -- inline %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) { -+ INLINE_ATTR %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) { - asm volatile (%(insns)s - : [val] "+r" (val) - : [addr] "r" (addr) -@@ -266,7 +267,7 @@ def gen_exchange(fun_name, cpp_type, size): - insns += fmt_insn("cbnz %w[scratch], 0b") - insns += fmt_insn("dmb ish") - return """ -- inline %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) { -+ INLINE_ATTR %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) { - %(cpp_type)s res; - uint32_t scratch; - asm volatile (%(insns)s -@@ -297,7 +298,7 @@ def gen_exchange(fun_name, cpp_type, size): - insns += fmt_insn("beq 0b") - insns += fmt_insn("dmb sy") - return """ -- inline %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) { -+ INLINE_ATTR %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) { - %(cpp_type)s res; - uint32_t scratch; - asm volatile (%(insns)s -@@ -321,7 +322,7 @@ def gen_cmpxchg(fun_name, cpp_type, size): - # Use a +A constraint to load `oldval` into EDX:EAX as input/output. - # `newval` is loaded into ECX:EBX. - return r""" -- inline %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, -+ INLINE_ATTR %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, - %(cpp_type)s oldval, - %(cpp_type)s newval) { - asm volatile ("lock; cmpxchg8b (%%[addr])\n\t" -@@ -337,7 +338,7 @@ def gen_cmpxchg(fun_name, cpp_type, size): - } - if cpu_arch == "arm" and size == 64: - return r""" -- inline %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, -+ INLINE_ATTR %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, - %(cpp_type)s oldval, - %(cpp_type)s newval) { - uint32_t oldval0 = oldval & 0xffff'ffff; -@@ -380,7 +381,7 @@ def gen_cmpxchg(fun_name, cpp_type, size): - assert size == 64 - insns += fmt_insn("lock; cmpxchgq %[newval], (%[addr])") - return """ -- inline %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, -+ INLINE_ATTR %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, - %(cpp_type)s oldval, - %(cpp_type)s newval) { - asm volatile (%(insns)s -@@ -425,7 +426,7 @@ def gen_cmpxchg(fun_name, cpp_type, size): - insns += fmt_insn("cbnz %w[scratch], 0b") - insns += fmt_insn("1: dmb ish") - return """ -- inline %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, -+ INLINE_ATTR %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, - %(cpp_type)s oldval, - %(cpp_type)s newval) { - %(cpp_type)s res, scratch; -@@ -466,7 +467,7 @@ def gen_cmpxchg(fun_name, cpp_type, size): - insns += fmt_insn("beq 0b") - insns += fmt_insn("1: dmb sy") - return """ -- inline %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, -+ INLINE_ATTR %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, - %(cpp_type)s oldval, - %(cpp_type)s newval) { - %(cpp_type)s res, scratch; -@@ -501,7 +502,7 @@ def gen_fetchop(fun_name, cpp_type, size, op): - assert size == 64 - insns += fmt_insn("lock; xaddq %[val], (%[addr])") - return """ -- inline %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) { -+ INLINE_ATTR %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) { - asm volatile (%(insns)s - : [val] "+&r" (val) - : [addr] "r" (addr) -@@ -539,7 +540,7 @@ def gen_fetchop(fun_name, cpp_type, size, op): - insns = insns.replace("OP", op) - insns += fmt_insn("jnz 0b") - return """ -- inline %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) { -+ INLINE_ATTR %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) { - %(cpp_type)s res, scratch; - asm volatile (%(insns)s - : [res] "=&a" (res), [scratch] "=&r" (scratch) -@@ -581,7 +582,7 @@ def gen_fetchop(fun_name, cpp_type, size, op): - insns += fmt_insn("cbnz %w[scratch2], 0b") - insns += fmt_insn("dmb ish") - return """ -- inline %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) { -+ INLINE_ATTR %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) { - %(cpp_type)s res; - uintptr_t scratch1, scratch2; - asm volatile (%(insns)s -@@ -621,7 +622,7 @@ def gen_fetchop(fun_name, cpp_type, size, op): - insns += fmt_insn("beq 0b") - insns += fmt_insn("dmb sy") - return """ -- inline %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) { -+ INLINE_ATTR %(cpp_type)s %(fun_name)s(%(cpp_type)s* addr, %(cpp_type)s val) { - %(cpp_type)s res; - uintptr_t scratch1, scratch2; - asm volatile (%(insns)s -@@ -681,7 +682,7 @@ def gen_copy(fun_name, cpp_type, size, unroll, direction): - offset -= 1 - - return """ -- inline void %(fun_name)s(uint8_t* dst, const uint8_t* src) { -+ INLINE_ATTR void %(fun_name)s(uint8_t* dst, const uint8_t* src) { - %(cpp_type)s* dst_ = reinterpret_cast<%(cpp_type)s*>(dst); - const %(cpp_type)s* src_ = reinterpret_cast(src); - %(cpp_type)s scratch; -@@ -853,6 +854,13 @@ def generate_atomics_header(c_out): - "constexpr size_t JS_GENERATED_ATOMICS_WORDSIZE = " + str(wordsize) + ";\n" - ) - -+ # Work around a GCC issue on 32-bit x86 by adding MOZ_NEVER_INLINE. -+ # See bug 1756347. -+ if is_gcc and cpu_arch == "x86": -+ contents = contents.replace("INLINE_ATTR", "MOZ_NEVER_INLINE inline") -+ else: -+ contents = contents.replace("INLINE_ATTR", "inline") -+ - c_out.write( - HEADER_TEMPLATE - % { diff --git a/librewolf/debian/patches/librewolf/aboutLogos.patch b/librewolf/debian/patches/librewolf/aboutLogos.patch new file mode 100644 index 0000000..6584e40 --- /dev/null +++ b/librewolf/debian/patches/librewolf/aboutLogos.patch @@ -0,0 +1,17 @@ +--- a/browser/base/jar.mn ++++ b/browser/base/jar.mn +@@ -97,6 +97,14 @@ browser.jar: + #endif + content/browser/webrtcIndicator.xhtml (content/webrtcIndicator.xhtml) + content/browser/webrtcIndicator.js (content/webrtcIndicator.js) ++ content/browser/aboutLogos/0.png (content/aboutLogos/0.png) ++ content/browser/aboutLogos/1.png (content/aboutLogos/1.png) ++ content/browser/aboutLogos/2.png (content/aboutLogos/2.png) ++ content/browser/aboutLogos/3.png (content/aboutLogos/3.png) ++ content/browser/aboutLogos/4.png (content/aboutLogos/4.png) ++ content/browser/aboutLogos/5.png (content/aboutLogos/5.png) ++ content/browser/aboutLogos/6.png (content/aboutLogos/6.png) ++ content/browser/aboutLogos/original.svg (content/aboutLogos/original.svg) + # the following files are browser-specific overrides + * content/browser/license.html (/toolkit/content/license.html) + % override chrome://global/content/license.html chrome://browser/content/license.html diff --git a/librewolf/debian/patches/librewolf/bootstrap-without-vcs.patch b/librewolf/debian/patches/librewolf/bootstrap-without-vcs.patch new file mode 100644 index 0000000..d213d70 --- /dev/null +++ b/librewolf/debian/patches/librewolf/bootstrap-without-vcs.patch @@ -0,0 +1,125 @@ +diff --git a/python/mozboot/mozboot/bootstrap.py b/python/mozboot/mozboot/bootstrap.py +index 0c5ecbf..d9a6d9d 100644 +--- a/python/mozboot/mozboot/bootstrap.py ++++ b/python/mozboot/mozboot/bootstrap.py +@@ -550,10 +550,7 @@ def current_firefox_checkout(env, hg: Optional[Path] = None): + break + path = path.parent + +- raise UserError( +- "Could not identify the root directory of your checkout! " +- "Are you running `mach bootstrap` in an hg or git clone?" +- ) ++ return ("local", Path.cwd()) + + + def update_git_tools(git: Optional[Path], root_state_dir: Path): +diff --git a/python/mozversioncontrol/mozversioncontrol/__init__.py b/python/mozversioncontrol/mozversioncontrol/__init__.py +index dd31f53..6f0087a 100644 +--- a/python/mozversioncontrol/mozversioncontrol/__init__.py ++++ b/python/mozversioncontrol/mozversioncontrol/__init__.py +@@ -684,6 +684,29 @@ class GitRepository(Repository): + self._run("config", name, value) + + ++class LocalRepository(Repository): ++ ++ def __init__(self, path): ++ super(LocalRepository, self).__init__(path, tool="true") ++ ++ @property ++ def head_ref(self): ++ return "" ++ ++ def get_outgoing_files(self): ++ return [] ++ ++ def get_changed_files(self): ++ return [] ++ ++ def get_tracked_files_finder(self): ++ files = [os.path.relpath(os.path.join(dp, f), self.path).replace("\\","/") for dp, dn, fn in os.walk(self.path) for f in fn] ++ files.sort() ++ return FileListFinder(files) ++ ++ ++ ++ + def get_repository_object(path: Optional[Union[str, Path]], hg="hg", git="git"): + """Get a repository object for the repository at `path`. + If `path` is not a known VCS repository, raise an exception. +@@ -697,7 +720,7 @@ def get_repository_object(path: Optional[Union[str, Path]], hg="hg", git="git"): + elif (path / ".git").exists(): + return GitRepository(path, git=git) + else: +- raise InvalidRepoPath(f"Unknown VCS, or not a source checkout: {path}") ++ return LocalRepository(path) + + + def get_repository_from_build_config(config): +@@ -721,6 +744,8 @@ def get_repository_from_build_config(config): + return HgRepository(Path(config.topsrcdir), hg=config.substs["HG"]) + elif flavor == "git": + return GitRepository(Path(config.topsrcdir), git=config.substs["GIT"]) ++ elif flavor == "local": ++ return LocalRepository(config.topsrcdir) + else: + raise MissingVCSInfo("unknown VCS_CHECKOUT_TYPE value: %s" % flavor) + +diff --git a/third_party/python/taskcluster_taskgraph/taskgraph/util/vcs.py b/third_party/python/taskcluster_taskgraph/taskgraph/util/vcs.py +index 016578b..7525139 100644 +--- a/third_party/python/taskcluster_taskgraph/taskgraph/util/vcs.py ++++ b/third_party/python/taskcluster_taskgraph/taskgraph/util/vcs.py +@@ -168,6 +168,43 @@ class GitRepository(Repository): + self.run("checkout", ref) + + ++class LocalRepository(Repository): ++ tool = "true" ++ ++ @property ++ def head_ref(self): ++ return "" ++ ++ def get_outgoing_files(self): ++ return [] ++ ++ def get_changed_files(self): ++ return [] ++ ++ def base_ref(self): ++ raise Exception("Unimplemented") ++ ++ def branch(self): ++ raise Exception("Unimplemented") ++ ++ def get_commit_message(self): ++ raise Exception("Unimplemented") ++ ++ def get_url(self): ++ return "" ++ ++ def update(self): ++ raise Exception("Unimplemented") ++ ++ def working_directory_clean(self): ++ raise Exception("Unimplemented") ++ ++ def get_tracked_files_finder(self): ++ files = [os.path.relpath(os.path.join(dp, f), self.path).replace("\\","/") for dp, dn, fn in os.walk(self.path) for f in fn] ++ files.sort() ++ return FileListFinder(files) ++ ++ + def get_repository(path): + """Get a repository object for the repository at `path`. + If `path` is not a known VCS repository, raise an exception. +@@ -178,7 +215,7 @@ def get_repository(path): + elif os.path.exists(os.path.join(path, ".git")): + return GitRepository(path) + +- raise RuntimeError("Current directory is neither a git or hg repository") ++ return LocalRepository(path) + + + def find_hg_revision_push_info(repository, revision): diff --git a/librewolf/debian/patches/librewolf/bootstrap-without-vcs2.patch b/librewolf/debian/patches/librewolf/bootstrap-without-vcs2.patch deleted file mode 100644 index 6bedf32..0000000 --- a/librewolf/debian/patches/librewolf/bootstrap-without-vcs2.patch +++ /dev/null @@ -1,69 +0,0 @@ -diff --git a/python/mozboot/mozboot/bootstrap.py b/python/mozboot/mozboot/bootstrap.py -index b0d6965..8ea2e15 100644 ---- a/python/mozboot/mozboot/bootstrap.py -+++ b/python/mozboot/mozboot/bootstrap.py -@@ -549,10 +549,8 @@ def current_firefox_checkout(env, hg: Optional[Path] = None): - if not len(path.parents): - break - -- raise UserError( -- "Could not identify the root directory of your checkout! " -- "Are you running `mach bootstrap` in an hg or git clone?" -- ) -+ return ("local", os.getcwd()) -+ - - - def update_git_tools(git: Optional[Path], root_state_dir: Path): -diff --git a/python/mozversioncontrol/mozversioncontrol/__init__.py b/python/mozversioncontrol/mozversioncontrol/__init__.py -index dd31f53..6f0087a 100644 ---- a/python/mozversioncontrol/mozversioncontrol/__init__.py -+++ b/python/mozversioncontrol/mozversioncontrol/__init__.py -@@ -684,6 +684,29 @@ class GitRepository(Repository): - self._run("config", name, value) - - -+class LocalRepository(Repository): -+ -+ def __init__(self, path): -+ super(LocalRepository, self).__init__(path, tool="true") -+ -+ @property -+ def head_ref(self): -+ return "" -+ -+ def get_outgoing_files(self): -+ return [] -+ -+ def get_changed_files(self): -+ return [] -+ -+ def get_tracked_files_finder(self): -+ files = [os.path.relpath(os.path.join(dp, f), self.path).replace("\\","/") for dp, dn, fn in os.walk(self.path) for f in fn] -+ files.sort() -+ return FileListFinder(files) -+ -+ -+ -+ - def get_repository_object(path: Optional[Union[str, Path]], hg="hg", git="git"): - """Get a repository object for the repository at `path`. - If `path` is not a known VCS repository, raise an exception. -@@ -697,7 +720,7 @@ def get_repository_object(path: Optional[Union[str, Path]], hg="hg", git="git"): - elif (path / ".git").exists(): - return GitRepository(path, git=git) - else: -- raise InvalidRepoPath(f"Unknown VCS, or not a source checkout: {path}") -+ return LocalRepository(path) - - - def get_repository_from_build_config(config): -@@ -721,6 +744,8 @@ def get_repository_from_build_config(config): - return HgRepository(Path(config.topsrcdir), hg=config.substs["HG"]) - elif flavor == "git": - return GitRepository(Path(config.topsrcdir), git=config.substs["GIT"]) -+ elif flavor == "local": -+ return LocalRepository(config.topsrcdir) - else: - raise MissingVCSInfo("unknown VCS_CHECKOUT_TYPE value: %s" % flavor) - diff --git a/librewolf/debian/patches/librewolf/context-menu.patch b/librewolf/debian/patches/librewolf/context-menu.patch index 5685f96..da19aa6 100644 --- a/librewolf/debian/patches/librewolf/context-menu.patch +++ b/librewolf/debian/patches/librewolf/context-menu.patch @@ -1,12 +1,8 @@ diff --git a/browser/base/content/browser-context.inc b/browser/base/content/browser-context.inc +index 39a139f..c565bce 100644 --- a/browser/base/content/browser-context.inc +++ b/browser/base/content/browser-context.inc -@@ -102,19 +102,16 @@ - oncommand="gContextMenu.openLinkInPrivateWindow();"/> - - +@@ -100,9 +100,6 @@ @@ -16,17 +12,7 @@ diff --git a/browser/base/content/browser-context.inc b/browser/base/content/bro - - - #endif +@@ -256,9 +253,6 @@ @@ -36,8 +22,3 @@ diff --git a/browser/base/content/browser-context.inc b/browser/base/content/bro -