caio.co/de/arch/firefox

Merge remote-tracking branch 'upstream/main'

Id
8f95379d2227e91ac2cbc7e53c33a0c5dc970549
Author
Caio
Commit time
2024-05-27T07:39:50+02:00

Modified .SRCINFO

@@ -1,7 +1,7
pkgbase = firefox
pkgdesc = Standalone web browser from mozilla.org
- pkgver = 125.0.3
- pkgrel = 2
+ pkgver = 126.0
+ pkgrel = 1
url = https://www.mozilla.org/firefox/
arch = x86_64
license = MPL-2.0
@@ -26,39 +26,58
makedepends = xorg-server-xvfb
makedepends = yasm
makedepends = zip
+ depends = alsa-lib
+ depends = at-spi2-core
+ depends = bash
+ depends = cairo
depends = dbus
depends = ffmpeg
+ depends = fontconfig
+ depends = freetype2
+ depends = gcc-libs
+ depends = gdk-pixbuf2
+ depends = glib2
+ depends = glibc
depends = gtk3
+ depends = hicolor-icon-theme
depends = libpulse
+ depends = libx11
+ depends = libxcb
+ depends = libxcomposite
+ depends = libxdamage
+ depends = libxext
+ depends = libxfixes
+ depends = libxrandr
depends = libxss
depends = libxt
depends = mime-types
+ depends = nspr
depends = nss
+ depends = pango
depends = ttf-font
optdepends = hunspell-en_US: Spell checking, American English
optdepends = libnotify: Notification integration
optdepends = networkmanager: Location detection via available WiFi networks
- optdepends = pulseaudio: Audio support
optdepends = speech-dispatcher: Text-to-Speech
optdepends = xdg-desktop-portal: Screensharing with Wayland
options = !emptydirs
options = !lto
options = !makeflags
- source = https://archive.mozilla.org/pub/firefox/releases/125.0.3/source/firefox-125.0.3.source.tar.xz
- source = https://archive.mozilla.org/pub/firefox/releases/125.0.3/source/firefox-125.0.3.source.tar.xz.asc
+ source = https://archive.mozilla.org/pub/firefox/releases/126.0/source/firefox-126.0.source.tar.xz
+ source = https://archive.mozilla.org/pub/firefox/releases/126.0/source/firefox-126.0.source.tar.xz.asc
source = firefox.desktop
source = identity-icons-brand.svg
source = 0001-Bug-1882209-Update-encoding_rs-to-0.8.34-to-deal-wit.patch
validpgpkeys = 14F26682D0916CDD81E37B6D61B7B526D98F0353
- sha256sums = 461c66b85e4a0345dcce422d3b66212489f3cca8f22a9a8f43a07a0c98bd5616
+ sha256sums = 910e82a1999ec229e5bc5090a39cec9c575e8bafcac2c54f9bb5c699bd868526
sha256sums = SKIP
sha256sums = 1f241fdc619f92a914c75aece7c7c717401d7467c9a306458e106b05f34e5044
sha256sums = a9b8b4a0a1f4a7b4af77d5fc70c2686d624038909263c795ecc81e0aec7711e9
- sha256sums = 61243b704cc8340af9991580c744c412d94244f4bedcdcd5f351e63484ab638e
- b2sums = a8379eda733981158248134183a11c7fa4a2de7952a43b861e653a0d7c48743442c26312419ad85be2a5e8f242d23dda03ea1aa5041916a3e44d06926a8c1342
+ sha256sums = 22c030ef8a047802ae56d20b1c2a6a3830e9a5ac4e5399163a2b57a1c09a20b2
+ b2sums = 9f40424502ccf7516b8b1142372ff816986c07646e88b3e69ca1a6a5173166a3b6c37696c99fbbaece23d01af51a76e56c19df3babc7af4e5d13e5821262ad1b
b2sums = SKIP
b2sums = d07557840097dd48a60c51cc5111950781e1c6ce255557693bd11306c7a9258b2a82548329762148f117b2295145f9e66e0483a18e2fe09c5afcffed2e4b8628
b2sums = 63a8dd9d8910f9efb353bed452d8b4b2a2da435857ccee083fc0c557f8c4c1339ca593b463db320f70387a1b63f1a79e709e9d12c69520993e26d85a3d742e34
- b2sums = f2028ff4479d781393a5650ed907f30ef3d936c132d1f555d62f7e2d99056ec72cfe98f856069fc9bc34580cffdb157aec7265356cdf5a4d515346c416267e38
+ b2sums = 6b8b6fe5d658fd76844fc1d9f47b3892bcb5a59a8d10baabf7d52fb4f7c9e8f4858576859390e6d4c542d46cabb335cd06f8c4a80a7d5dde0868b29cd048d308

pkgname = firefox

Modified 0001-Bug-1882209-Update-encoding_rs-to-0.8.34-to-deal-wit.patch

@@ -6,7 +6,7

Differential Revision: https://phabricator.services.mozilla.com/D207167
---
- .cargo/config.in | 5 +
+ .cargo/config.toml.in | 5 +
Cargo.lock | 25 +-
Cargo.toml | 1 +
config/makefiles/rust.mk | 2 +-
@@ -461,10 +461,10
delete mode 100644 third_party/rust/packed_simd/src/vSize.rs
delete mode 100644 third_party/rust/packed_simd/tests/endianness.rs

-diff --git a/.cargo/config.in b/.cargo/config.in
-index e6e68158d8e2..c4e4794ee3a5 100644
---- a/.cargo/config.in
-+++ b/.cargo/config.in
+diff --git a/.cargo/config.toml.in b/.cargo/config.toml.in
+index 637289358704..697280c2d014 100644
+--- a/.cargo/config.toml.in
++++ b/.cargo/config.toml.in
@@ -35,6 +35,11 @@ git = "https://github.com/glandium/mio"
rev = "9a2ef335c366044ffe73b1c4acabe50a1daefe05"
replace-with = "vendored-sources"
@@ -478,7 +478,7
git = "https://github.com/hsivonen/chardetng"
rev = "3484d3e3ebdc8931493aa5df4d7ee9360a90e76b"
diff --git a/Cargo.lock b/Cargo.lock
-index 7242103ecefb..0af1e758a6a6 100644
+index 94e73e2fc6ac..b61ecc8f525a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -91,6 +91,15 @@ version = "1.0.3"
@@ -497,7 +497,7
[[package]]
name = "anyhow"
version = "1.0.69"
-@@ -1514,12 +1523,12 @@ dependencies = [
+@@ -1575,12 +1584,12 @@ dependencies = [

[[package]]
name = "encoding_rs"
@@ -513,7 +513,7
]

[[package]]
-@@ -4260,16 +4269,6 @@ dependencies = [
+@@ -4332,16 +4341,6 @@ dependencies = [
"oxilangtag",
]

@@ -531,10 +531,10
name = "parking_lot"
version = "0.12.1"
diff --git a/Cargo.toml b/Cargo.toml
-index dd0ed4f7c2db..8e878b6ef6b8 100644
+index e3936430f963..1f5aeb3c6a9e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
-@@ -192,6 +192,7 @@ cssparser-macros = { git = "https://github.com/servo/rust-cssparser", rev = "aaa
+@@ -200,6 +200,7 @@ cssparser-macros = { git = "https://github.com/servo/rust-cssparser", rev = "aaa
unicode-bidi = { git = "https://github.com/servo/unicode-bidi", rev = "ca612daf1c08c53abe07327cb3e6ef6e0a760f0c" }

# Other overrides
@@ -543,10 +543,10
chardetng_c = { git = "https://github.com/hsivonen/chardetng_c", rev = "ed8a4c6f900a90d4dbc1d64b856e61490a1c3570" }
coremidi = { git = "https://github.com/chris-zen/coremidi.git", rev = "fc68464b5445caf111e41f643a2e69ccce0b4f83" }
diff --git a/config/makefiles/rust.mk b/config/makefiles/rust.mk
-index b10594f5cb8f..0df4742f6f26 100644
+index 52c4e402f9d1..4b36aa99bc29 100644
--- a/config/makefiles/rust.mk
+++ b/config/makefiles/rust.mk
-@@ -263,7 +263,7 @@ endif
+@@ -265,7 +265,7 @@ endif
ifndef RUSTC_BOOTSTRAP
RUSTC_BOOTSTRAP := mozglue_static,qcms
ifdef MOZ_RUST_SIMD
@@ -556,7 +556,7
export RUSTC_BOOTSTRAP
endif
diff --git a/supply-chain/audits.toml b/supply-chain/audits.toml
-index 31ca3fcf0f48..5c769de04515 100644
+index b21bde4f1024..163f1f5c98e8 100644
--- a/supply-chain/audits.toml
+++ b/supply-chain/audits.toml
@@ -588,6 +588,19 @@ who = "Mike Hommey <mh+mozilla@glandium.org>"
@@ -580,7 +580,7
who = "Mike Hommey <mh+mozilla@glandium.org>"
criteria = "safe-to-deploy"
diff --git a/supply-chain/config.toml b/supply-chain/config.toml
-index 2692f61bc2d0..0077f236e6df 100644
+index 20b62a8210e1..be8809bff543 100644
--- a/supply-chain/config.toml
+++ b/supply-chain/config.toml
@@ -19,6 +19,10 @@ url = "https://raw.githubusercontent.com/divviup/libprio-rs/main/supply-chain/au
@@ -595,10 +595,10
audit-as-crates-io = true
notes = "This is the upstream code plus a few local fixes, see bug 1685697."
diff --git a/supply-chain/imports.lock b/supply-chain/imports.lock
-index 5913bc8915a3..6407dbc99127 100644
+index 73065c6c4fc2..73f667de2368 100644
--- a/supply-chain/imports.lock
+++ b/supply-chain/imports.lock
-@@ -176,6 +176,13 @@ user-id = 4484
+@@ -183,6 +183,13 @@ user-id = 4484
user-login = "hsivonen"
user-name = "Henri Sivonen"

Modified PKGBUILD

@@ -1,23 +1,43
# Maintainer: Jan Alexander Steffens (heftig) <heftig@archlinux.org>
# Contributor: Ionut Biru <ibiru@archlinux.org>
# Contributor: Jakub Schmidtke <sjakub@gmail.com>

pkgname=firefox
-pkgver=125.0.3
-pkgrel=2
+pkgver=126.0
+pkgrel=1
pkgdesc="Standalone web browser from mozilla.org"
url="https://www.mozilla.org/firefox/"
arch=(x86_64)
license=(MPL-2.0)
depends=(
+ alsa-lib
+ at-spi2-core
+ bash
+ cairo
dbus
ffmpeg
+ fontconfig
+ freetype2
+ gcc-libs
+ gdk-pixbuf2
+ glib2
+ glibc
gtk3
+ hicolor-icon-theme
libpulse
+ libx11
+ libxcb
+ libxcomposite
+ libxdamage
+ libxext
+ libxfixes
+ libxrandr
libxss
libxt
mime-types
+ nspr
nss
+ pango
ttf-font
)
makedepends=(
@@ -48,7 +68,6
'hunspell-en_US: Spell checking, American English'
'libnotify: Notification integration'
'networkmanager: Location detection via available WiFi networks'
- 'pulseaudio: Audio support'
'speech-dispatcher: Text-to-Speech'
'xdg-desktop-portal: Screensharing with Wayland'
)
@@ -69,18 +88,18
# https://blog.mozilla.org/security/2023/05/11/updated-gpg-key-for-signing-firefox-releases/
14F26682D0916CDD81E37B6D61B7B526D98F0353
)
-sha256sums=('461c66b85e4a0345dcce422d3b66212489f3cca8f22a9a8f43a07a0c98bd5616'
+sha256sums=('910e82a1999ec229e5bc5090a39cec9c575e8bafcac2c54f9bb5c699bd868526'
'SKIP'
'1f241fdc619f92a914c75aece7c7c717401d7467c9a306458e106b05f34e5044'
'a9b8b4a0a1f4a7b4af77d5fc70c2686d624038909263c795ecc81e0aec7711e9'
'b38b8ddea2cef26229e1033b3a8f6b83d0a24652ddedbbdfbda3a9692e1fd24a'
- '61243b704cc8340af9991580c744c412d94244f4bedcdcd5f351e63484ab638e')
-b2sums=('a8379eda733981158248134183a11c7fa4a2de7952a43b861e653a0d7c48743442c26312419ad85be2a5e8f242d23dda03ea1aa5041916a3e44d06926a8c1342'
+ '22c030ef8a047802ae56d20b1c2a6a3830e9a5ac4e5399163a2b57a1c09a20b2')
+b2sums=('9f40424502ccf7516b8b1142372ff816986c07646e88b3e69ca1a6a5173166a3b6c37696c99fbbaece23d01af51a76e56c19df3babc7af4e5d13e5821262ad1b'
'SKIP'
'd07557840097dd48a60c51cc5111950781e1c6ce255557693bd11306c7a9258b2a82548329762148f117b2295145f9e66e0483a18e2fe09c5afcffed2e4b8628'
'63a8dd9d8910f9efb353bed452d8b4b2a2da435857ccee083fc0c557f8c4c1339ca593b463db320f70387a1b63f1a79e709e9d12c69520993e26d85a3d742e34'
'a22eaee217be2ca5cf79ebb7f874643a4c956593e25ba8bf282e5b991b5d1cea6fc317248a8bdbd81b05591b22635e13742f180d278f99b04a442d8e35525686'
- 'f2028ff4479d781393a5650ed907f30ef3d936c132d1f555d62f7e2d99056ec72cfe98f856069fc9bc34580cffdb157aec7265356cdf5a4d515346c416267e38')
+ '6b8b6fe5d658fd76844fc1d9f47b3892bcb5a59a8d10baabf7d52fb4f7c9e8f4858576859390e6d4c542d46cabb335cd06f8c4a80a7d5dde0868b29cd048d308')

# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
# Note: These are for Arch Linux use ONLY. For your own distribution, please
@@ -161,6 +180,10
CFLAGS="${CFLAGS/_FORTIFY_SOURCE=3/_FORTIFY_SOURCE=2}"
CXXFLAGS="${CXXFLAGS/_FORTIFY_SOURCE=3/_FORTIFY_SOURCE=2}"

+ # Breaks compilation since https://bugzilla.mozilla.org/show_bug.cgi?id=1896066
+ CFLAGS="${CFLAGS/-fexceptions/}"
+ CXXFLAGS="${CXXFLAGS/-fexceptions/}"
+
# LTO needs more open files
ulimit -n 4096

@@ -189,6 +212,9
// Don't disable extensions in the application directory
pref("extensions.autoDisableScopes", 11);

+// Enable GNOME Shell search provider
+pref("browser.gnome-search-provider.enabled", true);
+
// Patch leaves the setting as off by default
pref("browser.sessionstore.always_restore_tabs", true);
END
@@ -198,7 +224,7
[Global]
id=archlinux
version=1.0
-about=Mozilla Firefox for Caio
+about=Mozilla Firefox for Arch Linux

[Preferences]
app.distributor=archlinux
@@ -221,7 +247,7
"$pkgdir/usr/share/icons/hicolor/symbolic/apps/$pkgname-symbolic.svg"

install -Dvm644 ../$pkgname.desktop \
- "$pkgdir/usr/share/applications/${pkgname//-/}.desktop"
+ "$pkgdir/usr/share/applications/$pkgname.desktop"

# Install a wrapper to avoid confusion about binary path
install -Dvm755 /dev/stdin "$pkgdir/usr/bin/$pkgname" <<END
@@ -242,9 +268,9
local sprovider="$pkgdir/usr/share/gnome-shell/search-providers/$pkgname.search-provider.ini"
install -Dvm644 /dev/stdin "$sprovider" <<END
[Shell Search Provider]
-DesktopId=${pkgname//-/}.desktop
-BusName=org.mozilla.${pkgname//-/}.SearchProvider
-ObjectPath=/org/mozilla/${pkgname//-/}/SearchProvider
+DesktopId=$pkgname.desktop
+BusName=org.mozilla.${pkgname//-/_}.SearchProvider
+ObjectPath=/org/mozilla/${pkgname//-/_}/SearchProvider
Version=2
END
}

Created .nvchecker.toml

@@ -1,0 +1,4
+[firefox]
+source = "jq"
+url = "https://product-details.mozilla.org/1.0/firefox_versions.json"
+filter = ".LATEST_FIREFOX_VERSION"