diff options
| -rw-r--r-- | .SRCINFO | 2 | ||||
| -rw-r--r-- | 0002-Bug-1745560-Add-missing-stub-for-wl_proxy_marshal_fl.patch | 28 | ||||
| -rw-r--r-- | PKGBUILD | 6 |
3 files changed, 2 insertions, 34 deletions
@@ -92,7 +92,6 @@ pkgbase = thunderbird-appmenu source = mozconfig.cfg source = unity-menubar.patch source = fix-wayland.patch - source = 0002-Bug-1745560-Add-missing-stub-for-wl_proxy_marshal_fl.patch validpgpkeys = 14F26682D0916CDD81E37B6D61B7B526D98F0353 md5sums = SKIP md5sums = SKIP @@ -102,7 +101,6 @@ pkgbase = thunderbird-appmenu md5sums = c6963498e5ceddedb13af44efa70d86f md5sums = 0d7f0fe667c3e9e54f95fa51e9560eed md5sums = eb9fd90a3b18bfeebbed7e0e6056079c - md5sums = SKIP pkgname = thunderbird-appmenu optdepends = libcanberra: sound support diff --git a/0002-Bug-1745560-Add-missing-stub-for-wl_proxy_marshal_fl.patch b/0002-Bug-1745560-Add-missing-stub-for-wl_proxy_marshal_fl.patch deleted file mode 100644 index bcd5e25822c0..000000000000 --- a/0002-Bug-1745560-Add-missing-stub-for-wl_proxy_marshal_fl.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Kevin Daudt <kdaudt@alpinelinux.org> -Date: Sun, 12 Dec 2021 13:38:48 +0000 -Subject: [PATCH] Bug 1745560 - Add missing stub for wl_proxy_marshal_flags, - r=stransky - -Firefox fails to build against wayland 1.20 because this symbol is missing - -Differential Revision: https://phabricator.services.mozilla.com/D133583 ---- - 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 7a448e6321e2..1a86468b4f3d 100644 ---- a/widget/gtk/mozwayland/mozwayland.c -+++ b/widget/gtk/mozwayland/mozwayland.c -@@ -200,3 +200,10 @@ 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; -+} @@ -46,8 +46,7 @@ source=(https://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$pkgver/sou distribution.ini mozconfig.cfg unity-menubar.patch - fix-wayland.patch - 0002-Bug-1745560-Add-missing-stub-for-wl_proxy_marshal_fl.patch) + fix-wayland.patch) md5sums=('SKIP' 'SKIP' '10872ca39ebb8844ec753203c55bccc4' @@ -55,8 +54,7 @@ md5sums=('SKIP' '1ef0f094e533a68399b96dc8080c6a6e' 'c6963498e5ceddedb13af44efa70d86f' '0d7f0fe667c3e9e54f95fa51e9560eed' - 'eb9fd90a3b18bfeebbed7e0e6056079c' -'SKIP') + 'eb9fd90a3b18bfeebbed7e0e6056079c') validpgpkeys=(14F26682D0916CDD81E37B6D61B7B526D98F0353) # Mozilla Software Releases <release@mozilla.com> |