Accepting request 943034 from mozilla:Factory

OBS-URL: https://build.opensuse.org/request/show/943034 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/MozillaThunderbird?expand=0&rev=270
2021-12-30 14:55:28 +00:00 · 2021-12-30 14:55:28 +00:00 · 4188f5049a
commit 4188f5049a
parent dea0b95075 794263a781
3 changed files with 21 additions and 0 deletions
--- a/MozillaThunderbird.changes
+++ b/MozillaThunderbird.changes
@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Dec 28 20:20:30 UTC 2021 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Add mozilla-bmo1745560.patch: Fix build against wayland 1.20.
+
 -------------------------------------------------------------------
 Fri Dec 17 14:19:48 UTC 2021 - Wolfgang Rosenauer <wr@rosenauer.org>

--- a/MozillaThunderbird.spec
+++ b/MozillaThunderbird.spec
@ -207,6 +207,7 @@ Patch28:        mozilla-libavcodec58_91.patch
 Patch29:        mozilla-silence-no-return-type.patch
 Patch30:        mozilla-bmo531915.patch
 Patch31:        mozilla-bmo1724679.patch
+Patch32:        mozilla-bmo1745560.patch
 %endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 PreReq:         /bin/sh
@ -309,6 +310,7 @@ fi
 %patch29 -p1
 %patch30 -p1
 %patch31 -p1
+%patch32 -p1
 %endif

 %build
--- a/mozilla-bmo1745560.patch
+++ b/mozilla-bmo1745560.patch
@ -0,0 +1,14 @@
+diff --git a/widget/gtk/mozwayland/mozwayland.c b/widget/gtk/mozwayland/mozwayland.c
+--- a/widget/gtk/mozwayland/mozwayland.c
+++ b/widget/gtk/mozwayland/mozwayland.c
+@@ -200,3 +200,10 @@
+ 
+ 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;
+}