Source Mage code commit list

[Pavel Vinogradov <scm AT sourcemage.org>]

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemaage.org>:

 http/firefox/HISTORY                                                         
        |    3 
 http/firefox/patches/0001-Don-t-use-build-id.patch                           
        |    2 
 http/firefox/patches/0002-Fortify-sources-properly.patch                     
        |    2 
 http/firefox/patches/0003-Check-additional-plugins-dir.patch                 
        |    2 
 http/firefox/patches/0004-bmo-847568-Support-system-harfbuzz.patch           
        |    2 
 http/firefox/patches/0005-bmo-847568-Support-system-graphite2.patch          
        |    2 
 http/firefox/patches/0006-bmo-1559213-Support-system-av1.patch               
        |    2 
 http/firefox/patches/0007-Support-sndio-audio-framework.patch                
        |    2 
 http/firefox/patches/0008-bmo-878089-Don-t-fail-when-TERM-is-not-set.patch   
        |    2 
 http/firefox/patches/0009-bmo-1516803-Fix-building-sandbox.patch             
        |    2 
 
http/firefox/patches/0010-Fix-building-spellchecker-when-using-GCC-and-PGO.patch
     |    2 
 
http/firefox/patches/0011-musl-Add-alternate-name-for-private-siginfo-struct-m.patch
 |    2 
 http/firefox/patches/0012-musl-Fix-syscall-wrappers.patch                    
        |    2 
 
http/firefox/patches/0013-musl-Only-use-system-heap-reporter-with-glibc.patch 
       |    2 
 http/firefox/patches/0014-musl-Set-pthread-name-for-non-glibc-systems.patch  
        |    2 
 
http/firefox/patches/0015-musl-getcontext-is-only-avaliable-on-glibc-systems.patch
   |    2 
 
http/firefox/patches/0016-musl-sys-auvx.h-avaliable-on-more-then-just-glibc-sy.patch
 |    2 
 
http/firefox/patches/0017-musl-make-SYS_fork-non-fatal-musl-uses-it-for-fork-2.patch
 |    2 
 
http/firefox/patches/0018-musl-include-net-if.h-before-linux-if.h-to-avoid-red.patch
 |    2 
 http/firefox/patches/0019-Make-PGO-use-toolchain.patch                       
        |    2 
 
http/firefox/patches/0020-bmo-1516081-Disable-watchdog-during-PGO-builds.patch
       |    2 
 
http/firefox/patches/0021-bmo-1516803-force-one-LTO-partition-for-sandbox-when.patch
 |    2 
 http/firefox/patches/0022-bmo-1196777-Set-GDK_FOCUS_CHANGE_MASK.patch        
        |    2 
 http/firefox/patches/0023-Fix-building-with-PGO-when-using-GCC.patch         
        |    2 
 
http/firefox/patches/0024-libaom-Use-NEON_FLAGS-instead-of-VPX_ASFLAGS-for-lib.patch
 |    2 
 http/firefox/patches/0025-build-Disable-Werror.patch                         
        |    2 
 
http/firefox/patches/0026-LTO-Only-enable-LTO-for-Rust-when-complete-build-use.patch
 |    2 
 http/firefox/patches/0027-Make-elfhack-use-toolchain.patch                   
        |    2 
 http/firefox/patches/0028-Disable-FFVPX-with-VA-API.patch                    
        |    2 
 
http/firefox/patches/0029-Enable-FLAC-on-platforms-without-ffvpx-via-ffmpeg.patch
    |    2 
 
http/firefox/patches/0030-bmo-1670333-OpenH264-Fix-decoding-if-it-starts-on-no.patch
 |    2 
 
http/firefox/patches/0031-bmo-1663844-OpenH264-Allow-using-OpenH264-GMP-decode.patch
 |    2 
 
http/firefox/patches/0032-bmo-1745560-Fix-building-against-wayland-1.20.patch 
       |   31 ++++++++++
 33 files changed, 65 insertions(+), 31 deletions(-)

New commits:
commit bc157a583b9e5dc16df1149b164a65d668d5ff09
Author: Pavel Vinogradov <public AT sourcemaage.org>
Commit: Pavel Vinogradov <public AT sourcemaage.org>

    http/firefox: updated patches, fixes building with wayland >= 1.20

diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index b284b7f..0dad977 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,6 @@
+2021-12-20 Pavel Vinogradov <public AT sourcemage.org>
+       * patches/*: updated, fixes building with wayland >= 1.20
+
 2021-12-19 Pavel Vinogradov <public AT sourcemage.org>
        * DETAILS: version 95.0.2
 
diff --git a/http/firefox/patches/0001-Don-t-use-build-id.patch 
b/http/firefox/patches/0001-Don-t-use-build-id.patch
index ad10018..992bd2e 100644
--- a/http/firefox/patches/0001-Don-t-use-build-id.patch
+++ b/http/firefox/patches/0001-Don-t-use-build-id.patch
@@ -1,7 +1,7 @@
 From 5afd7721b1433d1d354abd96e2fdc967fe34f8d7 Mon Sep 17 00:00:00 2001
 From: "Jory A. Pratt" <anarchy AT gentoo.org>
 Date: Mon, 6 Apr 2020 19:14:26 +0200
-Subject: [PATCH 01/31] Don't use build id
+Subject: [PATCH 01/32] Don't use build id
 
 We must drop build id as it causes conflicts when merging
 thunderbird/firefox/seamonkey on same system when using
diff --git a/http/firefox/patches/0002-Fortify-sources-properly.patch 
b/http/firefox/patches/0002-Fortify-sources-properly.patch
index 81d9eb9..98e39fa 100644
--- a/http/firefox/patches/0002-Fortify-sources-properly.patch
+++ b/http/firefox/patches/0002-Fortify-sources-properly.patch
@@ -1,7 +1,7 @@
 From e9f2525adaa1958f048acee2bd873a5c3aaa0c5b Mon Sep 17 00:00:00 2001
 From: "Jory A. Pratt" <anarchy AT gentoo.org>
 Date: Mon, 6 Apr 2020 19:16:36 +0200
-Subject: [PATCH 02/31] Fortify sources properly
+Subject: [PATCH 02/32] Fortify sources properly
 
 Ensure we fortify properly, features.h is pulled in via fortification.
 
diff --git a/http/firefox/patches/0003-Check-additional-plugins-dir.patch 
b/http/firefox/patches/0003-Check-additional-plugins-dir.patch
index 1a3b4ea..c1f2b2c 100644
--- a/http/firefox/patches/0003-Check-additional-plugins-dir.patch
+++ b/http/firefox/patches/0003-Check-additional-plugins-dir.patch
@@ -1,7 +1,7 @@
 From 461b9a82277a8f610642bc1b40ba6d4f8870355b Mon Sep 17 00:00:00 2001
 From: Arfrever Frehtes Taifersar Arahesis <Arfrever AT Apache.Org>
 Date: Mon, 6 Apr 2020 19:17:43 +0200
-Subject: [PATCH 03/31] Check additional plugins dir
+Subject: [PATCH 03/32] Check additional plugins dir
 
 Check original plugins dir along with default plugins dir.
 
diff --git 
a/http/firefox/patches/0004-bmo-847568-Support-system-harfbuzz.patch 
b/http/firefox/patches/0004-bmo-847568-Support-system-harfbuzz.patch
index 65f7d1f..cd5edca 100644
--- a/http/firefox/patches/0004-bmo-847568-Support-system-harfbuzz.patch
+++ b/http/firefox/patches/0004-bmo-847568-Support-system-harfbuzz.patch
@@ -1,7 +1,7 @@
 From 7f2fec622a442d150368b762fbe632580281104e Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi AT gentoo.org>
 Date: Mon, 6 Apr 2020 19:32:39 +0200
-Subject: [PATCH 04/31] bmo#847568: Support system harfbuzz
+Subject: [PATCH 04/32] bmo#847568: Support system harfbuzz
 
 Allow building against system-wide harfbuzz.
 
diff --git 
a/http/firefox/patches/0005-bmo-847568-Support-system-graphite2.patch 
b/http/firefox/patches/0005-bmo-847568-Support-system-graphite2.patch
index 6725365..feea1a9 100644
--- a/http/firefox/patches/0005-bmo-847568-Support-system-graphite2.patch
+++ b/http/firefox/patches/0005-bmo-847568-Support-system-graphite2.patch
@@ -1,7 +1,7 @@
 From c5230b3e0caf6fa208bab8f7fd4c30c7fe58a2c9 Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi AT gentoo.org>
 Date: Mon, 6 Apr 2020 19:34:44 +0200
-Subject: [PATCH 05/31] bmo#847568: Support system graphite2
+Subject: [PATCH 05/32] bmo#847568: Support system graphite2
 
 Allow building against system-wide graphite2.
 
diff --git a/http/firefox/patches/0006-bmo-1559213-Support-system-av1.patch 
b/http/firefox/patches/0006-bmo-1559213-Support-system-av1.patch
index a68a628..4b9deae 100644
--- a/http/firefox/patches/0006-bmo-1559213-Support-system-av1.patch
+++ b/http/firefox/patches/0006-bmo-1559213-Support-system-av1.patch
@@ -1,7 +1,7 @@
 From ae83763f3a4a21fb3d41d5e9fc4ea466fda2a7d4 Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi AT gentoo.org>
 Date: Mon, 6 Apr 2020 19:36:02 +0200
-Subject: [PATCH 06/31] bmo#1559213: Support system av1
+Subject: [PATCH 06/32] bmo#1559213: Support system av1
 
 Allow building against system-wide av1.
 
diff --git a/http/firefox/patches/0007-Support-sndio-audio-framework.patch 
b/http/firefox/patches/0007-Support-sndio-audio-framework.patch
index 7417816..259318c 100644
--- a/http/firefox/patches/0007-Support-sndio-audio-framework.patch
+++ b/http/firefox/patches/0007-Support-sndio-audio-framework.patch
@@ -1,7 +1,7 @@
 From 7d80af5250a056be9f9c839c386c7a4029b87fff Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi AT gentoo.org>
 Date: Thu, 29 Apr 2021 18:54:42 +0200
-Subject: [PATCH 07/31] Support sndio audio framework
+Subject: [PATCH 07/32] Support sndio audio framework
 
 Bug: https://bugs.gentoo.org/785613
 Signed-off-by: Thomas Deutschmann <whissi AT gentoo.org>
diff --git 
a/http/firefox/patches/0008-bmo-878089-Don-t-fail-when-TERM-is-not-set.patch 
b/http/firefox/patches/0008-bmo-878089-Don-t-fail-when-TERM-is-not-set.patch
index 811943f..15b95b5 100644
--- 
a/http/firefox/patches/0008-bmo-878089-Don-t-fail-when-TERM-is-not-set.patch
+++ 
b/http/firefox/patches/0008-bmo-878089-Don-t-fail-when-TERM-is-not-set.patch
@@ -1,7 +1,7 @@
 From 409a51cb5afd1b2fa1abc6953830b98ff3708263 Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi AT gentoo.org>
 Date: Mon, 6 Apr 2020 19:41:43 +0200
-Subject: [PATCH 08/31] bmo#878089: Don't fail when TERM is not set
+Subject: [PATCH 08/32] bmo#878089: Don't fail when TERM is not set
 
 Link: https://github.com/erikrose/blessings/pull/137
 Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=878089
diff --git a/http/firefox/patches/0009-bmo-1516803-Fix-building-sandbox.patch 
b/http/firefox/patches/0009-bmo-1516803-Fix-building-sandbox.patch
index 1f9624b..6b1a3ac 100644
--- a/http/firefox/patches/0009-bmo-1516803-Fix-building-sandbox.patch
+++ b/http/firefox/patches/0009-bmo-1516803-Fix-building-sandbox.patch
@@ -1,7 +1,7 @@
 From 026eb522aab43f39b2c89a0dd8d450eb394ed77a Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi AT gentoo.org>
 Date: Mon, 6 Apr 2020 19:44:28 +0200
-Subject: [PATCH 09/31] bmo#1516803: Fix building sandbox
+Subject: [PATCH 09/32] bmo#1516803: Fix building sandbox
 
 Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1516803
 Bug: https://bugs.gentoo.org/666580
diff --git 
a/http/firefox/patches/0010-Fix-building-spellchecker-when-using-GCC-and-PGO.patch
 
b/http/firefox/patches/0010-Fix-building-spellchecker-when-using-GCC-and-PGO.patch
index 62d4db0..e2de1a1 100644
--- 
a/http/firefox/patches/0010-Fix-building-spellchecker-when-using-GCC-and-PGO.patch
+++ 
b/http/firefox/patches/0010-Fix-building-spellchecker-when-using-GCC-and-PGO.patch
@@ -1,7 +1,7 @@
 From 49509912d5411e547c6eb56d06e141bc6205c081 Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi AT gentoo.org>
 Date: Mon, 6 Apr 2020 19:51:22 +0200
-Subject: [PATCH 10/31] Fix building spellchecker when using GCC and PGO
+Subject: [PATCH 10/32] Fix building spellchecker when using GCC and PGO
 
 Bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=88561
 Signed-off-by: Thomas Deutschmann <whissi AT gentoo.org>
diff --git 
a/http/firefox/patches/0011-musl-Add-alternate-name-for-private-siginfo-struct-m.patch
 
b/http/firefox/patches/0011-musl-Add-alternate-name-for-private-siginfo-struct-m.patch
index 2468c08..f4f1bd7 100644
--- 
a/http/firefox/patches/0011-musl-Add-alternate-name-for-private-siginfo-struct-m.patch
+++ 
b/http/firefox/patches/0011-musl-Add-alternate-name-for-private-siginfo-struct-m.patch
@@ -1,7 +1,7 @@
 From 3f6da58bceab982f34554f24382db37eef176cfa Mon Sep 17 00:00:00 2001
 From: Samuel Holland <samuel AT sholland.org>
 Date: Sun, 8 Jan 2017 19:16:38 -0600
-Subject: [PATCH 11/31] musl: Add alternate name for private siginfo struct
+Subject: [PATCH 11/32] musl: Add alternate name for private siginfo struct
  member
 
 musl does not provide a macro for detecting its presence. For now,
diff --git a/http/firefox/patches/0012-musl-Fix-syscall-wrappers.patch 
b/http/firefox/patches/0012-musl-Fix-syscall-wrappers.patch
index ef7f480..dcf029c 100644
--- a/http/firefox/patches/0012-musl-Fix-syscall-wrappers.patch
+++ b/http/firefox/patches/0012-musl-Fix-syscall-wrappers.patch
@@ -1,7 +1,7 @@
 From 89cf5ddec1c8e6311b1df36b3d42524106f83e22 Mon Sep 17 00:00:00 2001
 From: Samuel Holland <samuel AT sholland.org>
 Date: Sun, 8 Jan 2017 19:19:23 -0600
-Subject: [PATCH 12/31] musl: Fix syscall wrappers
+Subject: [PATCH 12/32] musl: Fix syscall wrappers
 
 musl defines p{read,write}64 to their non-suffixed equivalents to avoid
 duplication in its syscall wrappers. This breaks macro expansion here,
diff --git 
a/http/firefox/patches/0013-musl-Only-use-system-heap-reporter-with-glibc.patch
 
b/http/firefox/patches/0013-musl-Only-use-system-heap-reporter-with-glibc.patch
index c3c72eb..d79b921 100644
--- 
a/http/firefox/patches/0013-musl-Only-use-system-heap-reporter-with-glibc.patch
+++ 
b/http/firefox/patches/0013-musl-Only-use-system-heap-reporter-with-glibc.patch
@@ -1,7 +1,7 @@
 From abe1d2ac2da8aa950c22e7afeaa8cb04fc267327 Mon Sep 17 00:00:00 2001
 From: "Jory A. Pratt" <anarchy AT gentoo.org>
 Date: Mon, 6 Apr 2020 20:09:26 +0200
-Subject: [PATCH 13/31] musl: Only use system heap reporter with glibc
+Subject: [PATCH 13/32] musl: Only use system heap reporter with glibc
 
 Signed-off-by: Thomas Deutschmann <whissi AT gentoo.org>
 ---
diff --git 
a/http/firefox/patches/0014-musl-Set-pthread-name-for-non-glibc-systems.patch 
b/http/firefox/patches/0014-musl-Set-pthread-name-for-non-glibc-systems.patch
index d064209..fb22ca5 100644
--- 
a/http/firefox/patches/0014-musl-Set-pthread-name-for-non-glibc-systems.patch
+++ 
b/http/firefox/patches/0014-musl-Set-pthread-name-for-non-glibc-systems.patch
@@ -1,7 +1,7 @@
 From 22643933640f8305b2b6321b7dabcb83f28ba7e7 Mon Sep 17 00:00:00 2001
 From: "Jory A. Pratt" <anarchy AT gentoo.org>
 Date: Mon, 6 Apr 2020 20:10:03 +0200
-Subject: [PATCH 14/31] musl: Set pthread name for non glibc systems
+Subject: [PATCH 14/32] musl: Set pthread name for non glibc systems
 
 Signed-off-by: Thomas Deutschmann <whissi AT gentoo.org>
 ---
diff --git 
a/http/firefox/patches/0015-musl-getcontext-is-only-avaliable-on-glibc-systems.patch
 
b/http/firefox/patches/0015-musl-getcontext-is-only-avaliable-on-glibc-systems.patch
index ee98c60..b8c24b3 100644
--- 
a/http/firefox/patches/0015-musl-getcontext-is-only-avaliable-on-glibc-systems.patch
+++ 
b/http/firefox/patches/0015-musl-getcontext-is-only-avaliable-on-glibc-systems.patch
@@ -1,7 +1,7 @@
 From ae527e3c05ff35b1781819d4ddcc9ba89141db2c Mon Sep 17 00:00:00 2001
 From: "Jory A. Pratt" <anarchy AT gentoo.org>
 Date: Mon, 6 Apr 2020 20:10:47 +0200
-Subject: [PATCH 15/31] musl: getcontext is only avaliable on glibc systems
+Subject: [PATCH 15/32] musl: getcontext is only avaliable on glibc systems
 
 Signed-off-by: Thomas Deutschmann <whissi AT gentoo.org>
 ---
diff --git 
a/http/firefox/patches/0016-musl-sys-auvx.h-avaliable-on-more-then-just-glibc-sy.patch
 
b/http/firefox/patches/0016-musl-sys-auvx.h-avaliable-on-more-then-just-glibc-sy.patch
index d2450ce..84642b8 100644
--- 
a/http/firefox/patches/0016-musl-sys-auvx.h-avaliable-on-more-then-just-glibc-sy.patch
+++ 
b/http/firefox/patches/0016-musl-sys-auvx.h-avaliable-on-more-then-just-glibc-sy.patch
@@ -1,7 +1,7 @@
 From 04dc6d6531cb200b6cdb92fab525dfb231376d56 Mon Sep 17 00:00:00 2001
 From: "Jory A. Pratt" <anarchy AT gentoo.org>
 Date: Mon, 6 Apr 2020 20:12:09 +0200
-Subject: [PATCH 16/31] musl: sys/auvx.h avaliable on more then just glibc
+Subject: [PATCH 16/32] musl: sys/auvx.h avaliable on more then just glibc
  systems
 
 Signed-off-by: Thomas Deutschmann <whissi AT gentoo.org>
diff --git 
a/http/firefox/patches/0017-musl-make-SYS_fork-non-fatal-musl-uses-it-for-fork-2.patch
 
b/http/firefox/patches/0017-musl-make-SYS_fork-non-fatal-musl-uses-it-for-fork-2.patch
index 1bcdce3..512d8d2 100644
--- 
a/http/firefox/patches/0017-musl-make-SYS_fork-non-fatal-musl-uses-it-for-fork-2.patch
+++ 
b/http/firefox/patches/0017-musl-make-SYS_fork-non-fatal-musl-uses-it-for-fork-2.patch
@@ -1,7 +1,7 @@
 From 33fffd37b81292f4f28f71b0ce73d5e14c64719c Mon Sep 17 00:00:00 2001
 From: Johannes <johannes.brechtmann AT gmail.com>
 Date: Fri, 1 May 2020 17:20:29 +0200
-Subject: [PATCH 17/31] musl: make SYS_fork non-fatal, musl uses it for 
fork(2)
+Subject: [PATCH 17/32] musl: make SYS_fork non-fatal, musl uses it for 
fork(2)
 
 Signed-off-by: Thomas Deutschmann <whissi AT gentoo.org>
 ---
diff --git 
a/http/firefox/patches/0018-musl-include-net-if.h-before-linux-if.h-to-avoid-red.patch
 
b/http/firefox/patches/0018-musl-include-net-if.h-before-linux-if.h-to-avoid-red.patch
index 3db0ea0..46e9cff 100644
--- 
a/http/firefox/patches/0018-musl-include-net-if.h-before-linux-if.h-to-avoid-red.patch
+++ 
b/http/firefox/patches/0018-musl-include-net-if.h-before-linux-if.h-to-avoid-red.patch
@@ -1,7 +1,7 @@
 From 183e4f90f968068b663857755142d79dc0963778 Mon Sep 17 00:00:00 2001
 From: Rasmus Thomsen <oss AT cogitri.dev>
 Date: Wed, 28 Oct 2020 17:50:24 +0100
-Subject: [PATCH 18/31] musl: include net/if.h before linux/if.h to avoid
+Subject: [PATCH 18/32] musl: include net/if.h before linux/if.h to avoid
  redefinition
 
 Bug: https://bugs.gentoo.org/751469
diff --git a/http/firefox/patches/0019-Make-PGO-use-toolchain.patch 
b/http/firefox/patches/0019-Make-PGO-use-toolchain.patch
index d2cb316..a115c9a 100644
--- a/http/firefox/patches/0019-Make-PGO-use-toolchain.patch
+++ b/http/firefox/patches/0019-Make-PGO-use-toolchain.patch
@@ -1,7 +1,7 @@
 From b0d84725cccf578dd1f614a264a29a8f3473a182 Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi AT gentoo.org>
 Date: Mon, 6 Apr 2020 20:13:34 +0200
-Subject: [PATCH 19/31] Make PGO use toolchain
+Subject: [PATCH 19/32] Make PGO use toolchain
 
 Signed-off-by: Thomas Deutschmann <whissi AT gentoo.org>
 ---
diff --git 
a/http/firefox/patches/0020-bmo-1516081-Disable-watchdog-during-PGO-builds.patch
 
b/http/firefox/patches/0020-bmo-1516081-Disable-watchdog-during-PGO-builds.patch
index e5fa394..51f2221 100644
--- 
a/http/firefox/patches/0020-bmo-1516081-Disable-watchdog-during-PGO-builds.patch
+++ 
b/http/firefox/patches/0020-bmo-1516081-Disable-watchdog-during-PGO-builds.patch
@@ -1,7 +1,7 @@
 From 4e0bae4eb9f51834b7010d1ab91844695fb2528c Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi AT gentoo.org>
 Date: Mon, 6 Apr 2020 20:27:06 +0200
-Subject: [PATCH 20/31] bmo#1516081: Disable watchdog during PGO builds
+Subject: [PATCH 20/32] bmo#1516081: Disable watchdog during PGO builds
 
 Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1516081
 Signed-off-by: Thomas Deutschmann <whissi AT gentoo.org>
diff --git 
a/http/firefox/patches/0021-bmo-1516803-force-one-LTO-partition-for-sandbox-when.patch
 
b/http/firefox/patches/0021-bmo-1516803-force-one-LTO-partition-for-sandbox-when.patch
index c2a0f16..b68ba5d 100644
--- 
a/http/firefox/patches/0021-bmo-1516803-force-one-LTO-partition-for-sandbox-when.patch
+++ 
b/http/firefox/patches/0021-bmo-1516803-force-one-LTO-partition-for-sandbox-when.patch
@@ -1,7 +1,7 @@
 From 8e8b47da9ac6f33ac35ca07e5e76f22720b96865 Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi AT gentoo.org>
 Date: Wed, 15 Apr 2020 00:27:25 +0200
-Subject: [PATCH 21/31] bmo#1516803: force one LTO partition for sandbox when
+Subject: [PATCH 21/32] bmo#1516803: force one LTO partition for sandbox when
  using GCC
 
 Signed-off-by: Thomas Deutschmann <whissi AT gentoo.org>
diff --git 
a/http/firefox/patches/0022-bmo-1196777-Set-GDK_FOCUS_CHANGE_MASK.patch 
b/http/firefox/patches/0022-bmo-1196777-Set-GDK_FOCUS_CHANGE_MASK.patch
index e234f71..3d13a1a 100644
--- a/http/firefox/patches/0022-bmo-1196777-Set-GDK_FOCUS_CHANGE_MASK.patch
+++ b/http/firefox/patches/0022-bmo-1196777-Set-GDK_FOCUS_CHANGE_MASK.patch
@@ -1,7 +1,7 @@
 From a999c252cfc8195e01c566523335a7b6433019cf Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi AT gentoo.org>
 Date: Mon, 6 Apr 2020 20:47:13 +0200
-Subject: [PATCH 22/31] bmo#1196777: Set GDK_FOCUS_CHANGE_MASK
+Subject: [PATCH 22/32] bmo#1196777: Set GDK_FOCUS_CHANGE_MASK
 
 Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1196777
 Signed-off-by: Thomas Deutschmann <whissi AT gentoo.org>
diff --git 
a/http/firefox/patches/0023-Fix-building-with-PGO-when-using-GCC.patch 
b/http/firefox/patches/0023-Fix-building-with-PGO-when-using-GCC.patch
index f3a9753..61a585f 100644
--- a/http/firefox/patches/0023-Fix-building-with-PGO-when-using-GCC.patch
+++ b/http/firefox/patches/0023-Fix-building-with-PGO-when-using-GCC.patch
@@ -1,7 +1,7 @@
 From 2d23d70e94cefb707cb77ec931d48e4a8aa8954b Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi AT gentoo.org>
 Date: Thu, 2 Jul 2020 18:05:03 +0200
-Subject: [PATCH 23/31] Fix building with PGO when using GCC
+Subject: [PATCH 23/32] Fix building with PGO when using GCC
 
 Signed-off-by: Thomas Deutschmann <whissi AT gentoo.org>
 ---
diff --git 
a/http/firefox/patches/0024-libaom-Use-NEON_FLAGS-instead-of-VPX_ASFLAGS-for-lib.patch
 
b/http/firefox/patches/0024-libaom-Use-NEON_FLAGS-instead-of-VPX_ASFLAGS-for-lib.patch
index 7ec620d..14728c5 100644
--- 
a/http/firefox/patches/0024-libaom-Use-NEON_FLAGS-instead-of-VPX_ASFLAGS-for-lib.patch
+++ 
b/http/firefox/patches/0024-libaom-Use-NEON_FLAGS-instead-of-VPX_ASFLAGS-for-lib.patch
@@ -1,7 +1,7 @@
 From 152aa9e23736fd99647e0b61f627e9a3d40fed56 Mon Sep 17 00:00:00 2001
 From: Mike Hommey <mh AT glandium.org>
 Date: Mon, 26 Nov 2018 09:59:56 +0900
-Subject: [PATCH 24/31] libaom: Use NEON_FLAGS instead of VPX_ASFLAGS for
+Subject: [PATCH 24/32] libaom: Use NEON_FLAGS instead of VPX_ASFLAGS for
  libaom neon code
 
 Bug: https://bugs.gentoo.org/730606
diff --git a/http/firefox/patches/0025-build-Disable-Werror.patch 
b/http/firefox/patches/0025-build-Disable-Werror.patch
index 2da5cba..1ded1bc 100644
--- a/http/firefox/patches/0025-build-Disable-Werror.patch
+++ b/http/firefox/patches/0025-build-Disable-Werror.patch
@@ -1,7 +1,7 @@
 From 98672d8bbca50efacbdd35285be336b27f24fa95 Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi AT gentoo.org>
 Date: Sat, 29 Aug 2020 22:06:15 +0200
-Subject: [PATCH 25/31] build: Disable -Werror
+Subject: [PATCH 25/32] build: Disable -Werror
 
 Bug: https://bugzilla.mozilla.org/822978
 Signed-off-by: Thomas Deutschmann <whissi AT gentoo.org>
diff --git 
a/http/firefox/patches/0026-LTO-Only-enable-LTO-for-Rust-when-complete-build-use.patch
 
b/http/firefox/patches/0026-LTO-Only-enable-LTO-for-Rust-when-complete-build-use.patch
index f2c0a9f..1259d79 100644
--- 
a/http/firefox/patches/0026-LTO-Only-enable-LTO-for-Rust-when-complete-build-use.patch
+++ 
b/http/firefox/patches/0026-LTO-Only-enable-LTO-for-Rust-when-complete-build-use.patch
@@ -1,7 +1,7 @@
 From f8bcf72a3fdb62f27f23d7bcbd1253f82ff027e1 Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi AT gentoo.org>
 Date: Sat, 29 Aug 2020 22:30:59 +0200
-Subject: [PATCH 26/31] LTO: Only enable LTO for Rust when complete build uses
+Subject: [PATCH 26/32] LTO: Only enable LTO for Rust when complete build uses
  LTO
 
 Signed-off-by: Thomas Deutschmann <whissi AT gentoo.org>
diff --git a/http/firefox/patches/0027-Make-elfhack-use-toolchain.patch 
b/http/firefox/patches/0027-Make-elfhack-use-toolchain.patch
index c4220d1..b10df9d 100644
--- a/http/firefox/patches/0027-Make-elfhack-use-toolchain.patch
+++ b/http/firefox/patches/0027-Make-elfhack-use-toolchain.patch
@@ -1,7 +1,7 @@
 From acd924914e8a6c23ed377f036f80346160b94adf Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi AT gentoo.org>
 Date: Mon, 28 Sep 2020 20:52:24 +0200
-Subject: [PATCH 27/31] Make elfhack use toolchain
+Subject: [PATCH 27/32] Make elfhack use toolchain
 
 Signed-off-by: Thomas Deutschmann <whissi AT gentoo.org>
 ---
diff --git a/http/firefox/patches/0028-Disable-FFVPX-with-VA-API.patch 
b/http/firefox/patches/0028-Disable-FFVPX-with-VA-API.patch
index 812cd84..c6e839a 100644
--- a/http/firefox/patches/0028-Disable-FFVPX-with-VA-API.patch
+++ b/http/firefox/patches/0028-Disable-FFVPX-with-VA-API.patch
@@ -1,7 +1,7 @@
 From 1e48a24951577ea59ffcfef6aa3b51961b844053 Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi AT gentoo.org>
 Date: Thu, 29 Apr 2021 18:22:48 +0200
-Subject: [PATCH 28/31] Disable FFVPX with VA-API
+Subject: [PATCH 28/32] Disable FFVPX with VA-API
 
 Signed-off-by: Thomas Deutschmann <whissi AT gentoo.org>
 ---
diff --git 
a/http/firefox/patches/0029-Enable-FLAC-on-platforms-without-ffvpx-via-ffmpeg.patch
 
b/http/firefox/patches/0029-Enable-FLAC-on-platforms-without-ffvpx-via-ffmpeg.patch
index fde5e6f..0375e2c 100644
--- 
a/http/firefox/patches/0029-Enable-FLAC-on-platforms-without-ffvpx-via-ffmpeg.patch
+++ 
b/http/firefox/patches/0029-Enable-FLAC-on-platforms-without-ffvpx-via-ffmpeg.patch
@@ -1,7 +1,7 @@
 From 9c7d7aa616c4f29c0c5e907d6c0b27ee926d6762 Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi AT gentoo.org>
 Date: Thu, 29 Apr 2021 18:48:06 +0200
-Subject: [PATCH 29/31] Enable FLAC on platforms without ffvpx via ffmpeg
+Subject: [PATCH 29/32] Enable FLAC on platforms without ffvpx via ffmpeg
 
 Signed-off-by: Thomas Deutschmann <whissi AT gentoo.org>
 ---
diff --git 
a/http/firefox/patches/0030-bmo-1670333-OpenH264-Fix-decoding-if-it-starts-on-no.patch
 
b/http/firefox/patches/0030-bmo-1670333-OpenH264-Fix-decoding-if-it-starts-on-no.patch
index 7e36f7d..5163cd0 100644
--- 
a/http/firefox/patches/0030-bmo-1670333-OpenH264-Fix-decoding-if-it-starts-on-no.patch
+++ 
b/http/firefox/patches/0030-bmo-1670333-OpenH264-Fix-decoding-if-it-starts-on-no.patch
@@ -1,7 +1,7 @@
 From 461f5af7e1362eac4c751d40c3788d32c2a43572 Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi AT gentoo.org>
 Date: Fri, 11 Dec 2020 15:37:38 +0100
-Subject: [PATCH 30/31] bmo#1670333: OpenH264: Fix decoding if it starts on 
non
+Subject: [PATCH 30/32] bmo#1670333: OpenH264: Fix decoding if it starts on 
non
  IDR I-frame
 
 Signed-off-by: Thomas Deutschmann <whissi AT gentoo.org>
diff --git 
a/http/firefox/patches/0031-bmo-1663844-OpenH264-Allow-using-OpenH264-GMP-decode.patch
 
b/http/firefox/patches/0031-bmo-1663844-OpenH264-Allow-using-OpenH264-GMP-decode.patch
index 552e27b..acdacfb 100644
--- 
a/http/firefox/patches/0031-bmo-1663844-OpenH264-Allow-using-OpenH264-GMP-decode.patch
+++ 
b/http/firefox/patches/0031-bmo-1663844-OpenH264-Allow-using-OpenH264-GMP-decode.patch
@@ -1,7 +1,7 @@
 From b572aa129f6868cb0ffa29a8b1b3c6a6ac54013a Mon Sep 17 00:00:00 2001
 From: Thomas Deutschmann <whissi AT gentoo.org>
 Date: Fri, 11 Dec 2020 15:46:25 +0100
-Subject: [PATCH 31/31] bmo#1663844: OpenH264: Allow using OpenH264 GMP 
decoder
+Subject: [PATCH 31/32] bmo#1663844: OpenH264: Allow using OpenH264 GMP 
decoder
  as fallback for video decoding
 
 Signed-off-by: Thomas Deutschmann <whissi AT gentoo.org>
diff --git 
a/http/firefox/patches/0032-bmo-1745560-Fix-building-against-wayland-1.20.patch
 
b/http/firefox/patches/0032-bmo-1745560-Fix-building-against-wayland-1.20.patch
new file mode 100644
index 0000000..30e6fc3
--- /dev/null
+++ 
b/http/firefox/patches/0032-bmo-1745560-Fix-building-against-wayland-1.20.patch
@@ -0,0 +1,31 @@
+From a7c21dbcda513060e0d69a8bc682c48eb043730f Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich AT FreeBSD.org>
+Date: Sun, 12 Dec 2021 02:16:02 +0100
+Subject: [PATCH 32/32] bmo#1745560: Fix building against >=wayland-1.20
+
+Signed-off-by: Thomas Deutschmann <whissi AT gentoo.org>
+---
+ widget/gtk/mozwayland/mozwayland.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/widget/gtk/mozwayland/mozwayland.c 
b/widget/gtk/mozwayland/mozwayland.c
+index 7a448e6321..b997c59d78 100644
+--- a/widget/gtk/mozwayland/mozwayland.c
++++ b/widget/gtk/mozwayland/mozwayland.c
+@@ -40,6 +40,13 @@ MOZ_EXPORT void wl_event_queue_destroy(struct 
wl_event_queue* queue) {}
+ 
+ MOZ_EXPORT void wl_proxy_marshal(struct wl_proxy* p, uint32_t opcode, ...) 
{}
+ 
++MOZ_EXPORT struct wl_proxy* wl_proxy_marshal_flags(
++    struct wl_proxy* proxy, uint32_t opcode,
++    const struct wl_interface* interface, uint32_t version, uint32_t flags,
++    ...) {
++  return NULL;
++}
++
+ MOZ_EXPORT void wl_proxy_marshal_array(struct wl_proxy* p, uint32_t opcode,
+                                        union wl_argument* args) {}
+ 
+-- 
+2.34.1
+