diff options
| -rw-r--r-- | .SRCINFO | 23 | ||||
| -rw-r--r-- | 0002-Bug-1694670.-Fix-the-OOB-check-in-write_u32-u16.-r-a.patch | 34 | ||||
| -rw-r--r-- | 0039-bmo-1684261-Fix-build-with-rust-1.50.0.patch | 58 | ||||
| -rw-r--r-- | PKGBUILD | 24 | ||||
| -rw-r--r-- | unity-menubar.patch | 6 |
5 files changed, 62 insertions, 83 deletions
@@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Sun Feb 14 19:31:18 UTC 2021 +# Sat Mar 6 04:43:48 UTC 2021 pkgbase = firefox-kde-opensuse pkgdesc = Standalone web browser from mozilla.org with OpenSUSE patch, integrate better with KDE - pkgver = 85.0.2 + pkgver = 86.0 pkgrel = 1 url = https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox arch = i686 @@ -34,6 +34,7 @@ pkgbase = firefox-kde-opensuse makedepends = python makedepends = python-psutil makedepends = python-zstandard + makedepends = dump_syms makedepends = gcc>=10.2.1 depends = mozilla-common depends = libxt @@ -60,18 +61,18 @@ pkgbase = firefox-kde-opensuse optdepends = networkmanager: Location detection via available WiFi networks optdepends = speech-dispatcher: Text-to-Speech optdepends = pulseaudio: Audio support - provides = firefox=85.0.2 + provides = firefox=86.0 conflicts = firefox options = !emptydirs - source = hg+https://hg.mozilla.org/mozilla-unified#tag=FIREFOX_85_0_2_RELEASE + source = hg+https://hg.mozilla.org/mozilla-unified#tag=FIREFOX_86_0_RELEASE source = mozconfig source = firefox.desktop source = vendor.js source = kde.js - source = firefox-branded-icons-e7e06c9fc570554462a44e58620eb567477bfa89.patch::https://raw.githubusercontent.com/openSUSE/firefox-maintenance/e7e06c9fc570554462a44e58620eb567477bfa89/firefox/firefox-branded-icons.patch - source = firefox-kde-e7e06c9fc570554462a44e58620eb567477bfa89.patch::https://raw.githubusercontent.com/openSUSE/firefox-maintenance/e7e06c9fc570554462a44e58620eb567477bfa89/firefox/firefox-kde.patch - source = mozilla-kde-e7e06c9fc570554462a44e58620eb567477bfa89.patch::https://raw.githubusercontent.com/openSUSE/firefox-maintenance/e7e06c9fc570554462a44e58620eb567477bfa89/mozilla-kde.patch - source = mozilla-nongnome-proxies-e7e06c9fc570554462a44e58620eb567477bfa89.patch::https://raw.githubusercontent.com/openSUSE/firefox-maintenance/e7e06c9fc570554462a44e58620eb567477bfa89/mozilla-nongnome-proxies.patch + source = firefox-branded-icons-9879274865591215e2c87180f1fbaa36d73e88bd.patch::https://raw.githubusercontent.com/openSUSE/firefox-maintenance/9879274865591215e2c87180f1fbaa36d73e88bd/firefox/firefox-branded-icons.patch + source = firefox-kde-9879274865591215e2c87180f1fbaa36d73e88bd.patch::https://raw.githubusercontent.com/openSUSE/firefox-maintenance/9879274865591215e2c87180f1fbaa36d73e88bd/firefox/firefox-kde.patch + source = mozilla-kde-9879274865591215e2c87180f1fbaa36d73e88bd.patch::https://raw.githubusercontent.com/openSUSE/firefox-maintenance/9879274865591215e2c87180f1fbaa36d73e88bd/mozilla-kde.patch + source = mozilla-nongnome-proxies-9879274865591215e2c87180f1fbaa36d73e88bd.patch::https://raw.githubusercontent.com/openSUSE/firefox-maintenance/9879274865591215e2c87180f1fbaa36d73e88bd/mozilla-nongnome-proxies.patch source = unity-menubar.patch source = add_missing_pgo_rule.patch source = pgo_fix_missing_kdejs.patch @@ -86,7 +87,7 @@ pkgbase = firefox-kde-opensuse source = 0024-Fix-building-with-PGO-when-using-GCC.patch source = 0027-LTO-Only-enable-LTO-for-Rust-when-complete-build-use.patch source = 0028-Make-elfhack-use-toolchain.patch - source = 0039-bmo-1684261-Fix-build-with-rust-1.50.0.patch + source = 0002-Bug-1694670.-Fix-the-OOB-check-in-write_u32-u16.-r-a.patch md5sums = SKIP md5sums = 1fd86cc439737c90a5854aab7f85080f md5sums = a26a061efb4def6572d5b319d657f1d6 @@ -96,7 +97,7 @@ pkgbase = firefox-kde-opensuse md5sums = 6976984e1cbf000a6883a18916afc45c md5sums = b9cd675e20aa979b0e96d1497820f999 md5sums = 0a5733b7a457a2786c2dd27626a1bf88 - md5sums = 672a1c8e723126926046d02ae573a6dc + md5sums = 02f72a7f3b628013e93b87d4cd093801 md5sums = fe24f5ea463013bb7f1c12d12dce41b2 md5sums = 3c383d371d7f6ede5983a40310518715 md5sums = 6a1ed12b8dbac57722436a2987e3ea33 @@ -110,7 +111,7 @@ pkgbase = firefox-kde-opensuse md5sums = c8e251f1fc9050cd12173b540baa96f8 md5sums = 72176c9ee7b2ac4f1bb07ff5ee5fe10b md5sums = 07770d558b8999b5793794e1551a1309 - md5sums = 2537c791cbec5055feecc154ffae2c0e + md5sums = 4fa2b662e08d8270e0968366c6d690e1 pkgname = firefox-kde-opensuse diff --git a/0002-Bug-1694670.-Fix-the-OOB-check-in-write_u32-u16.-r-a.patch b/0002-Bug-1694670.-Fix-the-OOB-check-in-write_u32-u16.-r-a.patch new file mode 100644 index 000000000000..8c44bf7c9549 --- /dev/null +++ b/0002-Bug-1694670.-Fix-the-OOB-check-in-write_u32-u16.-r-a.patch @@ -0,0 +1,34 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Jeff Muizelaar <jmuizelaar@mozilla.com> +Date: Thu, 25 Feb 2021 13:18:47 +0000 +Subject: [PATCH] Bug 1694670. Fix the OOB check in write_u32/u16. r=aosmond, + a=RyanVM + +Differential Revision: https://phabricator.services.mozilla.com/D106362 +--- + gfx/qcms/src/iccread.rs | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/gfx/qcms/src/iccread.rs b/gfx/qcms/src/iccread.rs +index 0113e17aff3e6..f1107d50a86b6 100644 +--- a/gfx/qcms/src/iccread.rs ++++ b/gfx/qcms/src/iccread.rs +@@ -229,16 +229,16 @@ fn read_uInt16Number(mem: &mut MemSource, offset: usize) -> uInt16Number { + read_u16(mem, offset) + } + pub fn write_u32(mem: &mut [u8], offset: usize, value: u32) { +- if offset <= mem.len() - std::mem::size_of_val(&value) { ++ if offset > mem.len() - std::mem::size_of_val(&value) { + panic!("OOB"); + } + let mem = mem.as_mut_ptr(); + unsafe { + std::ptr::write_unaligned(mem.add(offset) as *mut u32, cpu_to_be32(value)); + } + } + pub fn write_u16(mem: &mut [u8], offset: usize, value: u16) { +- if offset <= mem.len() - std::mem::size_of_val(&value) { ++ if offset > mem.len() - std::mem::size_of_val(&value) { + panic!("OOB"); + } + let mem = mem.as_mut_ptr(); diff --git a/0039-bmo-1684261-Fix-build-with-rust-1.50.0.patch b/0039-bmo-1684261-Fix-build-with-rust-1.50.0.patch deleted file mode 100644 index 23ffc2233c02..000000000000 --- a/0039-bmo-1684261-Fix-build-with-rust-1.50.0.patch +++ /dev/null @@ -1,58 +0,0 @@ -From bf046309e83d9adea733e48db4fcd96c440b4d9a Mon Sep 17 00:00:00 2001 -From: Thomas Deutschmann <whissi@gentoo.org> -Date: Sun, 14 Feb 2021 14:50:15 +0100 -Subject: [PATCH 39/39] bmo#1684261: Fix build with rust 1.50.0 - -Signed-off-by: Thomas Deutschmann <whissi@gentoo.org> ---- - .cargo/config.in | 2 +- - Cargo.lock | 2 +- - Cargo.toml | 4 ++-- - 3 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/.cargo/config.in b/.cargo/config.in -index 2898d98319..34c05c8b97 100644 ---- a/.cargo/config.in -+++ b/.cargo/config.in -@@ -3,9 +3,9 @@ - # Please do not edit. - - [source."https://github.com/shravanrn/nix/"] --branch = "r0.13.1" - git = "https://github.com/shravanrn/nix/" - replace-with = "vendored-sources" -+rev = "4af6c367603869a30fddb5ffb0aba2b9477ba92e" - - [source."https://github.com/mozilla/neqo"] - git = "https://github.com/mozilla/neqo" -diff --git a/Cargo.lock b/Cargo.lock -index f2195b26d5..bd186c5128 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -3409,7 +3409,7 @@ dependencies = [ - [[package]] - name = "nix" - version = "0.13.1" --source = "git+https://github.com/shravanrn/nix/?branch=r0.13.1#4af6c367603869a30fddb5ffb0aba2b9477ba92e" -+source = "git+https://github.com/shravanrn/nix/?rev=4af6c367603869a30fddb5ffb0aba2b9477ba92e#4af6c367603869a30fddb5ffb0aba2b9477ba92e" - dependencies = [ - "bitflags", - "cc", -diff --git a/Cargo.toml b/Cargo.toml -index eedde9d66e..5ce9a03b2a 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -76,8 +76,8 @@ chardetng = { git = "https://github.com/hsivonen/chardetng", rev="7d5e0608d3e012 - libudev-sys = { path = "dom/webauthn/libudev-sys" } - packed_simd = { git = "https://github.com/hsivonen/packed_simd", rev="0917fe780032a6bbb23d71be545f9c1834128d75" } - rlbox_lucet_sandbox = { git = "https://github.com/PLSysSec/rlbox_lucet_sandbox/", rev="f3cace4fb8b53db0849c62af4fa62bade5a620f7" } --nix = { git = "https://github.com/shravanrn/nix/", branch = "r0.13.1", rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" } --spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu4", rev = "e9eff10f964957e7a001c5f712effe17ce09aa99" } -+nix = { git = "https://github.com/shravanrn/nix/", rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" } -+spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu4" } - # failure's backtrace feature might break our builds, see bug 1608157. - failure = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" } - failure_derive = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" } --- -2.30.1 - @@ -13,7 +13,7 @@ _pgo=true _pkgname=firefox pkgname=$_pkgname-kde-opensuse -pkgver=85.0.2 +pkgver=86.0 pkgrel=1 pkgdesc="Standalone web browser from mozilla.org with OpenSUSE patch, integrate better with KDE" arch=('i686' 'x86_64') @@ -39,7 +39,7 @@ makedepends=('unzip' 'zip' 'diffutils' 'yasm' 'mesa' 'imake' 'xorg-server-xvfb' 'libpulse' 'inetutils' 'autoconf2.13' 'cargo' 'mercurial' 'llvm' 'clang' 'rust' 'jack' 'gtk2' 'nodejs' 'cbindgen' 'nasm' 'xz' - 'python' 'python-psutil' 'python-zstandard') + 'python' 'python-psutil' 'python-zstandard' 'dump_syms') if [ $_pgo ] ; then @@ -54,7 +54,7 @@ optdepends=('networkmanager: Location detection via available WiFi networks' 'pulseaudio: Audio support') provides=("firefox=${pkgver}") conflicts=('firefox') -_patchrev=e7e06c9fc570554462a44e58620eb567477bfa89 +_patchrev=9879274865591215e2c87180f1fbaa36d73e88bd options=('!emptydirs') _patchurl=https://raw.githubusercontent.com/openSUSE/firefox-maintenance/$_patchrev _repo=https://hg.mozilla.org/mozilla-unified @@ -98,11 +98,12 @@ source=("hg+$_repo#tag=FIREFOX_${pkgver//./_}_RELEASE" 0024-Fix-building-with-PGO-when-using-GCC.patch 0027-LTO-Only-enable-LTO-for-Rust-when-complete-build-use.patch 0028-Make-elfhack-use-toolchain.patch - # Fix MOZILLA#1684261 - # "Fix build with Rust nightly" - # https://bugzilla.mozilla.org/show_bug.cgi?id=1684261 - 0039-bmo-1684261-Fix-build-with-rust-1.50.0.patch # end + # Fix MOZILLA#1694670 + # "Linux startup crash in [@ qcms_data_create_rgb_with_gamma]" + # https://bugzilla.mozilla.org/show_bug.cgi?id=1694670 + # https://bugs.archlinux.org/task/69821 + 0002-Bug-1694670.-Fix-the-OOB-check-in-write_u32-u16.-r-a.patch ) # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys) @@ -157,8 +158,9 @@ prepare() { # Force disable elfhack to fix build errors patch -Np1 -i "$srcdir"/build-disable-elfhack.patch - # Fix MOZILLA#1684261 - patch -Np1 -i "$srcdir"/0039-bmo-1684261-Fix-build-with-rust-1.50.0.patch + # Fix MOZILLA#1694670 + patch -Np1 -i \ + "$srcdir"/0002-Bug-1694670.-Fix-the-OOB-check-in-write_u32-u16.-r-a.patch if [ $_pgo ] ; then # Fix MOZILLA#1516803 @@ -277,7 +279,7 @@ md5sums=('SKIP' '6976984e1cbf000a6883a18916afc45c' 'b9cd675e20aa979b0e96d1497820f999' '0a5733b7a457a2786c2dd27626a1bf88' - '672a1c8e723126926046d02ae573a6dc' + '02f72a7f3b628013e93b87d4cd093801' 'fe24f5ea463013bb7f1c12d12dce41b2' '3c383d371d7f6ede5983a40310518715' '6a1ed12b8dbac57722436a2987e3ea33' @@ -291,4 +293,4 @@ md5sums=('SKIP' 'c8e251f1fc9050cd12173b540baa96f8' '72176c9ee7b2ac4f1bb07ff5ee5fe10b' '07770d558b8999b5793794e1551a1309' - '2537c791cbec5055feecc154ffae2c0e') + '4fa2b662e08d8270e0968366c6d690e1') diff --git a/unity-menubar.patch b/unity-menubar.patch index bafed92b4c8a..7e6104b5fd1d 100644 --- a/unity-menubar.patch +++ b/unity-menubar.patch @@ -5153,9 +5153,9 @@ # END ATOMS -] + HTML_PARSER_ATOMS +] + HTML_PARSER_ATOMS + NATIVE_MENU_ATOMS + # fmt: on - def verify(): --- a/widget/gtk/components.conf +++ b/widget/gtk/components.conf @@ -82,6 +82,14 @@ Classes = [ @@ -5176,8 +5176,8 @@ --- a/xpfe/appshell/AppWindow.cpp +++ b/xpfe/appshell/AppWindow.cpp @@ -76,7 +76,7 @@ - # include "mozilla/XULStore.h" - #endif + + #include "mozilla/dom/DocumentL10n.h" -#ifdef XP_MACOSX +#if defined(XP_MACOSX) || defined(MOZ_WIDGET_GTK) |