From a08a2b4191986e49f8b29b4b50c4fd852f9e720d Mon Sep 17 00:00:00 2001 From: bzg1107 Date: Tue, 11 Jan 2022 22:09:06 +0800 Subject: [PATCH] fix build error --- 0001-fix-wl_proxy_marshal_flags.patch | 28 +++++++++++++++++++++++++++ firefox.spec | 7 ++++++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 0001-fix-wl_proxy_marshal_flags.patch diff --git a/0001-fix-wl_proxy_marshal_flags.patch b/0001-fix-wl_proxy_marshal_flags.patch new file mode 100644 index 0000000..64c669d --- /dev/null +++ b/0001-fix-wl_proxy_marshal_flags.patch @@ -0,0 +1,28 @@ +From 49d1846b55bcd4b54a8b8eb2b4ae0b29be0b36a1 Mon Sep 17 00:00:00 2001 +From: bzg1107 +Date: Tue, 11 Jan 2022 17:36:03 +0800 +Subject: [PATCH] fix wl_proxy_marshal_flags + +--- + widget/gtk/mozwayland/mozwayland.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/widget/gtk/mozwayland/mozwayland.c b/widget/gtk/mozwayland/mozwayland.c +index 5cea1c5..bbf97a5 100644 +--- a/widget/gtk/mozwayland/mozwayland.c ++++ b/widget/gtk/mozwayland/mozwayland.c +@@ -41,6 +41,11 @@ MOZ_EXPORT void wl_proxy_marshal(struct wl_proxy* p, uint32_t opcode, ...) {} + MOZ_EXPORT void wl_proxy_marshal_array(struct wl_proxy* p, uint32_t opcode, + union wl_argument* args) {} + ++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 struct wl_proxy* wl_proxy_create( + struct wl_proxy* factory, const struct wl_interface* interface) { + return NULL; +-- +2.30.0 + diff --git a/firefox.spec b/firefox.spec index 04f02ed..bffd22d 100644 --- a/firefox.spec +++ b/firefox.spec @@ -88,7 +88,7 @@ Summary: Mozilla Firefox Web browser Name: firefox Version: 79.0 -Release: 10 +Release: 11 URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Source0: https://archive.mozilla.org/pub/firefox/releases/%{version}/source/firefox-%{version}.source.tar.xz @@ -186,6 +186,7 @@ Patch641: Bug-1680166-GCC-is-smarter-than-clang-so-ignore-the-warning Patch642: firefox-glibc-dynstack.patch Patch643: firefox-crashreporter-build.patch Patch644: Deny-clone3-to-force-glibc-fallback.patch +Patch645: 0001-fix-wl_proxy_marshal_flags.patch %if %{?system_nss} BuildRequires: pkgconfig(nspr) >= %{nspr_version} pkgconfig(nss) >= %{nss_version} @@ -365,6 +366,7 @@ tar -xf %{SOURCE3} %patch642 -p1 %patch643 -p1 %patch644 -p1 +%patch645 -p1 %{__rm} -f .mozconfig %{__cp} %{SOURCE10} .mozconfig @@ -807,6 +809,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %endif %changelog +* Tue Jan 11 2022 baizhonggui - 79.0-11 +- Fix firefox wl_proxy_marshal_flags undefine. + * Mon Aug 23 2021 lingsheng - 79.0-10 - Fix firefox tab crash with clone3 in glibc 2.34 -- Gitee