aboutsummaryrefslogtreecommitdiffstats
path: root/community/firefox-esr
diff options
context:
space:
mode:
authorKevin Daudt <kdaudt@alpinelinux.org>2021-12-10 20:51:47 +0000
committerKevin Daudt <kdaudt@alpinelinux.org>2021-12-11 10:23:05 +0000
commita408069e75632ce625aea68c70c23ee9e30995a5 (patch)
tree5ac878a1906f7fcfeb9de43095403ec4598ce0ee /community/firefox-esr
parent50a9fe443530c58d444f302fd1717ef266e22ba9 (diff)
downloadaports-a408069e75632ce625aea68c70c23ee9e30995a5.tar.gz
aports-a408069e75632ce625aea68c70c23ee9e30995a5.tar.bz2
aports-a408069e75632ce625aea68c70c23ee9e30995a5.tar.xz
community/firefox-esr: fix build against wayland
The build failed after upgrading wayland to 1.20. The patch has been suggested by wayland and reported upstream[0]. [0]:https://bugzilla.mozilla.org/show_bug.cgi?id=1745560
Diffstat (limited to 'community/firefox-esr')
-rw-r--r--community/firefox-esr/APKBUILD5
-rw-r--r--community/firefox-esr/mozwayland-add-missing-stub.patch17
2 files changed, 21 insertions, 1 deletions
diff --git a/community/firefox-esr/APKBUILD b/community/firefox-esr/APKBUILD
index 8fb68338b0..6cf365d624 100644
--- a/community/firefox-esr/APKBUILD
+++ b/community/firefox-esr/APKBUILD
@@ -5,7 +5,7 @@ pkgname=firefox-esr
pkgver=91.4.0
# Date of release, YY-MM-DD for metainfo file (see package())
_releasedate=2021-12-07
-pkgrel=0
+pkgrel=1
pkgdesc="Firefox web browser - Extended Support Release"
url="https://www.mozilla.org/en-US/firefox/organizations/"
# s390x, mips64 and riscv64 blocked by rust and cargo
@@ -75,6 +75,8 @@ source="https://ftp.mozilla.org/pub/firefox/releases/${pkgver}esr/source/firefox
sandbox-largefile.patch
avoid-redefinition.patch
+
+ mozwayland-add-missing-stub.patch
"
builddir="$srcdir/firefox-$pkgver"
@@ -502,4 +504,5 @@ f3b7c3e804ce04731012a46cb9e9a6b0769e3772aef9c0a4a8c7520b030fdf6cd703d5e9ff49275f
db26757b2ebf9f567962e32294b4ae48b3a5d0378a7589dfe650fe3a179ff58befbab5082981c68e1c25fb9e56b2db1e4e510d4bca17c3e3aedbf9a2f21806eb sandbox-sched_setscheduler.patch
b7d0a6126bdf6c0569f80aabf5b37ed2c7a35712eb8a0404a2d85381552f5555d4f97d213ea26cec6a45dc2785f22439376ed5f8e78b4fd664ef0223307b333e sandbox-largefile.patch
b1cb2db3122634f66d2bae7066e76f2dcd455c464e021db4de3b0a08314df95cb667846081682db549dd2af8a00831cabe44a2420c66cdfb5e3b5fa7e6bd21d3 avoid-redefinition.patch
+8c303539829a5c9ada43c8b03a9eae37fad68fcbc78deb3129857bfe852f582357efdaf8f506944394a97bef23cc89fefc00f3edf633edfcdd007a75dad8d746 mozwayland-add-missing-stub.patch
"
diff --git a/community/firefox-esr/mozwayland-add-missing-stub.patch b/community/firefox-esr/mozwayland-add-missing-stub.patch
new file mode 100644
index 0000000000..88384073e1
--- /dev/null
+++ b/community/firefox-esr/mozwayland-add-missing-stub.patch
@@ -0,0 +1,17 @@
+Description: This symbol is missing after the upgrade to wayland 1.20. These
+are stubs which are replaced at run-time with real symbols from libwayland and
+need to be kept in sync.
+Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=1745560
+diff --git a/widget/gtk/mozwayland/mozwayland.c b/widget/gtk/mozwayland/mozwayland.c
+index 7a448e6..7792581 100644
+--- a/widget/gtk/mozwayland/mozwayland.c
++++ b/widget/gtk/mozwayland/mozwayland.c
+@@ -200,3 +200,8 @@ MOZ_EXPORT int wl_list_empty(const struct wl_list* list) { return -1; }
+
+ MOZ_EXPORT void wl_list_insert_list(struct wl_list* list,
+ struct wl_list* other) {}
++
++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; }