From 794263a781d58f08419dce1dff6ef87131a35b439b507bd4e6691a453b86e1e9 Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Wed, 29 Dec 2021 09:35:12 +0000 Subject: [PATCH] Accepting request 943031 from home:iznogood:branches:mozilla:Factory - Add mozilla-bmo1745560.patch: Fix build against wayland 1.20. OBS-URL: https://build.opensuse.org/request/show/943031 OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaThunderbird?expand=0&rev=619 --- MozillaThunderbird.changes | 5 +++++ MozillaThunderbird.spec | 2 ++ mozilla-bmo1745560.patch | 14 ++++++++++++++ 3 files changed, 21 insertions(+) create mode 100644 mozilla-bmo1745560.patch diff --git a/MozillaThunderbird.changes b/MozillaThunderbird.changes index 5722a7d..77a6889 100644 --- a/MozillaThunderbird.changes +++ b/MozillaThunderbird.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Dec 28 20:20:30 UTC 2021 - Bjørn Lie + +- Add mozilla-bmo1745560.patch: Fix build against wayland 1.20. + ------------------------------------------------------------------- Fri Dec 17 14:19:48 UTC 2021 - Wolfgang Rosenauer diff --git a/MozillaThunderbird.spec b/MozillaThunderbird.spec index 4be215e..346d8be 100644 --- 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 diff --git a/mozilla-bmo1745560.patch b/mozilla-bmo1745560.patch new file mode 100644 index 0000000..3f199d1 --- /dev/null +++ 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; ++}